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

Another watcher fix

Browse source
This commit is contained in:
Zzooouhh 2017-11-23 09:56:07 +01:00 committed by GitHub
parent ce3176adf2
commit 0e2096395a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Mage/src/main/java/mage/watchers/common/AttackedLastTurnWatcher.java
View file

@ -71,12 +71,13 @@ public class AttackedLastTurnWatcher extends Watcher {
public void watch(GameEvent event, Game game) {
if (event.getType() == GameEvent.EventType.BEGINNING_PHASE_PRE) {
UUID activePlayer = game.getActivePlayerId();
if (attackedLastTurnCreatures.containsKey(activePlayer)) {
if (attackedThisTurnCreatures.containsKey(activePlayer)) {
attackedThisTurnCreatures.remove(activePlayer);
} else {
attackedLastTurnCreatures.remove(activePlayer);
if (attackedThisTurnCreatures.containsKey(activePlayer)) {
if (attackedThisTurnCreatures.get(activePlayer) != null) {
attackedLastTurnCreatures.put(activePlayer, getAttackedThisTurnCreatures(activePlayer));
}
attackedThisTurnCreatures.remove(activePlayer);
} else { // } else if (attackedLastTurnCreatures.containsKey(activePlayer)) {
attackedLastTurnCreatures.remove(activePlayer);
}
}
if (event.getType() == GameEvent.EventType.ATTACKER_DECLARED) {
@ -88,7 +89,6 @@ public class AttackedLastTurnWatcher extends Watcher {
attackingCreatures.add(new MageObjectReference(attacker, game));
}
}
attackedLastTurnCreatures.put(attackingPlayer, attackingCreatures);
attackedThisTurnCreatures.put(attackingPlayer, attackingCreatures);
}
}