From 300bb550df80493414759b43a5bcc1499ffcdf57 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Mon, 10 Aug 2020 14:48:04 +0200 Subject: [PATCH] * Some code clean up. --- Mage.Sets/src/mage/cards/c/CelestialDawn.java | 4 ++-- Mage.Sets/src/mage/cards/c/CunningAbduction.java | 2 +- Mage.Sets/src/mage/cards/d/DeadMansChest.java | 2 +- Mage.Sets/src/mage/cards/g/GontiLordOfLuxury.java | 2 +- Mage.Sets/src/mage/cards/m/ManascapeRefractor.java | 2 +- Mage.Sets/src/mage/cards/m/MnemonicBetrayal.java | 4 ++-- Mage.Sets/src/mage/cards/m/MycosynthLattice.java | 3 +-- Mage.Sets/src/mage/cards/p/PsychicIntrusion.java | 2 +- Mage.Sets/src/mage/cards/q/QuicksilverElemental.java | 3 ++- Mage.Sets/src/mage/cards/s/SunglassesOfUrza.java | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Mage.Sets/src/mage/cards/c/CelestialDawn.java b/Mage.Sets/src/mage/cards/c/CelestialDawn.java index babf9c8d241..4501d984e55 100644 --- a/Mage.Sets/src/mage/cards/c/CelestialDawn.java +++ b/Mage.Sets/src/mage/cards/c/CelestialDawn.java @@ -200,7 +200,7 @@ class CelestialDawnSpendAnyManaEffect extends AsThoughEffectImpl implements AsTh @Override public boolean applies(UUID objectId, Ability source, UUID affectedControllerId, Game game) { - return affectedControllerId.equals(source.getControllerId()); + return source.isControlledBy(affectedControllerId); } @Override @@ -235,7 +235,7 @@ class CelestialDawnSpendColorlessManaEffect extends AsThoughEffectImpl implement @Override public boolean applies(UUID objectId, Ability source, UUID affectedControllerId, Game game) { - return affectedControllerId.equals(source.getControllerId()); + return source.isControlledBy(affectedControllerId); } @Override diff --git a/Mage.Sets/src/mage/cards/c/CunningAbduction.java b/Mage.Sets/src/mage/cards/c/CunningAbduction.java index e070eaf1aaa..8656e88d311 100644 --- a/Mage.Sets/src/mage/cards/c/CunningAbduction.java +++ b/Mage.Sets/src/mage/cards/c/CunningAbduction.java @@ -126,7 +126,7 @@ class CunningAbductionSpendAnyManaEffect extends AsThoughEffectImpl implements A if (objectId.equals(((FixedTarget) getTargetPointer()).getTarget()) && game.getState().getZoneChangeCounter(objectId) <= ((FixedTarget) getTargetPointer()).getZoneChangeCounter() + 1) { // if the card moved from exile to spell the zone change counter is increased by 1 (effect must applies before and on stack, use isCheckPlayableMode?) - return affectedControllerId.equals(source.getControllerId()); + return source.isControlledBy(affectedControllerId); } else if (((FixedTarget) getTargetPointer()).getTarget().equals(objectId)) { // object has moved zone so effect can be discarted this.discard(); diff --git a/Mage.Sets/src/mage/cards/d/DeadMansChest.java b/Mage.Sets/src/mage/cards/d/DeadMansChest.java index 880c50920b1..fa4652bd443 100644 --- a/Mage.Sets/src/mage/cards/d/DeadMansChest.java +++ b/Mage.Sets/src/mage/cards/d/DeadMansChest.java @@ -173,7 +173,7 @@ class DeadMansChestSpendManaEffect extends AsThoughEffectImpl implements AsThoug if (objectId.equals(((FixedTarget) getTargetPointer()).getTarget()) && game.getState().getZoneChangeCounter(objectId) <= ((FixedTarget) getTargetPointer()).getZoneChangeCounter() + 1) { // if the card moved from exile to spell the zone change counter is increased by 1 (effect must applies before and on stack, use isCheckPlayableMode?) - return affectedControllerId.equals(source.getControllerId()); + return source.isControlledBy(affectedControllerId); } else { if (((FixedTarget) getTargetPointer()).getTarget().equals(objectId)) { // object has moved zone so effect can be discarted diff --git a/Mage.Sets/src/mage/cards/g/GontiLordOfLuxury.java b/Mage.Sets/src/mage/cards/g/GontiLordOfLuxury.java index b4b5adf337b..8cb93d295be 100644 --- a/Mage.Sets/src/mage/cards/g/GontiLordOfLuxury.java +++ b/Mage.Sets/src/mage/cards/g/GontiLordOfLuxury.java @@ -196,7 +196,7 @@ class GontiLordOfLuxurySpendAnyManaEffect extends AsThoughEffectImpl implements if (objectId.equals(((FixedTarget) getTargetPointer()).getTarget()) && game.getState().getZoneChangeCounter(objectId) <= ((FixedTarget) getTargetPointer()).getZoneChangeCounter() + 1) { // if the card moved from exile to spell the zone change counter is increased by 1 (effect must applies before and on stack, use isCheckPlayableMode?) - return affectedControllerId.equals(source.getControllerId()); + return source.isControlledBy(affectedControllerId); } else if (((FixedTarget) getTargetPointer()).getTarget().equals(objectId)) { // object has moved zone so effect can be discarted this.discard(); diff --git a/Mage.Sets/src/mage/cards/m/ManascapeRefractor.java b/Mage.Sets/src/mage/cards/m/ManascapeRefractor.java index 632b6bbb1e0..f2b01168acc 100644 --- a/Mage.Sets/src/mage/cards/m/ManascapeRefractor.java +++ b/Mage.Sets/src/mage/cards/m/ManascapeRefractor.java @@ -125,7 +125,7 @@ class ManascapeRefractorSpendAnyManaEffect extends AsThoughEffectImpl implements @Override public boolean applies(UUID objectId, Ability source, UUID affectedControllerId, Game game) { objectId = CardUtil.getMainCardId(game, objectId); // for split cards - return objectId.equals(source.getSourceId()) && affectedControllerId.equals(source.getControllerId()); + return objectId.equals(source.getSourceId()) && source.isControlledBy(affectedControllerId); } @Override diff --git a/Mage.Sets/src/mage/cards/m/MnemonicBetrayal.java b/Mage.Sets/src/mage/cards/m/MnemonicBetrayal.java index 72a2393d7be..406b8dfbf6f 100644 --- a/Mage.Sets/src/mage/cards/m/MnemonicBetrayal.java +++ b/Mage.Sets/src/mage/cards/m/MnemonicBetrayal.java @@ -129,7 +129,7 @@ class MnemonicBetrayalCastFromExileEffect extends AsThoughEffectImpl { } return objectId.equals(card.getId()) && card.getZoneChangeCounter(game) == zoneCounter - && affectedControllerId.equals(source.getControllerId()) + && source.isControlledBy(affectedControllerId) && !card.isLand(); // cast only not play } } @@ -166,7 +166,7 @@ class MnemonicBetrayalAnyColorEffect extends AsThoughEffectImpl implements AsTho objectId = CardUtil.getMainCardId(game, objectId); // for split cards if (objectId.equals(card.getId()) && card.getZoneChangeCounter(game) <= zoneCounter + 1 - && affectedControllerId.equals(source.getControllerId())) { + && source.isControlledBy(affectedControllerId)) { return true; } else { if (objectId.equals(card.getId())) { diff --git a/Mage.Sets/src/mage/cards/m/MycosynthLattice.java b/Mage.Sets/src/mage/cards/m/MycosynthLattice.java index 7053ad1eab7..7696c63df90 100644 --- a/Mage.Sets/src/mage/cards/m/MycosynthLattice.java +++ b/Mage.Sets/src/mage/cards/m/MycosynthLattice.java @@ -152,8 +152,7 @@ class ManaCanBeSpentAsAnyColorEffect extends AsThoughEffectImpl implements AsTho @Override public boolean applies(UUID objectId, Ability source, UUID affectedControllerId, Game game) { - Player controller = game.getPlayer(source.getControllerId()); - return controller != null && game.getState().getPlayersInRange(controller.getId(), game).contains(affectedControllerId); + return game.getState().getPlayersInRange(source.getControllerId(), game).contains(affectedControllerId); } @Override diff --git a/Mage.Sets/src/mage/cards/p/PsychicIntrusion.java b/Mage.Sets/src/mage/cards/p/PsychicIntrusion.java index 40c1684df6e..251c3056bf3 100644 --- a/Mage.Sets/src/mage/cards/p/PsychicIntrusion.java +++ b/Mage.Sets/src/mage/cards/p/PsychicIntrusion.java @@ -184,7 +184,7 @@ class PsychicIntrusionSpendAnyManaEffect extends AsThoughEffectImpl implements A if (objectId.equals(((FixedTarget) getTargetPointer()).getTarget()) && game.getState().getZoneChangeCounter(objectId) <= ((FixedTarget) getTargetPointer()).getZoneChangeCounter() + 1) { // if the card moved from exile to spell the zone change counter is increased by 1 (effect must applies before and on stack, use isCheckPlayableMode?) - return affectedControllerId.equals(source.getControllerId()); + return source.isControlledBy(affectedControllerId); } else { if (((FixedTarget) getTargetPointer()).getTarget().equals(objectId)) { // object has moved zone so effect can be discarted diff --git a/Mage.Sets/src/mage/cards/q/QuicksilverElemental.java b/Mage.Sets/src/mage/cards/q/QuicksilverElemental.java index 622ee8bbb1a..c6726a97ecb 100644 --- a/Mage.Sets/src/mage/cards/q/QuicksilverElemental.java +++ b/Mage.Sets/src/mage/cards/q/QuicksilverElemental.java @@ -109,7 +109,8 @@ class QuickSilverElementalBlueManaEffect extends AsThoughEffectImpl implements A @Override public boolean applies(UUID objectId, Ability source, UUID affectedControllerId, Game game) { objectId = CardUtil.getMainCardId(game, objectId); // for split cards - return objectId.equals(source.getSourceId()) && affectedControllerId.equals(source.getControllerId()); + return objectId.equals(source.getSourceId()) + && source.isControlledBy(affectedControllerId); } @Override diff --git a/Mage.Sets/src/mage/cards/s/SunglassesOfUrza.java b/Mage.Sets/src/mage/cards/s/SunglassesOfUrza.java index fc335b7b9f5..61afaa3fb26 100644 --- a/Mage.Sets/src/mage/cards/s/SunglassesOfUrza.java +++ b/Mage.Sets/src/mage/cards/s/SunglassesOfUrza.java @@ -54,7 +54,7 @@ class SunglassesOfUrzaManaAsThoughtEffect extends AsThoughEffectImpl implements @Override public boolean applies(UUID objectId, Ability source, UUID affectedControllerId, Game game) { - return affectedControllerId.equals(source.getControllerId()); + return source.isControlledBy(affectedControllerId); } @Override