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

- NPE protection measures.

Browse Source
This commit is contained in:
Agetian
2017-08-15 06:40:18 +00:00
parent d2a30ea049
commit 5273f5c9b6
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-game/src/main/java/forge/game/GameAction.java
View File

@@ -607,8 +607,8 @@ public class GameAction {
// check for related effects and correct their controller and zone if necessary
for (Card eff : game.getCardsIn(ZoneType.Command)) {
if (eff.getType().hasSubtype("Effect")) {
boolean moveWithImprinted = eff.hasSVar("MoveWithImprinted") && eff.getImprintedCards().contains(c);
boolean moveWithRemembered = eff.hasSVar("MoveWithRemembered") && (Iterables.contains(eff.getRemembered(), c));
boolean moveWithImprinted = eff.hasSVar("MoveWithImprinted") && eff.getImprintedCards() != null && eff.getImprintedCards().contains(c);
boolean moveWithRemembered = eff.hasSVar("MoveWithRemembered") && eff.getRemembered() != null && (Iterables.contains(eff.getRemembered(), c));
if (moveWithImprinted || moveWithRemembered) {
eff.setController(c.getController(), game.getNextTimestamp());