github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-25 11:11:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Optimization - setUniqueTimestamp was waiting for timestamp to change causing many small pauses

Browse source
This commit is contained in:
betasteward 2014-11-15 12:42:28 -05:00
parent c2513e7da5
commit 08c9dc32be
5 changed files with 25 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Mage/src/mage/abilities/effects/ContinuousEffect.java
View file

@ -48,8 +48,8 @@ public interface ContinuousEffect extends Effect {
boolean isDiscarded();
void discard();
Duration getDuration();
Date getTimestamp();
void setTimestamp();
long getOrder();
void setOrder(long order);
boolean apply(Layer layer, SubLayer sublayer, Ability source, Game game);
boolean hasLayer(Layer layer);
boolean isInactive(Ability source, Game game);

14
Mage/src/mage/abilities/effects/ContinuousEffectImpl.java
View file

@ -63,7 +63,7 @@ public abstract class ContinuousEffectImpl extends EffectImpl implements Continu
protected Duration duration;
protected Layer layer;
protected SubLayer sublayer;
protected Date timestamp;
protected long order;
protected boolean used = false;
protected boolean discarded = false; // for manual effect discard
protected boolean affectedObjectsSet = false;
@ -76,7 +76,7 @@ public abstract class ContinuousEffectImpl extends EffectImpl implements Continu
public ContinuousEffectImpl(Duration duration, Outcome outcome) {
super(outcome);
this.duration = duration;
this.timestamp = new Date();
this.order = 0;
this.effectType = EffectType.CONTINUOUS;
}
@ -91,7 +91,7 @@ public abstract class ContinuousEffectImpl extends EffectImpl implements Continu
this.duration = effect.duration;
this.layer = effect.layer;
this.sublayer = effect.sublayer;
this.timestamp = new Date(effect.timestamp.getTime());
this.order = effect.order;
this.used = effect.used;
this.discarded = effect.discarded;
this.affectedObjectsSet = effect.affectedObjectsSet;
@ -114,13 +114,13 @@ public abstract class ContinuousEffectImpl extends EffectImpl implements Continu
}
@Override
public Date getTimestamp() {
return timestamp;
public long getOrder() {
return order;
}
@Override
public void setTimestamp() {
this.timestamp = new Date();
public void setOrder(long order) {
this.order = order;
}
@Override

31
Mage/src/mage/abilities/effects/ContinuousEffects.java
View file

@ -32,7 +32,6 @@ import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
import java.util.EnumMap;
import java.util.HashMap;
import java.util.HashSet;
@ -77,7 +76,7 @@ public class ContinuousEffects implements Serializable {
private static final transient Logger logger = Logger.getLogger(ContinuousEffects.class);
private Date lastSetTimestamp;
private long order = 0;
//transient Continuous effects
private ContinuousEffectsList<ContinuousEffect> layeredEffects = new ContinuousEffectsList<>();
@ -100,6 +99,7 @@ public class ContinuousEffects implements Serializable {
// effect.id -> sourceId - which effect was added by which sourceId
private final Map<UUID, UUID> sources = new HashMap<>();
private final ContinuousEffectSorter sorter = new ContinuousEffectSorter();
public ContinuousEffects() {
applyCounters = new ApplyCountersEffect();
@ -120,16 +120,14 @@ public class ContinuousEffects implements Serializable {
restrictionEffects = effect.restrictionEffects.copy();
restrictionUntapNotMoreThanEffects = effect.restrictionUntapNotMoreThanEffects.copy();
for (Map.Entry<AsThoughEffectType, ContinuousEffectsList<AsThoughEffect>> entry : effect.asThoughEffectsMap.entrySet()) {
asThoughEffectsMap.put(entry.getKey(), entry.getValue());
asThoughEffectsMap.put(entry.getKey(), entry.getValue().copy());
}
costModificationEffects = effect.costModificationEffects.copy();
spliceCardEffects = effect.spliceCardEffects.copy();
for (Map.Entry<UUID, UUID> entry : effect.sources.entrySet()) {
sources.put(entry.getKey(), entry.getValue());
}
sources.putAll(effect.sources);
collectAllEffects();
lastSetTimestamp = effect.lastSetTimestamp;
order = effect.order;
}
private void collectAllEffects() {
@ -222,7 +220,7 @@ public class ContinuousEffects implements Serializable {
updateTimestamps(layerEffects);
Collections.sort(layerEffects, new TimestampSorter());
Collections.sort(layerEffects, sorter);
return layerEffects;
}
@ -234,21 +232,17 @@ public class ContinuousEffects implements Serializable {
*/
private void updateTimestamps(List<ContinuousEffect> layerEffects) {
for (ContinuousEffect continuousEffect : layerEffects) {
// check if it's new, then set timestamp
// check if it's new, then set order
if (!previous.contains(continuousEffect)) {
setUniqueTimesstamp(continuousEffect);
setOrder(continuousEffect);
}
}
previous.clear();
previous.addAll(layerEffects);
}
public void setUniqueTimesstamp(ContinuousEffect effect) {
do {
effect.setTimestamp();
}
while (effect.getTimestamp().equals(lastSetTimestamp)); // prevent to set the same timestamp so logical order is saved
lastSetTimestamp = effect.getTimestamp();
public void setOrder(ContinuousEffect effect) {
effect.setOrder(order++);
}
private List<ContinuousEffect> filterLayeredEffects(List<ContinuousEffect> effects, Layer layer) {
@ -1008,9 +1002,10 @@ public class ContinuousEffects implements Serializable {
return !requirementEffects.isEmpty();
}
}
class TimestampSorter implements Comparator<ContinuousEffect> {
class ContinuousEffectSorter implements Comparator<ContinuousEffect> {
@Override
public int compare(ContinuousEffect one, ContinuousEffect two) {
return one.getTimestamp().compareTo(two.getTimestamp());
return Long.compare(one.getOrder(), two.getOrder());
}
}

4
Mage/src/mage/game/GameImpl.java
View file

@ -666,7 +666,7 @@ public abstract class GameImpl implements Game, Serializable {
playerByOrder = players.getNext(this);
}
}
if (gameOver(null)) {
if (gameOver(null) && !isSimulation()) {
winnerId = findWinnersAndLosers();
StringBuilder sb = new StringBuilder("GAME ended gameId: ").append(this.getId()).append(" ");
int count = 0;
@ -1230,7 +1230,6 @@ public abstract class GameImpl implements Game, Serializable {
ContinuousEffect newEffect = continuousEffect.copy();
newEffect.newId();
newEffect.setTimestamp();
newEffect.init(newAbility, this);
state.addEffect(newEffect, newAbility);
@ -1293,7 +1292,6 @@ public abstract class GameImpl implements Game, Serializable {
CopyEffect newEffect = new CopyEffect(duration, permanent, copyToPermanent.getId());
newEffect.newId();
newEffect.setTimestamp();
newEffect.setApplier(applier);
newEffect.init(newAbility, this);

4
Mage/src/mage/game/permanent/PermanentImpl.java
View file

@ -573,11 +573,11 @@ public abstract class PermanentImpl extends CardImpl implements Permanent {
for (Ability ability : this.getAbilities()) {
for (Iterator<Effect> ite = ability.getEffects(game, EffectType.CONTINUOUS).iterator(); ite.hasNext();) {
ContinuousEffect effect = (ContinuousEffect) ite.next();
game.getContinuousEffects().setUniqueTimesstamp(effect);
game.getContinuousEffects().setOrder(effect);
// It's important is to update timestamp of the copied effect in ContinuousEffects because it does the action
for (ContinuousEffect conEffect: game.getContinuousEffects().getLayeredEffects(game)) {
if (conEffect.getId().equals(effect.getId())) {
game.getContinuousEffects().setUniqueTimesstamp(conEffect);
game.getContinuousEffects().setOrder(conEffect);
}
}
}