From c9750e925947ef758fd2527fc09d06bdecfb61ba Mon Sep 17 00:00:00 2001
From: melvin <melvinzhang@gmail.com>
Date: Sat, 15 Jun 2013 22:01:56 +0800
Subject: [PATCH] unwrap method signature

---
 release/Magarena/scripts/Adventuring_Gear.groovy   | 14 ++++++--------
 release/Magarena/scripts/Angelic_Chorus.groovy     |  4 +---
 release/Magarena/scripts/Bar_the_Door.groovy       |  8 ++------
 release/Magarena/scripts/Barter_in_Blood.groovy    |  8 ++------
 release/Magarena/scripts/Beetleback_Chief.groovy   | 11 +++++------
 release/Magarena/scripts/Berserk_Murlodont.groovy  |  4 +---
 .../Magarena/scripts/Bloodhusk_Ritualist.groovy    |  4 +---
 release/Magarena/scripts/Blustersquall.groovy      |  4 +---
 release/Magarena/scripts/Boros_Elite.groovy        |  4 +---
 release/Magarena/scripts/Burning_Inquiry.groovy    |  4 +---
 release/Magarena/scripts/Burst_of_Speed.groovy     |  4 +---
 release/Magarena/scripts/Caustic_Crawler.groovy    |  4 +---
 release/Magarena/scripts/Chambered_Nautilus.groovy |  4 +---
 release/Magarena/scripts/Crippling_Chill.groovy    |  4 +---
 release/Magarena/scripts/Dingus_Egg.groovy         |  4 +---
 release/Magarena/scripts/Dissipation_Field.groovy  |  4 +---
 release/Magarena/scripts/Divination.groovy         |  4 +---
 release/Magarena/scripts/Elgaud_Inquisitor.groovy  |  4 +---
 release/Magarena/scripts/Emeria_Angel.groovy       |  4 +---
 release/Magarena/scripts/Exhaustion.groovy         |  4 +---
 release/Magarena/scripts/Ezuri_s_Archers.groovy    |  4 +---
 release/Magarena/scripts/Firefist_Striker.groovy   |  4 +---
 release/Magarena/scripts/Firemane_Avenger.groovy   |  4 +---
 release/Magarena/scripts/Fleshbag_Marauder.groovy  |  4 +---
 release/Magarena/scripts/Frightful_Delusion.groovy |  4 +---
 release/Magarena/scripts/Glorious_Charge.groovy    |  4 +---
 release/Magarena/scripts/Grazing_Gladehart.groovy  |  4 +---
 release/Magarena/scripts/Guardians__Pledge.groovy  |  4 +---
 release/Magarena/scripts/Havoc_Demon.groovy        |  5 +----
 release/Magarena/scripts/Legion_Loyalist.groovy    |  4 +---
 release/Magarena/scripts/Loyal_Sentry.groovy       |  6 ++----
 release/Magarena/scripts/Memory_Lapse.groovy       |  4 +---
 release/Magarena/scripts/Midnight_Haunting.groovy  |  4 +---
 release/Magarena/scripts/Mind_Rot.groovy           |  4 +---
 release/Magarena/scripts/Mitotic_Slime.groovy      |  4 +---
 .../Magarena/scripts/Nagao__Bound_by_Honor.groovy  |  4 +---
 release/Magarena/scripts/Narcolepsy.groovy         |  4 +---
 .../Magarena/scripts/Nav_Squad_Commandos.groovy    |  4 +---
 release/Magarena/scripts/Phyrexian_Arena.groovy    |  4 +---
 release/Magarena/scripts/Phyrexian_Rager.groovy    |  4 +---
 .../scripts/Pillory_of_the_Sleepless.groovy        |  4 +---
 .../Magarena/scripts/Reaper_from_the_Abyss.groovy  |  4 +---
 release/Magarena/scripts/Riddlekeeper.groovy       |  9 +++------
 release/Magarena/scripts/Righteous_Cause.groovy    |  4 +---
 release/Magarena/scripts/Righteousness.groovy      |  4 +---
 release/Magarena/scripts/Rupture_Spire.groovy      |  4 +---
 release/Magarena/scripts/Sacred_Prey.groovy        |  4 +---
 release/Magarena/scripts/Safe_Passage.groovy       | 11 +++++------
 release/Magarena/scripts/Saprazzan_Heir.groovy     |  4 +---
 release/Magarena/scripts/Shadowstorm.groovy        |  4 +---
 release/Magarena/scripts/Shattered_Angel.groovy    |  4 +---
 release/Magarena/scripts/Skullclamp.groovy         |  4 +---
 release/Magarena/scripts/Soul_s_Attendant.groovy   |  4 +---
 release/Magarena/scripts/Soultether_Golem.groovy   |  4 +---
 release/Magarena/scripts/Specter_s_Shroud.groovy   |  4 +---
 release/Magarena/scripts/Spiteful_Visions.groovy   |  4 +---
 release/Magarena/scripts/Sundering_Growth.groovy   |  4 +---
 .../Magarena/scripts/Tamiyo__the_Moon_Sage.groovy  | 12 +++---------
 release/Magarena/scripts/Thragtusk.groovy          |  4 +---
 release/Magarena/scripts/Timbermare.groovy         |  4 +---
 release/Magarena/scripts/Turn_the_Tide.groovy      |  4 +---
 release/Magarena/scripts/Underworld_Dreams.groovy  |  7 +++----
 release/Magarena/scripts/Verdant_Embrace.groovy    |  4 +---
 release/Magarena/scripts/Warmind_Infantry.groovy   |  4 +---
 release/Magarena/scripts/Wrap_in_Vigor.groovy      |  4 +---
 release/Magarena/scripts/Zodiac_Dragon.groovy      | 10 ++++++----
 66 files changed, 93 insertions(+), 228 deletions(-)

diff --git a/release/Magarena/scripts/Adventuring_Gear.groovy b/release/Magarena/scripts/Adventuring_Gear.groovy
index 8f238c4964..8b8e73d264 100644
--- a/release/Magarena/scripts/Adventuring_Gear.groovy
+++ b/release/Magarena/scripts/Adventuring_Gear.groovy
@@ -5,17 +5,15 @@
             final MagicPermanent equippedCreature = permanent.getEquippedCreature();
             return equippedCreature.isValid() ?
                 new MagicEvent(
-                        permanent,
-                        permanent.getController(),
-                        equippedCreature,
-                        this,
-                        "Equipped creature gets +2/+2 until end of turn.") :
+                    permanent,
+                    equippedCreature,
+                    this,
+                    "RN gets +2/+2 until end of turn."
+                ) :
                 MagicEvent.NONE;
         }
         @Override
-        public void executeEvent(
-                final MagicGame game,
-                final MagicEvent event) {
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
             game.doAction(new MagicChangeTurnPTAction(event.getRefPermanent(),2,2));
         }    
     }
