Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

Merge branch 'master' into additional-mulligan-support-5600

Browse source
This commit is contained in:
John Hitchings 2019-03-19 23:39:39 -07:00
commit 47c9aab877
39 changed files with 546 additions and 320 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Mage/src/main/java/mage/game/GameImpl.java
View file

@ -116,9 +116,6 @@ public abstract class GameImpl implements Game, Serializable {
protected GameOptions gameOptions;
protected String startMessage;
public static volatile int copyCount = 0;
public static volatile long copyTime = 0;
// private final transient LinkedList<MageAction> actions;
private Player scorePlayer;
// private int score = 0;
@ -156,10 +153,6 @@ public abstract class GameImpl implements Game, Serializable {
}
public GameImpl(final GameImpl game) {
long t1 = 0;
if (logger.isDebugEnabled()) {
t1 = System.currentTimeMillis();
}
this.id = game.id;
this.ready = game.ready;
this.startingPlayerId = game.startingPlayerId;
@ -175,10 +168,7 @@ public abstract class GameImpl implements Game, Serializable {
this.lkiExtended.putAll(game.lkiExtended);
this.shortLivingLKI.putAll(game.shortLivingLKI);
this.permanentsEntering.putAll(game.permanentsEntering);
if (logger.isDebugEnabled()) {
copyCount++;
copyTime += (System.currentTimeMillis() - t1);
}
this.stateCheckRequired = game.stateCheckRequired;
this.scorePlayer = game.scorePlayer;
this.scopeRelevant = game.scopeRelevant;