github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-03-12 17:00:08 -09:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed #5654

Browse source
This commit is contained in:
Jeff 2019-03-25 11:02:37 -05:00
parent 70f41c7807
commit 07adaa06ab
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Mage/src/main/java/mage/watchers/common/PlayersAttackedThisTurnWatcher.java
View file

@ -27,11 +27,11 @@ public class PlayersAttackedThisTurnWatcher extends Watcher {
super(watcher);
for (Map.Entry<UUID, PlayerList> entry : watcher.playersAttackedThisTurn.entrySet()) {
this.playersAttackedThisTurn.put(entry.getKey(), entry.getValue());
this.playersAttackedThisTurn.putIfAbsent(entry.getKey(), entry.getValue());
}
for (Map.Entry<UUID, PlayerList> entry : watcher.opponentsAttackedThisTurn.entrySet()) {
this.opponentsAttackedThisTurn.put(entry.getKey(), entry.getValue());
this.opponentsAttackedThisTurn.putIfAbsent(entry.getKey(), entry.getValue());
}
}
@ -55,10 +55,11 @@ public class PlayersAttackedThisTurnWatcher extends Watcher {
playersAttacked = new PlayerList();
}
UUID playerDefender = game.getCombat().getDefendingPlayerId(event.getSourceId(), game);
if (playerDefender != null) {
if (playerDefender != null
&& !playersAttacked.contains(playerDefender)) {
playersAttacked.add(playerDefender);
}
playersAttackedThisTurn.put(event.getPlayerId(), playersAttacked);
playersAttackedThisTurn.putIfAbsent(event.getPlayerId(), playersAttacked);
// opponents
PlayerList opponentsAttacked = opponentsAttackedThisTurn.get(event.getPlayerId());
@ -66,10 +67,12 @@ public class PlayersAttackedThisTurnWatcher extends Watcher {
opponentsAttacked = new PlayerList();
}
UUID opponentDefender = game.getCombat().getDefendingPlayerId(event.getSourceId(), game);
if (opponentDefender != null && game.getOpponents(event.getPlayerId()).contains(opponentDefender)) {
if (opponentDefender != null
&& game.getOpponents(event.getPlayerId()).contains(opponentDefender)
&& !opponentsAttacked.contains(opponentDefender)) {
opponentsAttacked.add(opponentDefender);
}
opponentsAttackedThisTurn.put(event.getPlayerId(), opponentsAttacked);
opponentsAttackedThisTurn.putIfAbsent(event.getPlayerId(), opponentsAttacked);
}
}