diff --git a/release/Magarena/scripts/Angelic_Chorus.groovy b/release/Magarena/scripts/Angelic_Chorus.groovy
index b19c6383e2..054cb2135f 100644
--- a/release/Magarena/scripts/Angelic_Chorus.groovy
+++ b/release/Magarena/scripts/Angelic_Chorus.groovy
@@ -14,9 +14,7 @@
         }
         
         @Override
-        public void executeEvent(
-                final MagicGame game,
-                final MagicEvent event) {
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
             // get toughness here so counters on the creature are considered
             final int toughness = (event.getRefPermanent()).getToughness();
             game.doAction(new MagicChangeLifeAction(event.getPlayer(),toughness));
diff --git a/release/Magarena/scripts/Bar_the_Door.groovy b/release/Magarena/scripts/Bar_the_Door.groovy
index 08b47b4098..b5844bec81 100644
--- a/release/Magarena/scripts/Bar_the_Door.groovy
+++ b/release/Magarena/scripts/Bar_the_Door.groovy
@@ -1,9 +1,7 @@
 [
     new MagicSpellCardEvent() {
         @Override
-        public MagicEvent getEvent(
-                final MagicCardOnStack cardOnStack,
-                final MagicPayedCost payedCost) {
+        public MagicEvent getEvent(final MagicCardOnStack cardOnStack, final MagicPayedCost payedCost) {
             return new MagicEvent(
                 cardOnStack,
                 this,
@@ -11,9 +9,7 @@
             );
         }
         @Override
-        public void executeEvent(
-                final MagicGame game,
-                final MagicEvent event) {
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
             final Collection<MagicPermanent> targets = game.filterPermanents(
                     event.getPlayer(),
                     MagicTargetFilter.TARGET_CREATURE_YOU_CONTROL);
diff --git a/release/Magarena/scripts/Barter_in_Blood.groovy b/release/Magarena/scripts/Barter_in_Blood.groovy
index f72a2a97d4..ee58c05326 100644
--- a/release/Magarena/scripts/Barter_in_Blood.groovy
+++ b/release/Magarena/scripts/Barter_in_Blood.groovy
@@ -1,9 +1,7 @@
 [
     new MagicSpellCardEvent() {
         @Override
-        public MagicEvent getEvent(
-                final MagicCardOnStack cardOnStack,
-                final MagicPayedCost payedCost) {
+        public MagicEvent getEvent(final MagicCardOnStack cardOnStack, final MagicPayedCost payedCost) {
             return new MagicEvent(
                 cardOnStack,
                 this,
@@ -12,9 +10,7 @@
         }
 
         @Override
-        public void executeEvent(
-                final MagicGame game,
-                final MagicEvent event) {
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
             for (final MagicPlayer player : game.getPlayers()) {
                 for (int i=2;i>0;i--) {
                     game.addEvent(new MagicSacrificePermanentEvent(
diff --git a/release/Magarena/scripts/Beetleback_Chief.groovy b/release/Magarena/scripts/Beetleback_Chief.groovy
index 03a124ba0d..8071db044d 100644
--- a/release/Magarena/scripts/Beetleback_Chief.groovy
+++ b/release/Magarena/scripts/Beetleback_Chief.groovy
@@ -3,15 +3,14 @@
         @Override
         public MagicEvent executeTrigger(final MagicGame game, final MagicPermanent permanent, final MagicPlayer player) {
             return new MagicEvent(
-                    permanent,
-                    this,
-                    "PN puts two 1/1 red Goblin creature tokens onto the battlefield.");
+                permanent,
+                this,
+                "PN puts two 1/1 red Goblin creature tokens onto the battlefield."
+            );
         }
 
         @Override
-        public void executeEvent(
-                final MagicGame game,
-                final MagicEvent event) {
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
             game.doAction(new MagicPlayTokensAction(
                 event.getPlayer(), 
                 TokenCardDefinitions.get("Goblin1"),
diff --git a/release/Magarena/scripts/Berserk_Murlodont.groovy b/release/Magarena/scripts/Berserk_Murlodont.groovy
index 851366d140..24ab6d7632 100644
--- a/release/Magarena/scripts/Berserk_Murlodont.groovy
+++ b/release/Magarena/scripts/Berserk_Murlodont.groovy
@@ -13,9 +13,7 @@
         }
         
         @Override
-        public void executeEvent(
-                final MagicGame game,
-                final MagicEvent event) {
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
             final MagicPermanent blocked = event.getRefPermanent();
             final int amount = blocked.getBlockingCreatures().size();
             game.doAction(new MagicChangeTurnPTAction(
diff --git a/release/Magarena/scripts/Bloodhusk_Ritualist.groovy b/release/Magarena/scripts/Bloodhusk_Ritualist.groovy
index 8e3b1c7fac..28c9b0954c 100644
--- a/release/Magarena/scripts/Bloodhusk_Ritualist.groovy
+++ b/release/Magarena/scripts/Bloodhusk_Ritualist.groovy
@@ -16,9 +16,7 @@
                 MagicEvent.NONE;
         }
         @Override
-        public void executeEvent(
-                final MagicGame game,
-                final MagicEvent event) {
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
             event.processTargetPlayer(game,new MagicPlayerAction() {
                 public void doAction(final MagicPlayer player) {
                     game.addEvent(new MagicDiscardEvent(event.getSource(),player,event.getPermanent().getKicker(),false));
diff --git a/release/Magarena/scripts/Blustersquall.groovy b/release/Magarena/scripts/Blustersquall.groovy
index c208680872..7c41d0916c 100644
--- a/release/Magarena/scripts/Blustersquall.groovy
+++ b/release/Magarena/scripts/Blustersquall.groovy
@@ -11,9 +11,7 @@
             );
         }
         @Override
-        public void executeEvent(
-                final MagicGame game,
-                final MagicEvent event) {
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
             event.processTargetPermanent(game,new MagicPermanentAction() {
                 public void doAction(final MagicPermanent creature) {
                     game.doAction(new MagicTapAction(creature,true));
diff --git a/release/Magarena/scripts/Boros_Elite.groovy b/release/Magarena/scripts/Boros_Elite.groovy
index fb8ad2205f..915cc94c06 100644
--- a/release/Magarena/scripts/Boros_Elite.groovy
+++ b/release/Magarena/scripts/Boros_Elite.groovy
@@ -12,9 +12,7 @@
             );
         }
         @Override
-        public void executeEvent(
-                final MagicGame game,
-                final MagicEvent event) {
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
             game.doAction(new MagicChangeTurnPTAction(event.getPermanent(),2,2));
         }
     }
diff --git a/release/Magarena/scripts/Burning_Inquiry.groovy b/release/Magarena/scripts/Burning_Inquiry.groovy
index b869dd7fc3..579fd1c154 100644
--- a/release/Magarena/scripts/Burning_Inquiry.groovy
+++ b/release/Magarena/scripts/Burning_Inquiry.groovy
@@ -9,9 +9,7 @@
             );
         }
         @Override
-        public void executeEvent(
-                final MagicGame game,
-                final MagicEvent event) {
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
             for (final MagicPlayer player : game.getPlayers()) {
                 game.doAction(new MagicDrawAction(player, 3));
                 game.addEvent(new MagicDiscardEvent(
diff --git a/release/Magarena/scripts/Burst_of_Speed.groovy b/release/Magarena/scripts/Burst_of_Speed.groovy
index 9f904cf454..68f3536fb2 100644
--- a/release/Magarena/scripts/Burst_of_Speed.groovy
+++ b/release/Magarena/scripts/Burst_of_Speed.groovy
@@ -9,9 +9,7 @@
             );
         }
         @Override
-        public void executeEvent(
-                final MagicGame game,
-                final MagicEvent event) {
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
             final Collection<MagicPermanent> targets =
                 game.filterPermanents(event.getPlayer(),MagicTargetFilter.TARGET_CREATURE_YOU_CONTROL);
             for (final MagicPermanent creature : targets) {
diff --git a/release/Magarena/scripts/Caustic_Crawler.groovy b/release/Magarena/scripts/Caustic_Crawler.groovy
index c981753db6..e24e8b4cb8 100644
--- a/release/Magarena/scripts/Caustic_Crawler.groovy
+++ b/release/Magarena/scripts/Caustic_Crawler.groovy
@@ -13,9 +13,7 @@
             );
         }
         @Override
-        public void executeEvent(
-                final MagicGame game,
-                final MagicEvent event) {
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
             if (event.isYes()) {
                 event.processTargetPermanent(game,new MagicPermanentAction() {
                     public void doAction(final MagicPermanent creature) {
diff --git a/release/Magarena/scripts/Chambered_Nautilus.groovy b/release/Magarena/scripts/Chambered_Nautilus.groovy
index 636528119f..b0a6bf8369 100644
--- a/release/Magarena/scripts/Chambered_Nautilus.groovy
+++ b/release/Magarena/scripts/Chambered_Nautilus.groovy
@@ -16,9 +16,7 @@
                 MagicEvent.NONE;
         }
         @Override
-        public void executeEvent(
-                final MagicGame game,
-                final MagicEvent event) {
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
             if (event.isYes()) {
                 game.doAction(new MagicDrawAction(event.getPlayer(),1));
             }
diff --git a/release/Magarena/scripts/Crippling_Chill.groovy b/release/Magarena/scripts/Crippling_Chill.groovy
index 778a74db7d..d9ec9b914e 100644
--- a/release/Magarena/scripts/Crippling_Chill.groovy
+++ b/release/Magarena/scripts/Crippling_Chill.groovy
@@ -13,9 +13,7 @@
             );
         }
         @Override
-        public void executeEvent(
-                final MagicGame game,
-                final MagicEvent event) {
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
             event.processTargetPermanent(game,new MagicPermanentAction() {
                 public void doAction(final MagicPermanent creature) {
                     game.doAction(new MagicTapAction(creature,true));
diff --git a/release/Magarena/scripts/Dingus_Egg.groovy b/release/Magarena/scripts/Dingus_Egg.groovy
index f811669847..76a20e731a 100644
--- a/release/Magarena/scripts/Dingus_Egg.groovy
+++ b/release/Magarena/scripts/Dingus_Egg.groovy
@@ -15,9 +15,7 @@
                 MagicEvent.NONE;
         }
         @Override
-        public void executeEvent(
-                final MagicGame game,
-                final MagicEvent event) {
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
             final MagicDamage damage = new MagicDamage(
                 event.getSource(),
                 event.getPlayer(),
diff --git a/release/Magarena/scripts/Dissipation_Field.groovy b/release/Magarena/scripts/Dissipation_Field.groovy
index 2387ec10f7..3837421698 100644
--- a/release/Magarena/scripts/Dissipation_Field.groovy
+++ b/release/Magarena/scripts/Dissipation_Field.groovy
@@ -13,9 +13,7 @@
                 MagicEvent.NONE;
         }
         @Override
-        public void executeEvent(
-                final MagicGame game,
-                final MagicEvent event) {
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
             game.doAction(new MagicRemoveFromPlayAction(
                 event.getRefPermanent(),
                 MagicLocationType.OwnersHand
diff --git a/release/Magarena/scripts/Divination.groovy b/release/Magarena/scripts/Divination.groovy
index 1a645eec8d..37e2ef6e5c 100644
--- a/release/Magarena/scripts/Divination.groovy
+++ b/release/Magarena/scripts/Divination.groovy
@@ -9,9 +9,7 @@
             );
         }
         @Override
-        public void executeEvent(
-                final MagicGame game,
-                final MagicEvent event) {
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
             game.doAction(new MagicDrawAction(event.getPlayer(),2));
         }
     }
diff --git a/release/Magarena/scripts/Elgaud_Inquisitor.groovy b/release/Magarena/scripts/Elgaud_Inquisitor.groovy
index 6dc90b1a4b..63030bb65d 100644
--- a/release/Magarena/scripts/Elgaud_Inquisitor.groovy
+++ b/release/Magarena/scripts/Elgaud_Inquisitor.groovy
@@ -10,9 +10,7 @@
             );
         }
         @Override
-        public void executeEvent(
-                final MagicGame game,
-                final MagicEvent event) {
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
             game.doAction(new MagicPlayTokenAction(
                 event.getPlayer(),
                 TokenCardDefinitions.get("Spirit2")
diff --git a/release/Magarena/scripts/Emeria_Angel.groovy b/release/Magarena/scripts/Emeria_Angel.groovy
index 05757f0246..61b035d481 100644
--- a/release/Magarena/scripts/Emeria_Angel.groovy
+++ b/release/Magarena/scripts/Emeria_Angel.groovy
@@ -15,9 +15,7 @@
             );
         }
         @Override
-        public void executeEvent(
-                final MagicGame game,
-                final MagicEvent event) {
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
             if (event.isYes()) {
                 game.doAction(new MagicPlayTokenAction(
                     event.getPlayer(),
diff --git a/release/Magarena/scripts/Exhaustion.groovy b/release/Magarena/scripts/Exhaustion.groovy
index 585a61cb49..9c92eac607 100644
--- a/release/Magarena/scripts/Exhaustion.groovy
+++ b/release/Magarena/scripts/Exhaustion.groovy
@@ -10,9 +10,7 @@
             );
         }
         @Override
-        public void executeEvent(
-                final MagicGame game,
-                final MagicEvent event) {
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
             event.processTargetPlayer(game,new MagicPlayerAction() {
                 public void doAction(final MagicPlayer player) {
                     game.doAction(new MagicChangePlayerStateAction(player,MagicPlayerState.Exhausted));
diff --git a/release/Magarena/scripts/Ezuri_s_Archers.groovy b/release/Magarena/scripts/Ezuri_s_Archers.groovy
index a4023712e1..5b7fc6439b 100644
--- a/release/Magarena/scripts/Ezuri_s_Archers.groovy
+++ b/release/Magarena/scripts/Ezuri_s_Archers.groovy
@@ -14,9 +14,7 @@
                 MagicEvent.NONE;
         }
         @Override
-        public void executeEvent(
-                final MagicGame game,
-                final MagicEvent event) {
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
             game.doAction(new MagicChangeTurnPTAction(event.getPermanent(),3,0));
         }
     }
diff --git a/release/Magarena/scripts/Firefist_Striker.groovy b/release/Magarena/scripts/Firefist_Striker.groovy
index f370ce50ab..b8971c63e3 100644
--- a/release/Magarena/scripts/Firefist_Striker.groovy
+++ b/release/Magarena/scripts/Firefist_Striker.groovy
@@ -14,9 +14,7 @@
             );
         }
         @Override
-        public void executeEvent(
-                final MagicGame game,
-                final MagicEvent event) {
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
             event.processTargetPermanent(game,new MagicPermanentAction() {
                 public void doAction(final MagicPermanent creature) {
                     game.doAction(new MagicSetAbilityAction(creature,MagicAbility.CannotBlock));
diff --git a/release/Magarena/scripts/Firemane_Avenger.groovy b/release/Magarena/scripts/Firemane_Avenger.groovy
index b4c413fe80..e862af65e5 100644
--- a/release/Magarena/scripts/Firemane_Avenger.groovy
+++ b/release/Magarena/scripts/Firemane_Avenger.groovy
@@ -15,9 +15,7 @@
             );
         }
         @Override
-        public void executeEvent(
-                final MagicGame game,
-                final MagicEvent event) {
+        public void executeEvent(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,3);
diff --git a/release/Magarena/scripts/Fleshbag_Marauder.groovy b/release/Magarena/scripts/Fleshbag_Marauder.groovy
index d861245d12..aff6144f4d 100644
--- a/release/Magarena/scripts/Fleshbag_Marauder.groovy
+++ b/release/Magarena/scripts/Fleshbag_Marauder.groovy
@@ -12,9 +12,7 @@
             );
         }
         @Override
-        public void executeEvent(
-                final MagicGame game,
-                final MagicEvent event) {
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
             for (final MagicPlayer player : game.getPlayers()) {
                 game.addEvent(new MagicSacrificePermanentEvent(
                     event.getSource(),
diff --git a/release/Magarena/scripts/Frightful_Delusion.groovy b/release/Magarena/scripts/Frightful_Delusion.groovy
index 36bd25faf4..04f1fd764a 100644
--- a/release/Magarena/scripts/Frightful_Delusion.groovy
+++ b/release/Magarena/scripts/Frightful_Delusion.groovy
@@ -11,9 +11,7 @@
             );
         }
         @Override
-        public void executeEvent(
-                final MagicGame game,
-                final MagicEvent event) {
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
             event.processTargetCardOnStack(game,new MagicCardOnStackAction() {
                 public void doAction(final MagicCardOnStack targetSpell) {
                     game.addEvent(new MagicCounterUnlessEvent(event.getSource(),targetSpell,MagicManaCost.create("{1}")));
diff --git a/release/Magarena/scripts/Glorious_Charge.groovy b/release/Magarena/scripts/Glorious_Charge.groovy
index ce5696ed47..0b399d948f 100644
--- a/release/Magarena/scripts/Glorious_Charge.groovy
+++ b/release/Magarena/scripts/Glorious_Charge.groovy
@@ -9,9 +9,7 @@
             );
         }
         @Override
-        public void executeEvent(
-                final MagicGame game,
-                final MagicEvent event) {
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
             final Collection<MagicPermanent> targets=
                 game.filterPermanents(event.getPlayer(),MagicTargetFilter.TARGET_CREATURE_YOU_CONTROL);
             for (final MagicPermanent target : targets) {
diff --git a/release/Magarena/scripts/Grazing_Gladehart.groovy b/release/Magarena/scripts/Grazing_Gladehart.groovy
index e4a9ce6bfd..395b8f65f2 100644
--- a/release/Magarena/scripts/Grazing_Gladehart.groovy
+++ b/release/Magarena/scripts/Grazing_Gladehart.groovy
@@ -13,9 +13,7 @@
             );
         }
         @Override
-        public void executeEvent(
-                final MagicGame game,
-                final MagicEvent event) {
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
             if (event.isYes()) {
                 game.doAction(new MagicChangeLifeAction(event.getPlayer(),2));
             }
diff --git a/release/Magarena/scripts/Guardians__Pledge.groovy b/release/Magarena/scripts/Guardians__Pledge.groovy
index 253135ff7c..1c163d1fd2 100644
--- a/release/Magarena/scripts/Guardians__Pledge.groovy
+++ b/release/Magarena/scripts/Guardians__Pledge.groovy
@@ -9,9 +9,7 @@
             );
         }
         @Override
-        public void executeEvent(
-                final MagicGame game,
-                final MagicEvent event) {
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
             final Collection<MagicPermanent> targets =
                 game.filterPermanents(event.getPlayer(),MagicTargetFilter.TARGET_WHITE_CREATURE_YOU_CONTROL);
             for (final MagicPermanent target : targets) {
diff --git a/release/Magarena/scripts/Havoc_Demon.groovy b/release/Magarena/scripts/Havoc_Demon.groovy
index 1a2893b5e5..b6548e8dc6 100644
--- a/release/Magarena/scripts/Havoc_Demon.groovy
+++ b/release/Magarena/scripts/Havoc_Demon.groovy
@@ -4,15 +4,12 @@
         public MagicEvent getEvent(final MagicPermanent permanent) {
             return new MagicEvent(
                 permanent,
-                permanent.getController(),
                 this,
                 "All creatures get -5/-5 until end of turn."
             );
         }
         @Override
-        public void executeEvent(
-                final MagicGame game,
-                final MagicEvent event) {
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
             final Collection<MagicPermanent> targets=
                 game.filterPermanents(event.getPlayer(),MagicTargetFilter.TARGET_CREATURE);
             for (final MagicPermanent target : targets) {
diff --git a/release/Magarena/scripts/Legion_Loyalist.groovy b/release/Magarena/scripts/Legion_Loyalist.groovy
index af55b54d97..b01ed88ea0 100644
--- a/release/Magarena/scripts/Legion_Loyalist.groovy
+++ b/release/Magarena/scripts/Legion_Loyalist.groovy
@@ -12,9 +12,7 @@
             );
         }
         @Override
-        public void executeEvent(
-                final MagicGame game,
-                final MagicEvent event) {
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
             final Collection<MagicPermanent> creatures=
                 game.filterPermanents(event.getPlayer(),MagicTargetFilter.TARGET_CREATURE_YOU_CONTROL);
             for (final MagicPermanent creature : creatures) {
diff --git a/release/Magarena/scripts/Loyal_Sentry.groovy b/release/Magarena/scripts/Loyal_Sentry.groovy
index 2904ed87e3..fe353b9512 100644
--- a/release/Magarena/scripts/Loyal_Sentry.groovy
+++ b/release/Magarena/scripts/Loyal_Sentry.groovy
@@ -8,13 +8,11 @@
                     permanent,
                     blocked,
                     this,
-                    "Destroy both " + blocked + "and SN."):
+                    "Destroy both RN and SN."):
                 MagicEvent.NONE;
         }
         @Override
-        public void executeEvent(
-                final MagicGame game,
-                final MagicEvent event) {
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
             game.doAction(new MagicDestroyAction(event.getRefPermanent()));
             game.doAction(new MagicDestroyAction(event.getPermanent()));
         }
diff --git a/release/Magarena/scripts/Memory_Lapse.groovy b/release/Magarena/scripts/Memory_Lapse.groovy
index 658107400e..3338d0048a 100644
--- a/release/Magarena/scripts/Memory_Lapse.groovy
+++ b/release/Magarena/scripts/Memory_Lapse.groovy
@@ -10,9 +10,7 @@
             );
         }
         @Override
-        public void executeEvent(
-                final MagicGame game,
-                final MagicEvent event) {
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
             event.processTargetCardOnStack(game,new MagicCardOnStackAction() {
                 public void doAction(final MagicCardOnStack targetSpell) {
                     game.doAction(new MagicCounterItemOnStackAction(targetSpell,MagicLocationType.TopOfOwnersLibrary));
diff --git a/release/Magarena/scripts/Midnight_Haunting.groovy b/release/Magarena/scripts/Midnight_Haunting.groovy
index 094aa45947..1c9407a179 100644
--- a/release/Magarena/scripts/Midnight_Haunting.groovy
+++ b/release/Magarena/scripts/Midnight_Haunting.groovy
@@ -10,9 +10,7 @@
             );
         }
         @Override
-        public void executeEvent(
-                final MagicGame game,
-                final MagicEvent event) {
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
             game.doAction(new MagicPlayTokensAction(
                 event.getPlayer(),
                 TokenCardDefinitions.get("Spirit2"),
diff --git a/release/Magarena/scripts/Mind_Rot.groovy b/release/Magarena/scripts/Mind_Rot.groovy
index de8b64db34..1d42f2b924 100644
--- a/release/Magarena/scripts/Mind_Rot.groovy
+++ b/release/Magarena/scripts/Mind_Rot.groovy
@@ -10,9 +10,7 @@
             );
         }
         @Override
-        public void executeEvent(
-                final MagicGame game,
-                final MagicEvent event) {
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
             event.processTargetPlayer(game,new MagicPlayerAction() {
                 public void doAction(final MagicPlayer player) {
                     game.addEvent(new MagicDiscardEvent(event.getSource(),player,2,false));
diff --git a/release/Magarena/scripts/Mitotic_Slime.groovy b/release/Magarena/scripts/Mitotic_Slime.groovy
index 9387ebc9bc..df77da1a5e 100644
--- a/release/Magarena/scripts/Mitotic_Slime.groovy
+++ b/release/Magarena/scripts/Mitotic_Slime.groovy
@@ -11,9 +11,7 @@
         }
 
         @Override
-        public void executeEvent(
-                final MagicGame game,
-                final MagicEvent event) {
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
             game.doAction(new MagicPlayTokensAction(event.getPlayer(), TokenCardDefinitions.get("Ooze2"), 2));
         }
     }
diff --git a/release/Magarena/scripts/Nagao__Bound_by_Honor.groovy b/release/Magarena/scripts/Nagao__Bound_by_Honor.groovy
index 55923535f0..5b2ea66d6c 100644
--- a/release/Magarena/scripts/Nagao__Bound_by_Honor.groovy
+++ b/release/Magarena/scripts/Nagao__Bound_by_Honor.groovy
@@ -11,9 +11,7 @@
                 MagicEvent.NONE;
         }
         @Override
-        public void executeEvent(
-                final MagicGame game,
-                final MagicEvent event) {
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
             final Collection<MagicPermanent> targets =
                     game.filterPermanents(event.getPlayer(),MagicTargetFilter.TARGET_SAMURAI_YOU_CONTROL);
             for (final MagicPermanent creature : targets) {
diff --git a/release/Magarena/scripts/Narcolepsy.groovy b/release/Magarena/scripts/Narcolepsy.groovy
index 804ad03a03..06e5b0651d 100644
--- a/release/Magarena/scripts/Narcolepsy.groovy
+++ b/release/Magarena/scripts/Narcolepsy.groovy
@@ -12,9 +12,7 @@
                 MagicEvent.NONE;
         }
         @Override
-        public void executeEvent(
-                final MagicGame game,
-                final MagicEvent event) {
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
             final MagicPermanent permanent=event.getPermanent();
             final MagicPermanent enchantedCreature=permanent.getEnchantedCreature();
             if (enchantedCreature.isValid()) {
diff --git a/release/Magarena/scripts/Nav_Squad_Commandos.groovy b/release/Magarena/scripts/Nav_Squad_Commandos.groovy
index 7064c15b58..b69b6ffe08 100644
--- a/release/Magarena/scripts/Nav_Squad_Commandos.groovy
+++ b/release/Magarena/scripts/Nav_Squad_Commandos.groovy
@@ -12,9 +12,7 @@
             );
         }
         @Override
-        public void executeEvent(
-                final MagicGame game,
-                final MagicEvent event) {
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
             game.doAction(new MagicChangeTurnPTAction(event.getPermanent(),2,2));
             game.doAction(new MagicUntapAction(event.getPermanent()));
         }
diff --git a/release/Magarena/scripts/Phyrexian_Arena.groovy b/release/Magarena/scripts/Phyrexian_Arena.groovy
index 27999cd54f..44d87443db 100644
--- a/release/Magarena/scripts/Phyrexian_Arena.groovy
+++ b/release/Magarena/scripts/Phyrexian_Arena.groovy
@@ -10,9 +10,7 @@
                 MagicEvent.NONE;
         }
         @Override
-        public void executeEvent(
-                final MagicGame game,
-                final MagicEvent event) {
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
             final MagicPlayer player=event.getPlayer();
             game.doAction(new MagicDrawAction(player,1));
             game.doAction(new MagicChangeLifeAction(player,-1));
diff --git a/release/Magarena/scripts/Phyrexian_Rager.groovy b/release/Magarena/scripts/Phyrexian_Rager.groovy
index 63cb012d1e..eaccbc8072 100644
--- a/release/Magarena/scripts/Phyrexian_Rager.groovy
+++ b/release/Magarena/scripts/Phyrexian_Rager.groovy
@@ -8,9 +8,7 @@
                     "PN draws a card and loses 1 life.");
         }
         @Override
-        public void executeEvent(
-                final MagicGame game,
-                final MagicEvent event) {
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
             final MagicPlayer player=event.getPlayer();
             game.doAction(new MagicDrawAction(player,1));
             game.doAction(new MagicChangeLifeAction(player,-1));
diff --git a/release/Magarena/scripts/Pillory_of_the_Sleepless.groovy b/release/Magarena/scripts/Pillory_of_the_Sleepless.groovy
index 63861762fa..8dec6e542a 100644
--- a/release/Magarena/scripts/Pillory_of_the_Sleepless.groovy
+++ b/release/Magarena/scripts/Pillory_of_the_Sleepless.groovy
@@ -12,9 +12,7 @@
                 MagicEvent.NONE;
         }
         @Override
-        public void executeEvent(
-                final MagicGame game,
-                final MagicEvent event) {
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
             game.doAction(new MagicChangeLifeAction(event.getPlayer(),-1));
         }
     }
diff --git a/release/Magarena/scripts/Reaper_from_the_Abyss.groovy b/release/Magarena/scripts/Reaper_from_the_Abyss.groovy
index 14ce8eecdf..7c6e157827 100644
--- a/release/Magarena/scripts/Reaper_from_the_Abyss.groovy
+++ b/release/Magarena/scripts/Reaper_from_the_Abyss.groovy
@@ -13,9 +13,7 @@
                 MagicEvent.NONE;
         }    
         @Override
-        public void executeEvent(
-                final MagicGame game,
-                final MagicEvent event) {
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
             event.processTargetPermanent(game,new MagicPermanentAction() {
                 public void doAction(final MagicPermanent creature) {
                     game.doAction(new MagicDestroyAction(creature));
diff --git a/release/Magarena/scripts/Riddlekeeper.groovy b/release/Magarena/scripts/Riddlekeeper.groovy
index 094d8e1090..3f3ebcea93 100644
--- a/release/Magarena/scripts/Riddlekeeper.groovy
+++ b/release/Magarena/scripts/Riddlekeeper.groovy
@@ -2,20 +2,17 @@
     new MagicWhenAttacksTrigger() {
         @Override
         public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicPermanent creature) {
-            final MagicPlayer controller = creature.getController();
-            return (controller != permanent.getController()) ?
+            return permanent.isEnemy(creature) ?
                 new MagicEvent(
                     permanent,
-                    controller,
+                    creature.getController(),
                     this,
                     "PN puts the top two cards of his or her library into his or her graveyard."
                 ):
                 MagicEvent.NONE;
         }
         @Override
-        public void executeEvent(
-                final MagicGame game,
-                final MagicEvent event) {
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
             game.doAction(new MagicMillLibraryAction(event.getPlayer(),2));
         }
     }
diff --git a/release/Magarena/scripts/Righteous_Cause.groovy b/release/Magarena/scripts/Righteous_Cause.groovy
index 10a5821381..1e1879d2e8 100644
--- a/release/Magarena/scripts/Righteous_Cause.groovy
+++ b/release/Magarena/scripts/Righteous_Cause.groovy
@@ -9,9 +9,7 @@
             );
         }
         @Override
-        public void executeEvent(
-                final MagicGame game,
-                final MagicEvent event) {
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
             game.doAction(new MagicChangeLifeAction(event.getPlayer(),1));
         }
     }
diff --git a/release/Magarena/scripts/Righteousness.groovy b/release/Magarena/scripts/Righteousness.groovy
index 5d25fb4626..99088a4044 100644
--- a/release/Magarena/scripts/Righteousness.groovy
+++ b/release/Magarena/scripts/Righteousness.groovy
@@ -11,9 +11,7 @@
             );
         }
         @Override
-        public void executeEvent(
-                final MagicGame game,
-                final MagicEvent event) {
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
             event.processTargetPermanent(game,new MagicPermanentAction() {
                 public void doAction(final MagicPermanent creature) {
                     game.doAction(new MagicChangeTurnPTAction(creature,7,7));
diff --git a/release/Magarena/scripts/Rupture_Spire.groovy b/release/Magarena/scripts/Rupture_Spire.groovy
index 8b19a0aa89..7431cfcf7d 100644
--- a/release/Magarena/scripts/Rupture_Spire.groovy
+++ b/release/Magarena/scripts/Rupture_Spire.groovy
@@ -13,9 +13,7 @@
             );
         }
         @Override
-        public void executeEvent(
-                final MagicGame game,
-                final MagicEvent event) {
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
             if (event.isNo()) {
                 game.doAction(new MagicSacrificeAction(event.getPermanent()));
             }
diff --git a/release/Magarena/scripts/Sacred_Prey.groovy b/release/Magarena/scripts/Sacred_Prey.groovy
index 1c03fb0922..6632ff03c7 100644
--- a/release/Magarena/scripts/Sacred_Prey.groovy
+++ b/release/Magarena/scripts/Sacred_Prey.groovy
@@ -11,9 +11,7 @@
                 MagicEvent.NONE;
         }
         @Override
-        public void executeEvent(
-                final MagicGame game,
-                final MagicEvent event) {
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
             game.doAction(new MagicChangeLifeAction(event.getPlayer(),1));
         }
     }
diff --git a/release/Magarena/scripts/Safe_Passage.groovy b/release/Magarena/scripts/Safe_Passage.groovy
index f8c8ffcdbf..0575e5c537 100644
--- a/release/Magarena/scripts/Safe_Passage.groovy
+++ b/release/Magarena/scripts/Safe_Passage.groovy
@@ -3,14 +3,13 @@
         @Override
         public MagicEvent getEvent(final MagicCardOnStack cardOnStack,final MagicPayedCost payedCost) {
             return new MagicEvent(
-                    cardOnStack,
-                    this,
-                    "Prevent all damage that would be dealt to you and creatures you control this turn.");
+                cardOnStack,
+                this,
+                "Prevent all damage that would be dealt to you and creatures you control this turn."
+            );
         }
         @Override
-        public void executeEvent(
-                final MagicGame game,
-                final MagicEvent event) {
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
             game.doAction(new MagicChangePlayerStateAction(event.getPlayer(),MagicPlayerState.PreventAllDamage));
         }
     }
diff --git a/release/Magarena/scripts/Saprazzan_Heir.groovy b/release/Magarena/scripts/Saprazzan_Heir.groovy
index edb57ea273..0efe070522 100644
--- a/release/Magarena/scripts/Saprazzan_Heir.groovy
+++ b/release/Magarena/scripts/Saprazzan_Heir.groovy
@@ -16,9 +16,7 @@
                 MagicEvent.NONE;
         }
         @Override
-        public void executeEvent(
-                final MagicGame game,
-                final MagicEvent event) {
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
             if (event.isYes()) {
                 game.doAction(new MagicDrawAction(event.getPlayer(),3));
             }
diff --git a/release/Magarena/scripts/Shadowstorm.groovy b/release/Magarena/scripts/Shadowstorm.groovy
index 2a59d00f26..598271088d 100644
--- a/release/Magarena/scripts/Shadowstorm.groovy
+++ b/release/Magarena/scripts/Shadowstorm.groovy
@@ -9,9 +9,7 @@
             );
         }
         @Override
-        public void executeEvent(
-                final MagicGame game,
-                final MagicEvent event) {
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
             final Collection<MagicPermanent> targets =
                 game.filterPermanents(event.getPlayer(),MagicTargetFilter.TARGET_CREATURE_WITH_SHADOW);
             for (final MagicPermanent target : targets) {
diff --git a/release/Magarena/scripts/Shattered_Angel.groovy b/release/Magarena/scripts/Shattered_Angel.groovy
index f36d689073..faa6e1582c 100644
--- a/release/Magarena/scripts/Shattered_Angel.groovy
+++ b/release/Magarena/scripts/Shattered_Angel.groovy
@@ -16,9 +16,7 @@
                 MagicEvent.NONE;
         }
         @Override
-        public void executeEvent(
-                final MagicGame game,
-                final MagicEvent event) {
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
             if (event.isYes()) {
                 game.doAction(new MagicChangeLifeAction(event.getPlayer(),3));
             }
diff --git a/release/Magarena/scripts/Skullclamp.groovy b/release/Magarena/scripts/Skullclamp.groovy
index b09f50c484..c7988a3a25 100644
--- a/release/Magarena/scripts/Skullclamp.groovy
+++ b/release/Magarena/scripts/Skullclamp.groovy
@@ -11,9 +11,7 @@
                 MagicEvent.NONE;
         }
         @Override
-        public void executeEvent(
-                final MagicGame game,
-                final MagicEvent event) {
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
             game.doAction(new MagicDrawAction(event.getPlayer(),2));
         }
     }
diff --git a/release/Magarena/scripts/Soul_s_Attendant.groovy b/release/Magarena/scripts/Soul_s_Attendant.groovy
index 35e62cd21a..94206e76a7 100644
--- a/release/Magarena/scripts/Soul_s_Attendant.groovy
+++ b/release/Magarena/scripts/Soul_s_Attendant.groovy
@@ -17,9 +17,7 @@
         }
         
         @Override
-        public void executeEvent(
-                final MagicGame game,
-                final MagicEvent event) {
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
             if (event.isYes()) {
                 game.doAction(new MagicChangeLifeAction(event.getPlayer(),1));
             }            
diff --git a/release/Magarena/scripts/Soultether_Golem.groovy b/release/Magarena/scripts/Soultether_Golem.groovy
index c03c46a1eb..feaf6c6a1e 100644
--- a/release/Magarena/scripts/Soultether_Golem.groovy
+++ b/release/Magarena/scripts/Soultether_Golem.groovy
@@ -13,9 +13,7 @@
                 MagicEvent.NONE;
         }
         @Override
-        public void executeEvent(
-                final MagicGame game,
-                final MagicEvent event) {
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
             game.doAction(new MagicChangeCountersAction(
                 event.getPermanent(),
                 MagicCounterType.Charge,
diff --git a/release/Magarena/scripts/Specter_s_Shroud.groovy b/release/Magarena/scripts/Specter_s_Shroud.groovy
index 7fa080795d..f69dfe21e5 100644
--- a/release/Magarena/scripts/Specter_s_Shroud.groovy
+++ b/release/Magarena/scripts/Specter_s_Shroud.groovy
@@ -16,9 +16,7 @@
                 MagicEvent.NONE;
         }
         @Override
-        public void executeEvent(
-                final MagicGame game,
-                final MagicEvent event) {
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
             game.addEvent(new MagicDiscardEvent(event.getSource(),event.getRefPlayer(),1,false));
         }
     }
diff --git a/release/Magarena/scripts/Spiteful_Visions.groovy b/release/Magarena/scripts/Spiteful_Visions.groovy
index 33d8d292e4..7167a9a06b 100644
--- a/release/Magarena/scripts/Spiteful_Visions.groovy
+++ b/release/Magarena/scripts/Spiteful_Visions.groovy
@@ -12,9 +12,7 @@
         }
         
         @Override
-        public void executeEvent(
-                final MagicGame game,
-                final MagicEvent event) {
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
             final MagicDamage damage = new MagicDamage(event.getSource(),event.getPlayer(),1);
             game.doAction(new MagicDealDamageAction(damage));
         }        
diff --git a/release/Magarena/scripts/Sundering_Growth.groovy b/release/Magarena/scripts/Sundering_Growth.groovy
index 3bc1f9cc86..2a58ef3ec7 100644
--- a/release/Magarena/scripts/Sundering_Growth.groovy
+++ b/release/Magarena/scripts/Sundering_Growth.groovy
@@ -13,9 +13,7 @@
             );
         }
         @Override
-        public void executeEvent(
-                final MagicGame game,
-                final MagicEvent event) {
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
             event.processTargetPermanent(game,new MagicPermanentAction() {
                 public void doAction(final MagicPermanent creature) {
                     game.doAction(new MagicDestroyAction(creature));
diff --git a/release/Magarena/scripts/Tamiyo__the_Moon_Sage.groovy b/release/Magarena/scripts/Tamiyo__the_Moon_Sage.groovy
index 0bff84ae3d..7c9add8c22 100644
--- a/release/Magarena/scripts/Tamiyo__the_Moon_Sage.groovy
+++ b/release/Magarena/scripts/Tamiyo__the_Moon_Sage.groovy
@@ -11,9 +11,7 @@
             );
         }
         @Override
-        public void executeEvent(
-                final MagicGame game,
-                final MagicEvent event) {
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
             event.processTargetPermanent(game,new MagicPermanentAction() {
                 public void doAction(final MagicPermanent creature) {
                     game.doAction(new MagicTapAction(creature,true));
@@ -37,9 +35,7 @@
             );
         }
         @Override
-        public void executeEvent(
-                final MagicGame game,
-                final MagicEvent event) {
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
             event.processTargetPlayer(game,new MagicPlayerAction() {
                 public void doAction(final MagicPlayer player) {
                     final int amt = game.filterPermanents(player, MagicTargetFilter.TARGET_TAPPED_CREATURE_YOU_CONTROL).size();
@@ -91,9 +87,7 @@
                     }
                     
                     @Override
-                    public void executeEvent(
-                            final MagicGame game,
-                            final MagicEvent event) {
+                    public void executeEvent(final MagicGame game, final MagicEvent event) {
                         if (event.isYes() && event.getPlayer().getGraveyard().contains(event.getCard())) {
                             game.doAction(new MagicRemoveCardAction(event.getCard(),MagicLocationType.Graveyard));
                             game.doAction(new MagicMoveCardAction(event.getCard(),MagicLocationType.Graveyard,MagicLocationType.OwnersHand));
diff --git a/release/Magarena/scripts/Thragtusk.groovy b/release/Magarena/scripts/Thragtusk.groovy
index 7413f213ba..6ab8806966 100644
--- a/release/Magarena/scripts/Thragtusk.groovy
+++ b/release/Magarena/scripts/Thragtusk.groovy
@@ -11,9 +11,7 @@
                 MagicEvent.NONE;
         }
         @Override
-        public void executeEvent(
-                final MagicGame game,
-                final MagicEvent event) {
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
             game.doAction(new MagicPlayTokenAction(event.getPlayer(), TokenCardDefinitions.get("Beast3")));
         }
     }
diff --git a/release/Magarena/scripts/Timbermare.groovy b/release/Magarena/scripts/Timbermare.groovy
index cb1ca833b9..e15cd1d6a0 100644
--- a/release/Magarena/scripts/Timbermare.groovy
+++ b/release/Magarena/scripts/Timbermare.groovy
@@ -13,9 +13,7 @@
             );
         }
         @Override
-        public void executeEvent(
-                final MagicGame game,
-                final MagicEvent event) {
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
             final Collection<MagicPermanent> targets = game.filterPermanents(
                     event.getPlayer(),
                     MagicTargetFilter.TARGET_CREATURE);
diff --git a/release/Magarena/scripts/Turn_the_Tide.groovy b/release/Magarena/scripts/Turn_the_Tide.groovy
index 69eff65d88..d335685fc4 100644
--- a/release/Magarena/scripts/Turn_the_Tide.groovy
+++ b/release/Magarena/scripts/Turn_the_Tide.groovy
@@ -9,9 +9,7 @@
             );
         }
         @Override
-        public void executeEvent(
-                final MagicGame game,
-                final MagicEvent event) {
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
             final MagicPlayer opponent=event.getPlayer().getOpponent();
             final Collection<MagicPermanent> targets=
                 game.filterPermanents(opponent,MagicTargetFilter.TARGET_CREATURE_YOU_CONTROL);
diff --git a/release/Magarena/scripts/Underworld_Dreams.groovy b/release/Magarena/scripts/Underworld_Dreams.groovy
index e18f8e202b..ddc2dff796 100644
--- a/release/Magarena/scripts/Underworld_Dreams.groovy
+++ b/release/Magarena/scripts/Underworld_Dreams.groovy
@@ -7,13 +7,12 @@
                     permanent,
                     card.getController(),
                     this,
-                    "SN deals 1 damage to PN."):
+                    "SN deals 1 damage to PN."
+                ):
                 MagicEvent.NONE;
         }
         @Override
-        public void executeEvent(
-                final MagicGame game,
-                final MagicEvent event) {
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
             final MagicDamage damage = new MagicDamage(event.getSource(),event.getPlayer(),1);
             game.doAction(new MagicDealDamageAction(damage));
         }        
diff --git a/release/Magarena/scripts/Verdant_Embrace.groovy b/release/Magarena/scripts/Verdant_Embrace.groovy
index ed54f4de14..0a8d5d8d83 100644
--- a/release/Magarena/scripts/Verdant_Embrace.groovy
+++ b/release/Magarena/scripts/Verdant_Embrace.groovy
@@ -12,9 +12,7 @@
         }
         
         @Override
-        public void executeEvent(
-                final MagicGame game,
-                final MagicEvent event) {
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
             game.doAction(new MagicPlayTokenAction(
                 event.getPlayer(),
                 TokenCardDefinitions.get("Saproling"),
diff --git a/release/Magarena/scripts/Warmind_Infantry.groovy b/release/Magarena/scripts/Warmind_Infantry.groovy
index 8a6afb9110..b8d7401498 100644
--- a/release/Magarena/scripts/Warmind_Infantry.groovy
+++ b/release/Magarena/scripts/Warmind_Infantry.groovy
@@ -12,9 +12,7 @@
             );
         }
         @Override
-        public void executeEvent(
-                final MagicGame game,
-                final MagicEvent event) {
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
             game.doAction(new MagicChangeTurnPTAction(event.getPermanent(),2,0));
         }
     }
diff --git a/release/Magarena/scripts/Wrap_in_Vigor.groovy b/release/Magarena/scripts/Wrap_in_Vigor.groovy
index 59f1647f27..7b0d7b694e 100644
--- a/release/Magarena/scripts/Wrap_in_Vigor.groovy
+++ b/release/Magarena/scripts/Wrap_in_Vigor.groovy
@@ -10,9 +10,7 @@
         }
 
         @Override
-        public void executeEvent(
-                final MagicGame game,
-                final MagicEvent event) {
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
             final Collection<MagicPermanent> targets = 
                 game.filterPermanents(event.getPlayer(),MagicTargetFilter.TARGET_CREATURE_YOU_CONTROL);
             for (final MagicPermanent creature : targets) {
diff --git a/release/Magarena/scripts/Zodiac_Dragon.groovy b/release/Magarena/scripts/Zodiac_Dragon.groovy
index f7e4668874..f34df44b84 100644
--- a/release/Magarena/scripts/Zodiac_Dragon.groovy
+++ b/release/Magarena/scripts/Zodiac_Dragon.groovy
@@ -5,16 +5,18 @@
             return (permanent == died && permanent.getOwner() == permanent.getController()) ?
                 new MagicEvent(
                     permanent,
-                    new MagicSimpleMayChoice(MagicSimpleMayChoice.DRAW_CARDS, 0, MagicSimpleMayChoice.DEFAULT_NONE),
+                    new MagicSimpleMayChoice(
+                        MagicSimpleMayChoice.DRAW_CARDS, 
+                        0, 
+                        MagicSimpleMayChoice.DEFAULT_NONE
+                    ),
                     this,
                     "PN may\$ return SN to his/her hand."
                 ):
                 MagicEvent.NONE;
         }
         @Override
-        public void executeEvent(
-                final MagicGame game,
-                final MagicEvent event) {
+        public void executeEvent(final MagicGame game, final MagicEvent event) {
             final MagicCard card = event.getPermanent().getCard()
             if (event.isYes() && event.getPlayer().getGraveyard().contains(card)) {
                 game.doAction(new MagicRemoveCardAction(card,MagicLocationType.Graveyard));