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

Fix NPE

Browse Source
This commit is contained in:
tool4EvEr
2021-06-26 23:31:28 +02:00
parent 0d9590f12a
commit ec33e028f6
2 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
forge-game/src/main/java/forge/game/player/Player.java
View File

@@ -193,7 +193,6 @@ public class Player extends GameEntity implements Comparable<Player> {
private boolean activateLoyaltyAbilityThisTurn = false; private boolean activateLoyaltyAbilityThisTurn = false;
private boolean tappedLandForManaThisTurn = false; private boolean tappedLandForManaThisTurn = false;
private int attackersDeclaredThisTurn = 0; private int attackersDeclaredThisTurn = 0;
private PlayerCollection attackedOpponentsThisTurn = new PlayerCollection();
private final Map<ZoneType, PlayerZone> zones = Maps.newEnumMap(ZoneType.class); private final Map<ZoneType, PlayerZone> zones = Maps.newEnumMap(ZoneType.class);
private final Map<Long, Integer> adjustLandPlays = Maps.newHashMap(); private final Map<Long, Integer> adjustLandPlays = Maps.newHashMap();

1
forge-game/src/main/java/forge/game/replacement/ReplacementHandler.java
View File

@@ -410,6 +410,7 @@ public class ReplacementHandler {
final GameEntity target = et.getKey(); final GameEntity target = et.getKey();
int playerIndex = (target instanceof Player ? players.indexOf(((Player) target)) : int playerIndex = (target instanceof Player ? players.indexOf(((Player) target)) :
players.indexOf(((Card) target).getController())); players.indexOf(((Card) target).getController()));
if (playerIndex == -1) continue;
Map<ReplacementEffect, List<Map<AbilityKey, Object>>> replaceCandidateMap = replaceDamageList.get(playerIndex); Map<ReplacementEffect, List<Map<AbilityKey, Object>>> replaceCandidateMap = replaceDamageList.get(playerIndex);
for (Map.Entry<Card, Integer> e : et.getValue().entrySet()) { for (Map.Entry<Card, Integer> e : et.getValue().entrySet()) {
Card source = e.getKey(); Card source = e.getKey();