From 92428d93d1204a38262bc1b3fbdc629f0c674786 Mon Sep 17 00:00:00 2001 From: Sloth Date: Thu, 4 Apr 2013 11:22:36 +0000 Subject: [PATCH] - Fixed a possible NPE in destroyNoRegeneration. --- src/main/java/forge/game/GameAction.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/forge/game/GameAction.java b/src/main/java/forge/game/GameAction.java index a8c86700c07..797b1dfb5ac 100644 --- a/src/main/java/forge/game/GameAction.java +++ b/src/main/java/forge/game/GameAction.java @@ -1221,6 +1221,7 @@ public class GameAction { * @return a boolean. */ public final boolean destroyNoRegeneration(final Card c, final SpellAbility sa) { + Player activator = null; if (!c.canBeDestroyed()) return false; @@ -1266,13 +1267,16 @@ public class GameAction { return false; } } // totem armor + if (sa != null) { + activator = sa.getActivatingPlayer(); + } // Play the Destroy sound game.getEvents().post(new CardDestroyedEvent()); // Run triggers final HashMap runParams = new HashMap(); runParams.put("Card", c); - runParams.put("Causer", sa.getActivatingPlayer()); + runParams.put("Causer", activator); game.getTriggerHandler().runTrigger(TriggerType.Destroyed, runParams, false); return this.sacrificeDestroy(c);