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

Added AtTheBeginningOfNextUpkeepDelayedTriggeredAbility, fixed ability picker giving not always text back for spell ability.

Browse source
This commit is contained in:
LevelX2 2013-11-17 08:33:53 +01:00
parent 859f068e59
commit 77ac99b03f
8 changed files with 135 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Mage/src/mage/game/GameState.java
View file

@ -85,16 +85,22 @@ import mage.watchers.Watchers;
*/
public class GameState implements Serializable, Copyable<GameState> {
private Players players;
private PlayerList playerList;
private final Players players;
private final PlayerList playerList;
private final Turn turn;
private final Revealed revealed;
private final Map<UUID, LookedAt> lookedAt = new HashMap<UUID, LookedAt>();
private final DelayedTriggeredAbilities delayed;
private final SpecialActions specialActions;
private final Map<UUID, Abilities<ActivatedAbility>> otherAbilities = new HashMap<UUID, Abilities<ActivatedAbility>>();
private final TurnMods turnMods;
private final Watchers watchers;
private UUID activePlayerId;
private UUID priorityPlayerId;
private Turn turn;
private SpellStack stack;
private Command command;
private Exile exile;
private Revealed revealed;
private Map<UUID, LookedAt> lookedAt = new HashMap<UUID, LookedAt>();
private Battlefield battlefield;
private int turnNum = 1;
private boolean extraTurn = false;
@ -104,12 +110,7 @@ public class GameState implements Serializable, Copyable<GameState> {
private ContinuousEffects effects;
private TriggeredAbilities triggers;
private List<TriggeredAbility> triggered = new ArrayList<TriggeredAbility>();
private DelayedTriggeredAbilities delayed;
private SpecialActions specialActions;
private Map<UUID, Abilities<ActivatedAbility>> otherAbilities = new HashMap<UUID, Abilities<ActivatedAbility>>();
private Combat combat;
private TurnMods turnMods;
private Watchers watchers;
private Map<String, Object> values = new HashMap<String, Object>();
private Map<UUID, Zone> zones = new HashMap<UUID, Zone>();