unwrap method signature

release/Magarena/scripts/Ajani_s_Mantra.groovy

@@ -16,9 +16,7 @@
                 MagicEvent.NONE;
         }
         @Override
-        public void executeEvent(
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
-                final MagicGame game,
-                final MagicEvent event) {
             if (event.isYes()) {
                 game.doAction(new MagicChangeLifeAction(event.getPlayer(),1));
             }

release/Magarena/scripts/Assassin.groovy

@@ -15,9 +15,7 @@
                 MagicEvent.NONE;
         }
         @Override
-        public void executeEvent(
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
-                final MagicGame game,
-                final MagicEvent event) {
             game.doAction(new MagicLoseGameAction(event.getRefPlayer()));
         }
     }

release/Magarena/scripts/Black_Cat.groovy

@@ -11,9 +11,7 @@
             );
         }
         @Override
-        public void executeEvent(
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
-                final MagicGame game,
-                final MagicEvent event) {
             game.addEvent(new MagicDiscardEvent(
                 event.getSource(),
                 event.getPlayer(),

release/Magarena/scripts/Bomber_Corps.groovy

@@ -14,9 +14,7 @@
             );
         }
         @Override
-        public void executeEvent(
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
-                final MagicGame game,
-                final MagicEvent event) {
             event.processTarget(game,new MagicTargetAction() {
                 public void doAction(final MagicTarget target) {
                     final MagicDamage damage=new MagicDamage(event.getSource(),target,1);

release/Magarena/scripts/Coursers__Accord.groovy

@@ -8,9 +8,7 @@
                 "Put a 3/3 green Centaur creature token onto the battlefield, then populate.");
         }
         @Override
-        public void executeEvent(
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
-                final MagicGame game,
-                final MagicEvent event) {
             game.doAction(new MagicPlayTokenAction(event.getPlayer(), TokenCardDefinitions.get("Centaur3")));
             game.addEvent(new MagicPopulateEvent(event.getSource()));
         }

release/Magarena/scripts/Cyclonic_Rift.groovy

@@ -12,9 +12,7 @@
         }
 
         @Override
-        public void executeEvent(
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
-                final MagicGame game,
-                final MagicEvent event) {
             event.processTargetPermanent(game,new MagicPermanentAction() {
                 public void doAction(final MagicPermanent permanent) {
                     game.doAction(new MagicRemoveFromPlayAction(permanent,MagicLocationType.OwnersHand));
@@ -40,9 +38,7 @@
             );
         }
         @Override
-        public void executeEvent(
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
-                final MagicGame game,
-                final MagicEvent event) {
             final Collection<MagicPermanent> targets=
                 game.filterPermanents(event.getPlayer(),MagicTargetFilter.TARGET_NONLAND_PERMANENT_YOUR_OPPONENT_CONTROLS);
             for (final MagicPermanent target : targets) {

release/Magarena/scripts/Dwarven_Berserker.groovy

@@ -12,9 +12,7 @@
         }
         
         @Override
-        public void executeEvent(
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
-                final MagicGame game,
-                final MagicEvent event) {
             final MagicPermanent creature = event.getPermanent();
             game.doAction(new MagicChangeTurnPTAction(creature,3,0));
             game.doAction(new MagicSetAbilityAction(creature,MagicAbility.Trample));

release/Magarena/scripts/Elspeth__Knight_Errant.groovy

@@ -9,9 +9,7 @@
             );
         }
         @Override
-        public void executeEvent(
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
-                final MagicGame game,
-                final MagicEvent event) {
             game.doAction(new MagicPlayTokenAction(
                 event.getPlayer(), 
                 TokenCardDefinitions.get("Soldier")
@@ -30,9 +28,7 @@
             );
         }
         @Override
-        public void executeEvent(
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
-                final MagicGame game,
-                final MagicEvent event) {
             event.processTargetPermanent(game,new MagicPermanentAction() {
                 public void doAction(final MagicPermanent creature) {
                     game.doAction(new MagicChangeTurnPTAction(creature,3,3));
@@ -51,9 +47,7 @@
             );
         }
         @Override
-        public void executeEvent(
+        public void executeEvent(final MagicGame outerGame, final MagicEvent event) {
-                final MagicGame outerGame,
-                final MagicEvent event) {
             outerGame.doAction(new MagicAddStaticAction(
                 new MagicStatic(
                     MagicLayer.Ability,

release/Magarena/scripts/Evacuation.groovy

@@ -9,9 +9,7 @@
             );
         }
         @Override
-        public void executeEvent(
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
-                final MagicGame game,
-                final MagicEvent event) {
             final Collection<MagicPermanent> targets=
                 game.filterPermanents(event.getPlayer(),MagicTargetFilter.TARGET_CREATURE);
             for (final MagicPermanent target : targets) {

release/Magarena/scripts/Falkenrath_Marauders.groovy

@@ -13,9 +13,7 @@
                 MagicEvent.NONE;
         }
         @Override
-        public void executeEvent(
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
-                final MagicGame game,
-                final MagicEvent event) {
             game.doAction(new MagicChangeCountersAction(
                 event.getPermanent(),
                 MagicCounterType.PlusOne,

release/Magarena/scripts/Fledgling_Griffin.groovy

@@ -10,9 +10,7 @@
         }
         
         @Override
-        public void executeEvent(
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
-                final MagicGame game,
-                final MagicEvent event) {
             game.doAction(new MagicSetAbilityAction(event.getPermanent(),MagicAbility.Flying));
         }        
     }

release/Magarena/scripts/Grim_Flowering.groovy

@@ -10,9 +10,7 @@
             );
         }
         @Override
-        public void executeEvent(
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
-                final MagicGame game,
-                final MagicEvent event) {
             final MagicPlayer player = event.getPlayer();
             final int amount = game.filterCards(player, MagicTargetFilter.TARGET_CREATURE_CARD_FROM_GRAVEYARD).size();
             game.doAction(new MagicDrawAction(player,amount));

release/Magarena/scripts/Harrowing_Journey.groovy

@@ -10,9 +10,7 @@
             );
         }
         @Override
-        public void executeEvent(
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
-                final MagicGame game,
-                final MagicEvent event) {
             event.processTargetPlayer(game,new MagicPlayerAction() {
                 public void doAction(final MagicPlayer player) {
                     game.doAction(new MagicDrawAction(player,3));

release/Magarena/scripts/Hedron_Crab.groovy

@@ -11,9 +11,7 @@
             );
         }
         @Override
-        public void executeEvent(
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
-                final MagicGame game,
-                final MagicEvent event) {
             event.processTargetPlayer(game,new MagicPlayerAction() {
                 public void doAction(final MagicPlayer player) {
                     game.doAction(new MagicMillLibraryAction(player,3));

release/Magarena/scripts/Heroes__Reunion.groovy

@@ -10,9 +10,7 @@
             );
         }
         @Override
-        public void executeEvent(
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
-                final MagicGame game,
-                final MagicEvent event) {
             event.processTargetPlayer(game,new MagicPlayerAction() {
                 public void doAction(final MagicPlayer player) {
                     game.doAction(new MagicChangeLifeAction(player,7));

release/Magarena/scripts/Horncaller_s_Chant.groovy

@@ -8,9 +8,7 @@
                 "Put a 4/4 green Rhino creature token with trample onto the battlefield, then populate.");
         }
         @Override
-        public void executeEvent(
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
-                final MagicGame game,
-                final MagicEvent event) {
             game.doAction(new MagicPlayTokenAction(event.getPlayer(), TokenCardDefinitions.get("Rhino4")));
             game.addEvent(new MagicPopulateEvent(event.getSource()));
         }

release/Magarena/scripts/Kami_of_the_Honored_Dead.groovy

@@ -13,9 +13,7 @@
                 MagicEvent.NONE;
         }
         @Override
-        public void executeEvent(
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
-                final MagicGame game,
-                final MagicEvent event) {
             game.doAction(new MagicChangeLifeAction(
                 event.getPlayer(),
                 event.getRefInt()

release/Magarena/scripts/Khalni_Garden.groovy

@@ -9,9 +9,7 @@
             );
         }
         @Override
-        public void executeEvent(
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
-                final MagicGame game,
-                final MagicEvent event) {
             game.doAction(new MagicPlayTokenAction(
                 event.getPlayer(),
                 TokenCardDefinitions.get("Plant")

release/Magarena/scripts/Kiss_of_the_Amesha.groovy

@@ -10,9 +10,7 @@
             );
         }
         @Override
-        public void executeEvent(
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
-                final MagicGame game,
-                final MagicEvent event) {
             event.processTargetPlayer(game,new MagicPlayerAction() {
                 public void doAction(final MagicPlayer player) {
                     game.doAction(new MagicChangeLifeAction(player,7));

release/Magarena/scripts/Mizzium_Mortars.groovy

@@ -11,9 +11,7 @@
             );
         }
         @Override
-        public void executeEvent(
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
-                final MagicGame game,
-                final MagicEvent event) {
             event.processTarget(game,new MagicTargetAction() {
                 public void doAction(final MagicTarget target) {
                     final MagicDamage damage=new MagicDamage(event.getSource(),target,4);

release/Magarena/scripts/Recollect.groovy

@@ -11,9 +11,7 @@
             );
         }
         @Override
-        public void executeEvent(
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
-                final MagicGame game,
-                final MagicEvent event) {
             event.processTargetCard(game,new MagicCardAction() {
                 public void doAction(final MagicCard targetCard) {
                     game.doAction(new MagicRemoveCardAction(targetCard,MagicLocationType.Graveyard));

release/Magarena/scripts/Scythe_Tiger.groovy

@@ -1,28 +1,26 @@
 [
-new MagicWhenComesIntoPlayTrigger() {
+    new MagicWhenComesIntoPlayTrigger() {
-    @Override
+        @Override
-    public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent, final MagicPlayer player) {
+        public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent, final MagicPlayer player) {
-        return new MagicEvent(
+            return new MagicEvent(
-            permanent,
+                permanent,
-            new MagicMayChoice(MagicTargetChoice.SACRIFICE_LAND),
+                new MagicMayChoice(MagicTargetChoice.SACRIFICE_LAND),
-            MagicSacrificeTargetPicker.create(),
+                MagicSacrificeTargetPicker.create(),
-            this,
+                this,
-            "You may sacrifice a land. If you don't, sacrifice SN."
+                "You may sacrifice a land. If you don't, sacrifice SN."
-        );
+            );
-    }
+        }
-    @Override
+        @Override
-    public void executeEvent(
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
-            final MagicGame game,
+            if (event.isYes()) {
-            final MagicEvent event) {
+                event.processTargetPermanent(game,new MagicPermanentAction() {
-        if (event.isYes()) {
+                    public void doAction(final MagicPermanent land) {
-            event.processTargetPermanent(game,new MagicPermanentAction() {
+                        game.doAction(new MagicSacrificeAction(land));
-                public void doAction(final MagicPermanent land) {
+                    }
-                    game.doAction(new MagicSacrificeAction(land));
+                });
-                }
+            } else {
-            });
+                game.doAction(new MagicSacrificeAction(event.getPermanent()));
-        } else {
+            }
-            game.doAction(new MagicSacrificeAction(event.getPermanent()));
         }
     }
-}
 ]

release/Magarena/scripts/Seller_of_Songbirds.groovy

@@ -9,9 +9,7 @@
             );
         }
         @Override
-        public void executeEvent(
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
-                final MagicGame game,
-                final MagicEvent event) {
             game.doAction(new MagicPlayTokenAction(event.getPlayer(), TokenCardDefinitions.get("Bird1")));
         }
     }

release/Magarena/scripts/Soul_Feast.groovy

@@ -10,9 +10,7 @@
             );
         }
         @Override
-        public void executeEvent(
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
-                final MagicGame game,
-                final MagicEvent event) {
             event.processTargetPlayer(game,new MagicPlayerAction() {
                 public void doAction(final MagicPlayer player) {
                     game.doAction(new MagicChangeLifeAction(player,-4));

release/Magarena/scripts/Symbiotic_Beast.groovy

@@ -9,9 +9,7 @@
             );
         }
         @Override
-        public void executeEvent(
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
-                final MagicGame game,
-                final MagicEvent event) {
             game.doAction(new MagicPlayTokensAction(
                 event.getPlayer(), 
                 TokenCardDefinitions.get("Insect4"),

release/Magarena/scripts/Symbiotic_Wurm.groovy

@@ -9,9 +9,7 @@
             );
         }
         @Override
-        public void executeEvent(
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
-                final MagicGame game,
-                final MagicEvent event) {
             game.doAction(new MagicPlayTokensAction(
                 event.getPlayer(), 
                 TokenCardDefinitions.get("Insect4"),

release/Magarena/scripts/Trostani_s_Judgment.groovy

@@ -1,9 +1,7 @@
 [
     new MagicSpellCardEvent() {
         @Override
-        public MagicEvent getEvent(
+        public MagicEvent getEvent(final MagicCardOnStack cardOnStack, final MagicPayedCost payedCost) {
-                final MagicCardOnStack cardOnStack,
-                final MagicPayedCost payedCost) {
             return new MagicEvent(
                 cardOnStack,
                 MagicTargetChoice.NEG_TARGET_CREATURE,
@@ -13,9 +11,7 @@
             );
         }
         @Override
-        public void executeEvent(
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
-                final MagicGame game,
-                final MagicEvent event) {
             event.processTargetPermanent(game,new MagicPermanentAction() {
                 public void doAction(final MagicPermanent creature) {
                     game.doAction(new MagicRemoveFromPlayAction(creature,MagicLocationType.Exile));

release/Magarena/scripts/Vandalblast.groovy

@@ -17,9 +17,7 @@
             );
         }
         @Override
-        public void executeEvent(
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
-                final MagicGame game,
-                final MagicEvent event) {
             final Collection<MagicPermanent> targets= 
                 game.filterPermanents(event.getPlayer(),MagicTargetFilter.TARGET_ARTIFACT_YOUR_OPPONENT_CONTROLS);
             game.doAction(new MagicDestroyAction(targets));

release/Magarena/scripts/Wall_of_Frost.groovy

@@ -13,9 +13,7 @@
                 MagicEvent.NONE;
         }
         @Override
-        public void executeEvent(
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
-                final MagicGame game,
-                final MagicEvent event) {
             game.doAction(new MagicChangeStateAction(event.getRefPermanent(),MagicPermanentState.DoesNotUntapDuringNext,true));
         }
     }

release/Magarena/scripts/Wayfaring_Temple.groovy

@@ -21,9 +21,7 @@
                 MagicEvent.NONE;
         }
         @Override
-        public void executeEvent(
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
-                final MagicGame game,
-                final MagicEvent event) {
             game.addEvent(new MagicPopulateEvent(event.getSource()));
         }
     }