From cc4f90f8672686eb3ea5214da91367f97ed79e5d Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Thu, 25 Sep 2014 20:06:12 +0200 Subject: [PATCH] * Fixed possible NPE in PlayerImpl. --- Mage/src/mage/players/PlayerImpl.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Mage/src/mage/players/PlayerImpl.java b/Mage/src/mage/players/PlayerImpl.java index a42d3a5a35c..6121883143f 100644 --- a/Mage/src/mage/players/PlayerImpl.java +++ b/Mage/src/mage/players/PlayerImpl.java @@ -109,6 +109,7 @@ import mage.game.events.DamagedPlayerEvent; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; +import mage.game.permanent.PermanentCard; import mage.game.stack.Spell; import mage.game.stack.StackAbility; import mage.game.stack.StackObject; @@ -2469,7 +2470,7 @@ public abstract class PlayerImpl implements Player, Serializable { public boolean moveCardToHandWithInfo(Card card, UUID sourceId, Game game, Zone fromZone) { boolean result = false; if (card.moveToZone(Zone.HAND, sourceId, game, false)) { - if (card instanceof Permanent) { + if (card instanceof PermanentCard) { card = game.getCard(card.getId()); } game.informPlayers(new StringBuilder(this.getName()) @@ -2485,7 +2486,7 @@ public abstract class PlayerImpl implements Player, Serializable { public boolean moveCardToGraveyardWithInfo(Card card, UUID sourceId, Game game, Zone fromZone) { boolean result = false; if (card.moveToZone(Zone.GRAVEYARD, sourceId, game, fromZone != null ? fromZone.equals(Zone.BATTLEFIELD) : false)) { - if (card instanceof Permanent) { + if (card instanceof PermanentCard) { card = game.getCard(card.getId()); } StringBuilder sb = new StringBuilder(this.getName()) @@ -2506,7 +2507,7 @@ public abstract class PlayerImpl implements Player, Serializable { public boolean moveCardToLibraryWithInfo(Card card, UUID sourceId, Game game, Zone fromZone, boolean toTop, boolean withName) { boolean result = false; if (card.moveToZone(Zone.LIBRARY, sourceId, game, toTop)) { - if (card instanceof Permanent) { + if (card instanceof PermanentCard) { card = game.getCard(card.getId()); } StringBuilder sb = new StringBuilder(this.getName()) @@ -2537,7 +2538,7 @@ public abstract class PlayerImpl implements Player, Serializable { public boolean moveCardToExileWithInfo(Card card, UUID exileId, String exileName, UUID sourceId, Game game, Zone fromZone) { boolean result = false; if (card.moveToExile(exileId, exileName, sourceId, game)) { - if (card instanceof Permanent) { + if (card instanceof PermanentCard) { card = game.getCard(card.getId()); } game.informPlayers(new StringBuilder(this.getName())