Droog71
/
magarena
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

shuffle uses incTime, doAction no longer calls incTime as it breaks caching of game states, time remove from game state

master
melvin 2011-07-29 14:54:55 +08:00
parent 1515bb6cd5
commit 3b7136af14
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/magic/model/MagicCardList.java
View File

@ -116,7 +116,7 @@ public class MagicCardList extends ArrayList<MagicCard> {
}
public void shuffle() {
shuffle(MagicGame.getInstance().getTime());
shuffle(MagicGame.getInstance().incTime());
}
public void shuffle(final long seed) {

4
src/magic/model/MagicGame.java
View File

@ -239,7 +239,6 @@ public class MagicGame {
getPayedCost().getX(),
stack.getItemsId(),
events.getEventsId(),
time,
//identifiers[0],
//identifiers[1],
//identifiers[2],
@ -480,9 +479,6 @@ public class MagicGame {
//performing actions update the score
score += action.getScore(scorePlayer);
//increment the time
incTime();
}
public void undoActions() {