diff --git a/src/magic/card/Archon_of_Justice.java b/src/magic/card/Archon_of_Justice.java index b7d8a6f9de..f982d724fc 100644 --- a/src/magic/card/Archon_of_Justice.java +++ b/src/magic/card/Archon_of_Justice.java @@ -29,7 +29,11 @@ public class Archon_of_Justice { } @Override - public void executeEvent(final MagicGame game,final MagicEvent event,final Object data[],final Object[] choiceResults) { + public void executeEvent( + final MagicGame game, + final MagicEvent event, + final Object data[], + final Object[] choiceResults) { final MagicPermanent permanent=event.getTarget(game,choiceResults,0); if (permanent!=null) { game.doAction(new MagicRemoveFromPlayAction(permanent,MagicLocationType.Exile)); diff --git a/src/magic/card/Butcher_of_Malakir.java b/src/magic/card/Butcher_of_Malakir.java index 458f78af5c..5b92a5d0c2 100644 --- a/src/magic/card/Butcher_of_Malakir.java +++ b/src/magic/card/Butcher_of_Malakir.java @@ -14,16 +14,15 @@ public class Butcher_of_Malakir { @Override public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final Object data) { final MagicGraveyardTriggerData triggerData=(MagicGraveyardTriggerData)data; - if (MagicLocationType.Play==triggerData.fromLocation) { - final MagicPlayer controller=permanent.getController(); - return new MagicEvent( - permanent, - controller, - new Object[]{permanent,game.getOpponent(controller)}, - this, - "Your opponent sacrifices a creature."); - } - return null; + final MagicPlayer controller = (permanent != null) ? permanent.getController() : null; + return (MagicLocationType.Play==triggerData.fromLocation) ? + new MagicEvent( + permanent, + controller, + new Object[]{permanent,game.getOpponent(controller)}, + this, + "Your opponent sacrifices a creature."): + null; } @Override @@ -45,17 +44,18 @@ public class Butcher_of_Malakir { public static final MagicTrigger T2 = new MagicTrigger(MagicTriggerType.WhenOtherPutIntoGraveyardFromPlay) { @Override public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final Object data) { - final MagicPermanent otherPermanent=(MagicPermanent)data; - final MagicPlayer controller=permanent.getController(); - if (otherPermanent!=permanent&&otherPermanent.getController()==controller&&otherPermanent.isCreature()) { - return new MagicEvent( - permanent, - controller, - new Object[]{permanent,game.getOpponent(controller)}, - this, - "Your opponent sacrifices a creature."); - } - return null; + final MagicPermanent otherPermanent = (MagicPermanent)data; + final MagicPlayer controller = permanent.getController(); + return (otherPermanent != permanent && + otherPermanent.getController() == controller && + otherPermanent.isCreature()) ? + new MagicEvent( + permanent, + controller, + new Object[]{permanent,game.getOpponent(controller)}, + this, + "Your opponent sacrifices a creature."): + null; } @Override diff --git a/src/magic/card/Sprouting_Thrinax.java b/src/magic/card/Sprouting_Thrinax.java index 2ddebb016b..f013c8a485 100644 --- a/src/magic/card/Sprouting_Thrinax.java +++ b/src/magic/card/Sprouting_Thrinax.java @@ -16,7 +16,7 @@ public class Sprouting_Thrinax { @Override public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final Object data) { final MagicGraveyardTriggerData triggerData=(MagicGraveyardTriggerData)data; - final MagicPlayer player = permanent.getController(); + final MagicPlayer player = (permanent != null) ? permanent.getController() : null; return (MagicLocationType.Play==triggerData.fromLocation) ? new MagicEvent( permanent, diff --git a/src/magic/card/Tuktuk_the_Explorer.java b/src/magic/card/Tuktuk_the_Explorer.java index 85f8e520c0..da6c3cd677 100644 --- a/src/magic/card/Tuktuk_the_Explorer.java +++ b/src/magic/card/Tuktuk_the_Explorer.java @@ -16,7 +16,7 @@ public class Tuktuk_the_Explorer { @Override public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final Object data) { final MagicGraveyardTriggerData triggerData=(MagicGraveyardTriggerData)data; - final MagicPlayer player = permanent.getController(); + final MagicPlayer player = (permanent != null) ? permanent.getController() : null; return (MagicLocationType.Play==triggerData.fromLocation) ? new MagicEvent( permanent,