external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 12:18:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix creature required to attack a nonexisting GameEntity.

Browse Source
This commit is contained in:
elcnesh
2015-01-18 21:06:06 +00:00
parent fd7d644eec
commit b1d41c1336
1 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
forge-game/src/main/java/forge/game/combat/AttackRequirement.java
View File

@@ -12,6 +12,8 @@ import forge.game.Game;
import forge.game.GameEntity;
import forge.game.ability.AbilityUtils;
import forge.game.card.Card;
import forge.game.player.Player;
import forge.game.zone.ZoneType;
import forge.util.FCollectionView;
import forge.util.maps.LinkedHashMapToAmount;
import forge.util.maps.MapToAmount;
@@ -53,6 +55,29 @@ public class AttackRequirement {
defenderSpecific.remove(defender);
}
}
// Remove GameEntities that are no longer on the battlefield or are
// related to Players who have lost the game
final List<GameEntity> toRemove = Lists.newArrayListWithCapacity(defenderSpecific.size());
for (final GameEntity entity : defenderSpecific.keySet()) {
boolean removeThis = false;
if (entity instanceof Player) {
if (((Player) entity).hasLost()) {
removeThis = true;
}
} else if (entity instanceof Card) {
final Player controller = ((Card) entity).getController();
if (controller.hasLost() || !controller.getCardsIn(ZoneType.Battlefield).contains(entity)) {
removeThis = true;
}
}
if (removeThis) {
toRemove.add(entity);
}
}
for (final GameEntity entity : toRemove) {
defenderSpecific.remove(entity);
}
}
public boolean hasRequirement() {