replace player with PN

src/magic/card/Augur_il_Vec.java

@@ -24,12 +24,11 @@ public class Augur_il_Vec {
         }
         @Override
         public MagicEvent getPermanentEvent(final MagicPermanent source,final MagicPayedCost payedCost) {
-            final MagicPlayer player=source.getController();
             return new MagicEvent(
-                    source,
-                    player,
-                    this,
-                    player + " gains 4 life.");
+                source,
+                this,
+                "PN gains 4 life."
+            );
         }
         @Override
         public void executeEvent(

src/magic/card/Bottle_Gnomes.java

@@ -24,12 +24,11 @@ public class Bottle_Gnomes {
         }
         @Override
         public MagicEvent getPermanentEvent(final MagicPermanent source,final MagicPayedCost payedCost) {
-            final MagicPlayer player=source.getController();
             return new MagicEvent(
-                    source,
-                    player,
-                    this,
-                    player + " gains 3 life.");
+                source,
+                this,
+                "PN gains 3 life."
+            );
         }
         @Override
         public void executeEvent(

src/magic/card/Custody_Battle.java

@@ -14,21 +14,17 @@ import magic.model.trigger.MagicAtUpkeepTrigger;
 public class Custody_Battle {
     public static final MagicAtUpkeepTrigger T = new MagicAtUpkeepTrigger() {
         @Override
-        public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicPlayer data) {
+        public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicPlayer upkeepPlayer) {
             final MagicPermanent enchanted = permanent.getEnchantedCreature();
-            final MagicPlayer player = enchanted.getController();
-            final MagicPlayer opponent = player.getOpponent();
-            return (player == data) ?
+            return enchanted.isController(upkeepPlayer) ?
                 new MagicEvent(
-                        enchanted,
-                        player,
-                        new MagicMayChoice(
-                                player + " may sacrifice a land. If you don't, " +
-                                opponent + " gains control of " + enchanted + ".",
-                                MagicTargetChoice.SACRIFICE_LAND),
-                        this,
-                        player + " may$ sacrifice a land$. If you don't, " +
-                        opponent + " gains control of " + enchanted + ".") :
+                    enchanted,
+                    new MagicMayChoice(
+                        MagicTargetChoice.SACRIFICE_LAND
+                    ),
+                    this,
+                    "PN may$ sacrifice a land$. If you don't, " +
+                    upkeepPlayer.getOpponent() + " gains control of SN.") :
                 MagicEvent.NONE;
         }
         @Override
@@ -45,8 +41,9 @@ public class Custody_Battle {
                 });
             } else {
                 game.doAction(new MagicGainControlAction(
-                            event.getPlayer().getOpponent(),
-                            event.getPermanent()));
+                    event.getPlayer().getOpponent(),
+                    event.getPermanent()
+                ));
             }
         }
     };

src/magic/card/Oracle_of_Nectars.java

@@ -26,13 +26,12 @@ public class Oracle_of_Nectars {
         @Override
         public MagicEvent getPermanentEvent(final MagicPermanent source,final MagicPayedCost payedCost) {
             final int amount=payedCost.getX();
-            final MagicPlayer player=source.getController();
             return new MagicEvent(
-                    source,
-                    player,
-                    new Object[]{amount},
-                    this,
-                    player + " gains " + amount + " life.");
+                source,
+                new Object[]{amount},
+                this,
+                "PN gains " + amount + " life."
+            );
         }
         @Override
         public void executeEvent(

src/magic/card/Rampaging_Baloths.java

@@ -14,19 +14,16 @@ public class Rampaging_Baloths {
     public static final MagicLandfallTrigger T = new MagicLandfallTrigger() {
         @Override
         public MagicEvent getEvent(final MagicPermanent permanent) {
-            final MagicPlayer player = permanent.getController();
             return new MagicEvent(
-                        permanent,
-                        player,
-                        new MagicSimpleMayChoice(
-                                player + " may put a 4/4 green Beast " +
-                                "creature token onto the battlefield.",
-                                MagicSimpleMayChoice.PLAY_TOKEN,
-                                1,
-                                MagicSimpleMayChoice.DEFAULT_YES),
-                        this,
-                        player + " may$ put a 4/4 green Beast " +
-                        "creature token onto the battlefield.");
+                permanent,
+                new MagicSimpleMayChoice(
+                    MagicSimpleMayChoice.PLAY_TOKEN,
+                    1,
+                    MagicSimpleMayChoice.DEFAULT_YES),
+                this,
+                "PN may$ put a 4/4 green Beast " +
+                "creature token onto the battlefield."
+            );
         }
         @Override
         public void executeEvent(

src/magic/card/Skyshroud_Ranger.java

@@ -35,16 +35,15 @@ public class Skyshroud_Ranger {
 
         @Override
         public MagicEvent getPermanentEvent(final MagicPermanent source,final MagicPayedCost payedCost) {
-            final MagicPlayer player = source.getController();
             return new MagicEvent(
-                    source,
-                    player,
-                    new MagicMayChoice(
-                            player + " may put a land card from his or her hand into play.",
-                            MagicTargetChoice.TARGET_LAND_CARD_FROM_HAND),
-                    new MagicGraveyardTargetPicker(true),
-                    this,
-                    player + " may$ put a land card$ from his or her hand into play.");
+                source,
+                new MagicMayChoice(
+                    MagicTargetChoice.TARGET_LAND_CARD_FROM_HAND
+                ),
+                new MagicGraveyardTargetPicker(true),
+                this,
+                "PN may$ put a land card$ from his or her hand into play."
+            );
         }
 
         @Override

src/magic/card/Zombie_Infestation.java

@@ -28,12 +28,11 @@ public class Zombie_Infestation {
         }
         @Override
         public MagicEvent getPermanentEvent(final MagicPermanent source,final MagicPayedCost payedCost) {
-            final MagicPlayer player = source.getController();
             return new MagicEvent(
-                    source,
-                    player,
-                    this,
-                    player + " puts a 2/2 black Zombie creature token onto the battlefield.");
+                source,
+                this,
+                "PN puts a 2/2 black Zombie creature token onto the battlefield."
+            );
         }
         @Override
         public void executeEvent(