From 79b36612022e1563a0609415b22c81fc3819bee1 Mon Sep 17 00:00:00 2001 From: melvin Date: Wed, 3 Oct 2012 16:17:55 +0800 Subject: [PATCH] move constants to the right == expression --- src/magic/MersenneTwisterFast.java | 2 +- src/magic/card/Archon_of_Justice.java | 2 +- src/magic/card/Blistergrub.java | 2 +- src/magic/card/Bogardan_Firefiend.java | 2 +- src/magic/card/Butcher_of_Malakir.java | 2 +- src/magic/card/Chronozoa.java | 2 +- src/magic/card/Deadly_Grub.java | 2 +- src/magic/card/Doomed_Traveler.java | 2 +- src/magic/card/Driver_of_the_Dead.java | 2 +- src/magic/card/Elder_Cathar.java | 2 +- src/magic/card/Festering_Goblin.java | 2 +- src/magic/card/Goblin_Arsonist.java | 2 +- src/magic/card/Goblin_Marshal.java | 2 +- src/magic/card/Gods__Eye__Gate_to_the_Reikai.java | 2 +- src/magic/card/Keiga__the_Tide_Star.java | 2 +- src/magic/card/Kodama_of_the_Center_Tree.java | 2 +- src/magic/card/Maalfeld_Twins.java | 2 +- src/magic/card/Mausoleum_Guard.java | 2 +- src/magic/card/Mogg_War_Marshal.java | 2 +- src/magic/card/Moldgraf_Monstrosity.java | 2 +- src/magic/card/Mycoid_Shepherd.java | 2 +- src/magic/card/Necropede.java | 2 +- src/magic/card/Pitchburn_Devils.java | 2 +- src/magic/card/Polluted_Dead.java | 2 +- src/magic/card/Roc_Egg.java | 2 +- src/magic/card/Rotcrown_Ghoul.java | 2 +- src/magic/card/Soulcage_Fiend.java | 2 +- src/magic/card/Sprouting_Thrinax.java | 2 +- src/magic/card/Tuktuk_the_Explorer.java | 2 +- src/magic/card/Undead_Executioner.java | 2 +- src/magic/card/Weatherseed_Treefolk.java | 2 +- src/magic/card/Wurmcoil_Engine.java | 2 +- src/magic/data/CardDefinitions.java | 10 +++++----- src/magic/model/choice/MagicChoice.java | 4 ++-- src/magic/model/trigger/MagicDieDrawCardTrigger.java | 2 +- src/magic/model/trigger/MagicModularTrigger.java | 2 +- src/magic/model/trigger/MagicSoulshiftTrigger.java | 2 +- 37 files changed, 42 insertions(+), 42 deletions(-) diff --git a/src/magic/MersenneTwisterFast.java b/src/magic/MersenneTwisterFast.java index 261ca5d5a5..8ca88f0c94 100644 --- a/src/magic/MersenneTwisterFast.java +++ b/src/magic/MersenneTwisterFast.java @@ -326,7 +326,7 @@ public strictfp class MersenneTwisterFast implements Serializable, Cloneable int i, j, k; setSeed(19650218); i=1; j=0; - k = (N>array.length ? N : array.length); + k = (array.length < N ? N : array.length); for (; k!=0; k--) { mt[i] = (mt[i] ^ ((mt[i-1] ^ (mt[i-1] >>> 30)) * 1664525)) + array[j] + j; /* non linear */ diff --git a/src/magic/card/Archon_of_Justice.java b/src/magic/card/Archon_of_Justice.java index 96a2e0a668..8dafd177a9 100644 --- a/src/magic/card/Archon_of_Justice.java +++ b/src/magic/card/Archon_of_Justice.java @@ -18,7 +18,7 @@ public class Archon_of_Justice { final MagicGame game, final MagicPermanent permanent, final MagicGraveyardTriggerData triggerData) { - return (MagicLocationType.Play==triggerData.fromLocation) ? + return (triggerData.fromLocation == MagicLocationType.Play) ? new MagicEvent( permanent, MagicTargetChoice.TARGET_PERMANENT, diff --git a/src/magic/card/Blistergrub.java b/src/magic/card/Blistergrub.java index 17abb64b3f..ccc6f3195e 100644 --- a/src/magic/card/Blistergrub.java +++ b/src/magic/card/Blistergrub.java @@ -14,7 +14,7 @@ public class Blistergrub { @Override public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicGraveyardTriggerData triggerData) { final MagicPlayer player = permanent.getController(); - return (MagicLocationType.Play == triggerData.fromLocation) ? + return (triggerData.fromLocation == MagicLocationType.Play) ? new MagicEvent( permanent, player, diff --git a/src/magic/card/Bogardan_Firefiend.java b/src/magic/card/Bogardan_Firefiend.java index cdd1667867..0605cbef57 100644 --- a/src/magic/card/Bogardan_Firefiend.java +++ b/src/magic/card/Bogardan_Firefiend.java @@ -16,7 +16,7 @@ public class Bogardan_Firefiend { public static final MagicWhenPutIntoGraveyardTrigger T = new MagicWhenPutIntoGraveyardTrigger() { @Override public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicGraveyardTriggerData triggerData) { - return (MagicLocationType.Play == triggerData.fromLocation) ? + return (triggerData.fromLocation == MagicLocationType.Play) ? new MagicEvent( permanent, MagicTargetChoice.TARGET_CREATURE, diff --git a/src/magic/card/Butcher_of_Malakir.java b/src/magic/card/Butcher_of_Malakir.java index b19597e4dc..bcc74d69ee 100644 --- a/src/magic/card/Butcher_of_Malakir.java +++ b/src/magic/card/Butcher_of_Malakir.java @@ -18,7 +18,7 @@ public class Butcher_of_Malakir { @Override public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicGraveyardTriggerData triggerData) { final MagicPlayer controller = permanent.getController(); - return (MagicLocationType.Play==triggerData.fromLocation) ? + return (triggerData.fromLocation == MagicLocationType.Play) ? new MagicEvent( permanent, controller, diff --git a/src/magic/card/Chronozoa.java b/src/magic/card/Chronozoa.java index a1a768b40d..0e043fedb7 100644 --- a/src/magic/card/Chronozoa.java +++ b/src/magic/card/Chronozoa.java @@ -14,7 +14,7 @@ public class Chronozoa { public static final MagicWhenPutIntoGraveyardTrigger T3 = new MagicWhenPutIntoGraveyardTrigger() { @Override public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicGraveyardTriggerData triggerData) { - return (MagicLocationType.Play == triggerData.fromLocation && + return (triggerData.fromLocation == MagicLocationType.Play && permanent.getCounters(MagicCounterType.Charge) == 0) ? new MagicEvent( permanent, diff --git a/src/magic/card/Deadly_Grub.java b/src/magic/card/Deadly_Grub.java index 5d4b09ccc0..1d5b0b0bb3 100644 --- a/src/magic/card/Deadly_Grub.java +++ b/src/magic/card/Deadly_Grub.java @@ -17,7 +17,7 @@ public class Deadly_Grub { final MagicGame game, final MagicPermanent permanent, final MagicGraveyardTriggerData triggerData) { - return (MagicLocationType.Play == triggerData.fromLocation && + return (triggerData.fromLocation == MagicLocationType.Play && permanent.getCounters(MagicCounterType.Charge) == 0) ? new MagicEvent( permanent, diff --git a/src/magic/card/Doomed_Traveler.java b/src/magic/card/Doomed_Traveler.java index bf041efdfa..08962c5a4b 100644 --- a/src/magic/card/Doomed_Traveler.java +++ b/src/magic/card/Doomed_Traveler.java @@ -13,7 +13,7 @@ public class Doomed_Traveler { public static final MagicWhenPutIntoGraveyardTrigger T = new MagicWhenPutIntoGraveyardTrigger() { @Override public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicGraveyardTriggerData triggerData) { - return (MagicLocationType.Play == triggerData.fromLocation) ? + return (triggerData.fromLocation == MagicLocationType.Play) ? new MagicEvent( permanent, this, diff --git a/src/magic/card/Driver_of_the_Dead.java b/src/magic/card/Driver_of_the_Dead.java index 784ffd330d..2579420194 100644 --- a/src/magic/card/Driver_of_the_Dead.java +++ b/src/magic/card/Driver_of_the_Dead.java @@ -32,7 +32,7 @@ public class Driver_of_the_Dead { final MagicGame game, final MagicPermanent permanent, final MagicGraveyardTriggerData triggerData) { - return (MagicLocationType.Play == triggerData.fromLocation) ? + return (triggerData.fromLocation == MagicLocationType.Play) ? new MagicEvent( permanent, new MagicMayChoice(targetChoice), diff --git a/src/magic/card/Elder_Cathar.java b/src/magic/card/Elder_Cathar.java index 3ca8e737e3..48dbba2bfa 100644 --- a/src/magic/card/Elder_Cathar.java +++ b/src/magic/card/Elder_Cathar.java @@ -17,7 +17,7 @@ public class Elder_Cathar { public static final MagicWhenPutIntoGraveyardTrigger T = new MagicWhenPutIntoGraveyardTrigger() { @Override public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicGraveyardTriggerData triggerData) { - return (MagicLocationType.Play == triggerData.fromLocation) ? + return (triggerData.fromLocation == MagicLocationType.Play) ? new MagicEvent( permanent, MagicTargetChoice.TARGET_CREATURE_YOU_CONTROL, diff --git a/src/magic/card/Festering_Goblin.java b/src/magic/card/Festering_Goblin.java index cbe9aa1b82..9c17d75bd1 100644 --- a/src/magic/card/Festering_Goblin.java +++ b/src/magic/card/Festering_Goblin.java @@ -15,7 +15,7 @@ public class Festering_Goblin { public static final MagicWhenPutIntoGraveyardTrigger T = new MagicWhenPutIntoGraveyardTrigger() { @Override public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicGraveyardTriggerData triggerData) { - return (MagicLocationType.Play == triggerData.fromLocation) ? + return (triggerData.fromLocation == MagicLocationType.Play) ? new MagicEvent( permanent, MagicTargetChoice.TARGET_CREATURE, diff --git a/src/magic/card/Goblin_Arsonist.java b/src/magic/card/Goblin_Arsonist.java index 2731a4ffb5..e56b9963c3 100644 --- a/src/magic/card/Goblin_Arsonist.java +++ b/src/magic/card/Goblin_Arsonist.java @@ -18,7 +18,7 @@ public class Goblin_Arsonist { public static final MagicWhenPutIntoGraveyardTrigger T = new MagicWhenPutIntoGraveyardTrigger() { @Override public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicGraveyardTriggerData triggerData) { - return (MagicLocationType.Play == triggerData.fromLocation) ? + return (triggerData.fromLocation == MagicLocationType.Play) ? new MagicEvent( permanent, new MagicMayChoice( diff --git a/src/magic/card/Goblin_Marshal.java b/src/magic/card/Goblin_Marshal.java index 40a70dd869..afb9418f38 100644 --- a/src/magic/card/Goblin_Marshal.java +++ b/src/magic/card/Goblin_Marshal.java @@ -39,7 +39,7 @@ public class Goblin_Marshal { public static final MagicWhenPutIntoGraveyardTrigger T3 = new MagicWhenPutIntoGraveyardTrigger() { @Override public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicGraveyardTriggerData triggerData) { - return (MagicLocationType.Play == triggerData.fromLocation) ? + return (triggerData.fromLocation == MagicLocationType.Play) ? new MagicEvent( permanent, this, diff --git a/src/magic/card/Gods__Eye__Gate_to_the_Reikai.java b/src/magic/card/Gods__Eye__Gate_to_the_Reikai.java index b670e5d3ff..e510b06ba5 100644 --- a/src/magic/card/Gods__Eye__Gate_to_the_Reikai.java +++ b/src/magic/card/Gods__Eye__Gate_to_the_Reikai.java @@ -13,7 +13,7 @@ public class Gods__Eye__Gate_to_the_Reikai { public static final MagicWhenPutIntoGraveyardTrigger T = new MagicWhenPutIntoGraveyardTrigger() { @Override public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicGraveyardTriggerData triggerData) { - return (MagicLocationType.Play == triggerData.fromLocation) ? + return (triggerData.fromLocation == MagicLocationType.Play) ? new MagicEvent( permanent, this, diff --git a/src/magic/card/Keiga__the_Tide_Star.java b/src/magic/card/Keiga__the_Tide_Star.java index 20ec08fdd6..a25d5a3b01 100644 --- a/src/magic/card/Keiga__the_Tide_Star.java +++ b/src/magic/card/Keiga__the_Tide_Star.java @@ -15,7 +15,7 @@ public class Keiga__the_Tide_Star { public static final MagicWhenPutIntoGraveyardTrigger T = new MagicWhenPutIntoGraveyardTrigger() { @Override public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicGraveyardTriggerData triggerData) { - return (MagicLocationType.Play==triggerData.fromLocation) ? + return (triggerData.fromLocation == MagicLocationType.Play) ? new MagicEvent( permanent, MagicTargetChoice.TARGET_CREATURE, diff --git a/src/magic/card/Kodama_of_the_Center_Tree.java b/src/magic/card/Kodama_of_the_Center_Tree.java index fcb2ff8312..a7d6d4aedd 100644 --- a/src/magic/card/Kodama_of_the_Center_Tree.java +++ b/src/magic/card/Kodama_of_the_Center_Tree.java @@ -34,7 +34,7 @@ public class Kodama_of_the_Center_Tree { final MagicGame game, final MagicPermanent permanent, final MagicGraveyardTriggerData triggerData) { - if (MagicLocationType.Play == triggerData.fromLocation) { + if (triggerData.fromLocation == MagicLocationType.Play) { final MagicPlayer player = permanent.getController(); final int cmc = game.filterTargets(player, MagicTargetFilter.TARGET_SPIRIT_YOU_CONTROL).size()+1; diff --git a/src/magic/card/Maalfeld_Twins.java b/src/magic/card/Maalfeld_Twins.java index 74d8fc7558..ec08224443 100644 --- a/src/magic/card/Maalfeld_Twins.java +++ b/src/magic/card/Maalfeld_Twins.java @@ -17,7 +17,7 @@ public class Maalfeld_Twins { final MagicGame game, final MagicPermanent permanent, final MagicGraveyardTriggerData triggerData) { - return (MagicLocationType.Play == triggerData.fromLocation) ? + return (triggerData.fromLocation == MagicLocationType.Play) ? new MagicEvent( permanent, this, diff --git a/src/magic/card/Mausoleum_Guard.java b/src/magic/card/Mausoleum_Guard.java index 00e938c1ca..954f1e7a5e 100644 --- a/src/magic/card/Mausoleum_Guard.java +++ b/src/magic/card/Mausoleum_Guard.java @@ -13,7 +13,7 @@ public class Mausoleum_Guard { public static final MagicWhenPutIntoGraveyardTrigger T = new MagicWhenPutIntoGraveyardTrigger() { @Override public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicGraveyardTriggerData triggerData) { - return (MagicLocationType.Play == triggerData.fromLocation) ? + return (triggerData.fromLocation == MagicLocationType.Play) ? new MagicEvent( permanent, this, diff --git a/src/magic/card/Mogg_War_Marshal.java b/src/magic/card/Mogg_War_Marshal.java index 3b345e4fd9..4ebf68a378 100644 --- a/src/magic/card/Mogg_War_Marshal.java +++ b/src/magic/card/Mogg_War_Marshal.java @@ -36,7 +36,7 @@ public class Mogg_War_Marshal { public static final MagicWhenPutIntoGraveyardTrigger T3 = new MagicWhenPutIntoGraveyardTrigger() { @Override public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicGraveyardTriggerData triggerData) { - return (MagicLocationType.Play == triggerData.fromLocation) ? + return (triggerData.fromLocation == MagicLocationType.Play) ? new MagicEvent( permanent, this, diff --git a/src/magic/card/Moldgraf_Monstrosity.java b/src/magic/card/Moldgraf_Monstrosity.java index ef264aab27..ddc0b26593 100644 --- a/src/magic/card/Moldgraf_Monstrosity.java +++ b/src/magic/card/Moldgraf_Monstrosity.java @@ -21,7 +21,7 @@ public class Moldgraf_Monstrosity { public static final MagicWhenPutIntoGraveyardTrigger T = new MagicWhenPutIntoGraveyardTrigger() { @Override public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicGraveyardTriggerData triggerData) { - return (MagicLocationType.Play == triggerData.fromLocation) ? + return (triggerData.fromLocation == MagicLocationType.Play) ? new MagicEvent( permanent, this, diff --git a/src/magic/card/Mycoid_Shepherd.java b/src/magic/card/Mycoid_Shepherd.java index 2ad8b556bd..146ef454fb 100644 --- a/src/magic/card/Mycoid_Shepherd.java +++ b/src/magic/card/Mycoid_Shepherd.java @@ -15,7 +15,7 @@ public class Mycoid_Shepherd { public static final MagicWhenPutIntoGraveyardTrigger T1 = new MagicWhenPutIntoGraveyardTrigger() { @Override public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicGraveyardTriggerData triggerData) { - return (MagicLocationType.Play == triggerData.fromLocation) ? + return (triggerData.fromLocation == MagicLocationType.Play) ? new MagicEvent( permanent, new MagicSimpleMayChoice( diff --git a/src/magic/card/Necropede.java b/src/magic/card/Necropede.java index 2ec167ee16..112deb2be0 100644 --- a/src/magic/card/Necropede.java +++ b/src/magic/card/Necropede.java @@ -17,7 +17,7 @@ public class Necropede { public static final MagicWhenPutIntoGraveyardTrigger T = new MagicWhenPutIntoGraveyardTrigger() { @Override public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicGraveyardTriggerData triggerData) { - return (MagicLocationType.Play == triggerData.fromLocation) ? + return (triggerData.fromLocation == MagicLocationType.Play) ? new MagicEvent( permanent, new MagicMayChoice( diff --git a/src/magic/card/Pitchburn_Devils.java b/src/magic/card/Pitchburn_Devils.java index e940dfbc77..9c5a0eda42 100644 --- a/src/magic/card/Pitchburn_Devils.java +++ b/src/magic/card/Pitchburn_Devils.java @@ -17,7 +17,7 @@ public class Pitchburn_Devils { public static final MagicWhenPutIntoGraveyardTrigger T = new MagicWhenPutIntoGraveyardTrigger() { @Override public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicGraveyardTriggerData triggerData) { - return (MagicLocationType.Play == triggerData.fromLocation) ? + return (triggerData.fromLocation == MagicLocationType.Play) ? new MagicEvent( permanent, MagicTargetChoice.NEG_TARGET_CREATURE_OR_PLAYER, diff --git a/src/magic/card/Polluted_Dead.java b/src/magic/card/Polluted_Dead.java index afb4fdf0d0..225f5ec623 100644 --- a/src/magic/card/Polluted_Dead.java +++ b/src/magic/card/Polluted_Dead.java @@ -18,7 +18,7 @@ public class Polluted_Dead { final MagicGame game, final MagicPermanent permanent, final MagicGraveyardTriggerData triggerData) { - return (MagicLocationType.Play == triggerData.fromLocation) ? + return (triggerData.fromLocation == MagicLocationType.Play) ? new MagicEvent( permanent, MagicTargetChoice.TARGET_LAND, diff --git a/src/magic/card/Roc_Egg.java b/src/magic/card/Roc_Egg.java index 2e8a642bea..006e23ca6b 100644 --- a/src/magic/card/Roc_Egg.java +++ b/src/magic/card/Roc_Egg.java @@ -13,7 +13,7 @@ public class Roc_Egg { public static final MagicWhenPutIntoGraveyardTrigger T = new MagicWhenPutIntoGraveyardTrigger() { @Override public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicGraveyardTriggerData triggerData) { - return (MagicLocationType.Play == triggerData.fromLocation) ? + return (triggerData.fromLocation == MagicLocationType.Play) ? new MagicEvent( permanent, this, diff --git a/src/magic/card/Rotcrown_Ghoul.java b/src/magic/card/Rotcrown_Ghoul.java index 1ad72c795a..27ca16716d 100644 --- a/src/magic/card/Rotcrown_Ghoul.java +++ b/src/magic/card/Rotcrown_Ghoul.java @@ -18,7 +18,7 @@ public class Rotcrown_Ghoul { final MagicGame game, final MagicPermanent permanent, final MagicGraveyardTriggerData triggerData) { - return (MagicLocationType.Play == triggerData.fromLocation) ? + return (triggerData.fromLocation == MagicLocationType.Play) ? new MagicEvent( permanent, permanent.getController(), diff --git a/src/magic/card/Soulcage_Fiend.java b/src/magic/card/Soulcage_Fiend.java index f9ecc58340..84a48c3c87 100644 --- a/src/magic/card/Soulcage_Fiend.java +++ b/src/magic/card/Soulcage_Fiend.java @@ -16,7 +16,7 @@ public class Soulcage_Fiend { final MagicGame game, final MagicPermanent permanent, final MagicGraveyardTriggerData triggerData) { - return (MagicLocationType.Play == triggerData.fromLocation) ? + return (triggerData.fromLocation == MagicLocationType.Play) ? new MagicEvent( permanent, permanent.getController(), diff --git a/src/magic/card/Sprouting_Thrinax.java b/src/magic/card/Sprouting_Thrinax.java index 748b3b717c..92cd4676b6 100644 --- a/src/magic/card/Sprouting_Thrinax.java +++ b/src/magic/card/Sprouting_Thrinax.java @@ -14,7 +14,7 @@ public class Sprouting_Thrinax { public static final MagicWhenPutIntoGraveyardTrigger T = new MagicWhenPutIntoGraveyardTrigger() { @Override public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicGraveyardTriggerData triggerData) { - return (MagicLocationType.Play==triggerData.fromLocation) ? + return (triggerData.fromLocation == MagicLocationType.Play) ? new MagicEvent( permanent, this, diff --git a/src/magic/card/Tuktuk_the_Explorer.java b/src/magic/card/Tuktuk_the_Explorer.java index 3c436e9b05..ba4629d47c 100644 --- a/src/magic/card/Tuktuk_the_Explorer.java +++ b/src/magic/card/Tuktuk_the_Explorer.java @@ -13,7 +13,7 @@ public class Tuktuk_the_Explorer { public static final MagicWhenPutIntoGraveyardTrigger T = new MagicWhenPutIntoGraveyardTrigger() { @Override public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicGraveyardTriggerData triggerData) { - return (MagicLocationType.Play==triggerData.fromLocation) ? + return (triggerData.fromLocation == MagicLocationType.Play) ? new MagicEvent( permanent, this, diff --git a/src/magic/card/Undead_Executioner.java b/src/magic/card/Undead_Executioner.java index 594df9daa1..445dde2a42 100644 --- a/src/magic/card/Undead_Executioner.java +++ b/src/magic/card/Undead_Executioner.java @@ -19,7 +19,7 @@ public class Undead_Executioner { final MagicGame game, final MagicPermanent permanent, final MagicGraveyardTriggerData triggerData) { - return (MagicLocationType.Play == triggerData.fromLocation) ? + return (triggerData.fromLocation == MagicLocationType.Play) ? new MagicEvent( permanent, new MagicMayChoice( diff --git a/src/magic/card/Weatherseed_Treefolk.java b/src/magic/card/Weatherseed_Treefolk.java index a61a3b4c41..29207531b3 100644 --- a/src/magic/card/Weatherseed_Treefolk.java +++ b/src/magic/card/Weatherseed_Treefolk.java @@ -17,7 +17,7 @@ public class Weatherseed_Treefolk { final MagicGame game, final MagicPermanent permanent, final MagicGraveyardTriggerData triggerData) { - return (MagicLocationType.Play == triggerData.fromLocation) ? + return (triggerData.fromLocation == MagicLocationType.Play) ? new MagicEvent( permanent, this, diff --git a/src/magic/card/Wurmcoil_Engine.java b/src/magic/card/Wurmcoil_Engine.java index 3242aa94db..3fe310581a 100644 --- a/src/magic/card/Wurmcoil_Engine.java +++ b/src/magic/card/Wurmcoil_Engine.java @@ -14,7 +14,7 @@ public class Wurmcoil_Engine { public static final MagicWhenPutIntoGraveyardTrigger T = new MagicWhenPutIntoGraveyardTrigger() { @Override public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicGraveyardTriggerData triggerData) { - return (MagicLocationType.Play==triggerData.fromLocation) ? + return (triggerData.fromLocation == MagicLocationType.Play) ? new MagicEvent( permanent, this, diff --git a/src/magic/data/CardDefinitions.java b/src/magic/data/CardDefinitions.java index d32b65fbdd..90d53f0ab7 100644 --- a/src/magic/data/CardDefinitions.java +++ b/src/magic/data/CardDefinitions.java @@ -172,15 +172,15 @@ public class CardDefinitions { } public static MagicCardDefinition getBasicLand(final MagicColor color) { - if (MagicColor.Black == color) { + if (color == MagicColor.Black) { return getCard("Swamp"); - } else if (MagicColor.Blue == color) { + } else if (color == MagicColor.Blue) { return getCard("Island"); - } else if (MagicColor.Green == color) { + } else if (color == MagicColor.Green) { return getCard("Forest"); - } else if (MagicColor.Red == color) { + } else if (color == MagicColor.Red) { return getCard("Mountain"); - } else if (MagicColor.White == color) { + } else if (color == MagicColor.White) { return getCard("Plains"); } throw new RuntimeException("No matching basic land for MagicColor " + color); diff --git a/src/magic/model/choice/MagicChoice.java b/src/magic/model/choice/MagicChoice.java index 6f29945019..6bd855de0f 100644 --- a/src/magic/model/choice/MagicChoice.java +++ b/src/magic/model/choice/MagicChoice.java @@ -117,10 +117,10 @@ public abstract class MagicChoice { final MagicSource source); public static boolean isYesChoice(final Object choiceResult) { - return YES_CHOICE==choiceResult; + return choiceResult == YES_CHOICE; } public static boolean isNoChoice(final Object choiceResult) { - return NO_CHOICE==choiceResult; + return choiceResult == NO_CHOICE; } } diff --git a/src/magic/model/trigger/MagicDieDrawCardTrigger.java b/src/magic/model/trigger/MagicDieDrawCardTrigger.java index 54f11c587d..98eccc620c 100644 --- a/src/magic/model/trigger/MagicDieDrawCardTrigger.java +++ b/src/magic/model/trigger/MagicDieDrawCardTrigger.java @@ -22,7 +22,7 @@ public class MagicDieDrawCardTrigger extends MagicWhenPutIntoGraveyardTrigger { final MagicGame game, final MagicPermanent permanent, final MagicGraveyardTriggerData triggerData) { - if (MagicLocationType.Play == triggerData.fromLocation) { + if (triggerData.fromLocation == MagicLocationType.Play) { return mustDraw ? new MagicEvent( permanent, diff --git a/src/magic/model/trigger/MagicModularTrigger.java b/src/magic/model/trigger/MagicModularTrigger.java index b0f6d29602..8a7ad7361d 100644 --- a/src/magic/model/trigger/MagicModularTrigger.java +++ b/src/magic/model/trigger/MagicModularTrigger.java @@ -24,7 +24,7 @@ public class MagicModularTrigger extends MagicWhenPutIntoGraveyardTrigger { @Override public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicGraveyardTriggerData triggerData) { - if (MagicLocationType.Play == triggerData.fromLocation) { + if (triggerData.fromLocation == MagicLocationType.Play) { final int amount = permanent.getCounters(MagicCounterType.PlusOne); return new MagicEvent( permanent, diff --git a/src/magic/model/trigger/MagicSoulshiftTrigger.java b/src/magic/model/trigger/MagicSoulshiftTrigger.java index fed5cb53b7..55f74416a5 100644 --- a/src/magic/model/trigger/MagicSoulshiftTrigger.java +++ b/src/magic/model/trigger/MagicSoulshiftTrigger.java @@ -29,7 +29,7 @@ public class MagicSoulshiftTrigger extends MagicWhenPutIntoGraveyardTrigger { final MagicGame game, final MagicPermanent permanent, final MagicGraveyardTriggerData triggerData) { - if (MagicLocationType.Play == triggerData.fromLocation) { + if (triggerData.fromLocation == MagicLocationType.Play) { final MagicPlayer player = permanent.getController(); final MagicTargetFilter targetFilter = new MagicTargetFilter.MagicCMCTargetFilter(