From 0d4acf26e5180d7976ff4ae9327c5dd7e0cc7705 Mon Sep 17 00:00:00 2001 From: xenohedron Date: Sun, 9 Jun 2024 22:10:32 -0400 Subject: [PATCH] refactor: improve method name - checkShortLivingLKI --- Mage.Sets/src/mage/cards/b/BoneyardScourge.java | 2 +- Mage.Sets/src/mage/cards/k/KayaTheInexorable.java | 2 +- Mage.Sets/src/mage/cards/n/NetherTraitor.java | 2 +- Mage/src/main/java/mage/abilities/AbilityImpl.java | 2 +- Mage/src/main/java/mage/abilities/StaticAbility.java | 2 +- Mage/src/main/java/mage/abilities/TriggeredAbilityImpl.java | 2 +- .../abilities/common/ExploitCreatureTriggeredAbility.java | 2 +- .../abilities/common/GodEternalDiesTriggeredAbility.java | 2 +- .../main/java/mage/abilities/effects/common/CopyEffect.java | 2 +- Mage/src/main/java/mage/game/Game.java | 5 ++++- Mage/src/main/java/mage/game/GameImpl.java | 2 +- 11 files changed, 14 insertions(+), 11 deletions(-) diff --git a/Mage.Sets/src/mage/cards/b/BoneyardScourge.java b/Mage.Sets/src/mage/cards/b/BoneyardScourge.java index a7386bf56af..bb5e0d8613c 100644 --- a/Mage.Sets/src/mage/cards/b/BoneyardScourge.java +++ b/Mage.Sets/src/mage/cards/b/BoneyardScourge.java @@ -95,7 +95,7 @@ class DiesWhileInGraveyardTriggeredAbility extends TriggeredAbilityImpl { } for (Zone z : Zone.values()) { - if (game.getShortLivingLKI(sourceId, z) && z != Zone.GRAVEYARD) { + if (game.checkShortLivingLKI(sourceId, z) && z != Zone.GRAVEYARD) { return false; } } diff --git a/Mage.Sets/src/mage/cards/k/KayaTheInexorable.java b/Mage.Sets/src/mage/cards/k/KayaTheInexorable.java index 18195343e1e..e52b32c15e9 100644 --- a/Mage.Sets/src/mage/cards/k/KayaTheInexorable.java +++ b/Mage.Sets/src/mage/cards/k/KayaTheInexorable.java @@ -113,7 +113,7 @@ class KayaTheInexorableTriggeredAbility extends TriggeredAbilityImpl { if (game.getState().getZone(getSourceId()) == Zone.BATTLEFIELD) { sourcePermanent = game.getPermanent(getSourceId()); } else { - if (game.getShortLivingLKI(getSourceId(), Zone.BATTLEFIELD)) { + if (game.checkShortLivingLKI(getSourceId(), Zone.BATTLEFIELD)) { sourcePermanent = (Permanent) game.getLastKnownInformation(getSourceId(), Zone.BATTLEFIELD); } } diff --git a/Mage.Sets/src/mage/cards/n/NetherTraitor.java b/Mage.Sets/src/mage/cards/n/NetherTraitor.java index 0bb178e8b2b..a4d9f339b6c 100644 --- a/Mage.Sets/src/mage/cards/n/NetherTraitor.java +++ b/Mage.Sets/src/mage/cards/n/NetherTraitor.java @@ -75,7 +75,7 @@ class NetherTraitorTriggeredAbility extends TriggeredAbilityImpl { public boolean checkTrigger(GameEvent event, Game game) { ZoneChangeEvent zEvent = (ZoneChangeEvent) event; for (Zone z : Zone.values()) { - if (game.getShortLivingLKI(sourceId, z) && z != Zone.GRAVEYARD) { + if (game.checkShortLivingLKI(sourceId, z) && z != Zone.GRAVEYARD) { return false; } } diff --git a/Mage/src/main/java/mage/abilities/AbilityImpl.java b/Mage/src/main/java/mage/abilities/AbilityImpl.java index dd4a4d9e2fb..9405b721775 100644 --- a/Mage/src/main/java/mage/abilities/AbilityImpl.java +++ b/Mage/src/main/java/mage/abilities/AbilityImpl.java @@ -1078,7 +1078,7 @@ public abstract class AbilityImpl implements Ability { parameterSourceId = getSourceId(); } // check against shortLKI for effects that move multiple object at the same time (e.g. destroy all) - if (game.getShortLivingLKI(getSourceId(), getZone())) { + if (game.checkShortLivingLKI(getSourceId(), getZone())) { return true; } // check against current state diff --git a/Mage/src/main/java/mage/abilities/StaticAbility.java b/Mage/src/main/java/mage/abilities/StaticAbility.java index 71ff35ca21f..f826eff405f 100644 --- a/Mage/src/main/java/mage/abilities/StaticAbility.java +++ b/Mage/src/main/java/mage/abilities/StaticAbility.java @@ -27,7 +27,7 @@ public abstract class StaticAbility extends AbilityImpl { @Override public boolean isInUseableZone(Game game, MageObject source, GameEvent event) { - if (game.getShortLivingLKI(getSourceId(), zone)) { + if (game.checkShortLivingLKI(getSourceId(), zone)) { return true; // maybe this can be a problem if effects removed the ability from the object } if (game.getPermanentEntering(getSourceId()) != null && zone == Zone.BATTLEFIELD) { diff --git a/Mage/src/main/java/mage/abilities/TriggeredAbilityImpl.java b/Mage/src/main/java/mage/abilities/TriggeredAbilityImpl.java index d6e21dfa75c..e25646942a1 100644 --- a/Mage/src/main/java/mage/abilities/TriggeredAbilityImpl.java +++ b/Mage/src/main/java/mage/abilities/TriggeredAbilityImpl.java @@ -452,7 +452,7 @@ public abstract class TriggeredAbilityImpl extends AbilityImpl implements Trigge // - ! empty stack ! graveyard ! no ! no ! no more to resolve // --!---------------!-------------!-----!-----------! // - - if (game.getShortLivingLKI(source.getSourceId(), Zone.BATTLEFIELD)) { + if (game.checkShortLivingLKI(source.getSourceId(), Zone.BATTLEFIELD)) { sourceObject = (Permanent) game.getLastKnownInformation(source.getSourceId(), Zone.BATTLEFIELD); } } diff --git a/Mage/src/main/java/mage/abilities/common/ExploitCreatureTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/ExploitCreatureTriggeredAbility.java index 4226882547e..9989905a53f 100644 --- a/Mage/src/main/java/mage/abilities/common/ExploitCreatureTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/ExploitCreatureTriggeredAbility.java @@ -54,7 +54,7 @@ public class ExploitCreatureTriggeredAbility extends TriggeredAbilityImpl { if (game.getState().getZone(getSourceId()) == Zone.BATTLEFIELD) { sourcePermanent = game.getPermanent(getSourceId()); } else { - if (game.getShortLivingLKI(getSourceId(), Zone.BATTLEFIELD)) { + if (game.checkShortLivingLKI(getSourceId(), Zone.BATTLEFIELD)) { sourcePermanent = (Permanent) game.getLastKnownInformation(getSourceId(), Zone.BATTLEFIELD); } } diff --git a/Mage/src/main/java/mage/abilities/common/GodEternalDiesTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/GodEternalDiesTriggeredAbility.java index 3bf545cd5bc..f8cc58d95b0 100644 --- a/Mage/src/main/java/mage/abilities/common/GodEternalDiesTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/GodEternalDiesTriggeredAbility.java @@ -55,7 +55,7 @@ public class GodEternalDiesTriggeredAbility extends TriggeredAbilityImpl { if (game.getState().getZone(getSourceId()) == Zone.BATTLEFIELD) { sourcePermanent = game.getPermanent(getSourceId()); } else { - if (game.getShortLivingLKI(getSourceId(), Zone.BATTLEFIELD)) { + if (game.checkShortLivingLKI(getSourceId(), Zone.BATTLEFIELD)) { sourcePermanent = (Permanent) game.getLastKnownInformation(getSourceId(), Zone.BATTLEFIELD); } } diff --git a/Mage/src/main/java/mage/abilities/effects/common/CopyEffect.java b/Mage/src/main/java/mage/abilities/effects/common/CopyEffect.java index 77006ad4ecd..eaadf209ab4 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/CopyEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/CopyEffect.java @@ -81,7 +81,7 @@ public class CopyEffect extends ContinuousEffectImpl { } Permanent permanent = affectedObjectList.get(0).getPermanent(game); if (permanent == null) { - if (!game.getShortLivingLKI(getSourceId(), Zone.BATTLEFIELD)) { + if (!game.checkShortLivingLKI(getSourceId(), Zone.BATTLEFIELD)) { discard(); return false; } diff --git a/Mage/src/main/java/mage/game/Game.java b/Mage/src/main/java/mage/game/Game.java index c12cfcba855..bc1e8d6cd5a 100644 --- a/Mage/src/main/java/mage/game/Game.java +++ b/Mage/src/main/java/mage/game/Game.java @@ -286,7 +286,10 @@ public interface Game extends MageItem, Serializable, Copyable { MageObject getLastKnownInformation(UUID objectId, Zone zone, int zoneChangeCounter); - boolean getShortLivingLKI(UUID objectId, Zone zone); + /** + * For checking if an object was in a zone during the resolution of an effect + */ + boolean checkShortLivingLKI(UUID objectId, Zone zone); void rememberLKI(UUID objectId, Zone zone, MageObject object); diff --git a/Mage/src/main/java/mage/game/GameImpl.java b/Mage/src/main/java/mage/game/GameImpl.java index 10032fa9c19..eb98537947e 100644 --- a/Mage/src/main/java/mage/game/GameImpl.java +++ b/Mage/src/main/java/mage/game/GameImpl.java @@ -3587,7 +3587,7 @@ public abstract class GameImpl implements Game { } @Override - public boolean getShortLivingLKI(UUID objectId, Zone zone) { + public boolean checkShortLivingLKI(UUID objectId, Zone zone) { Set idSet = lkiShortLiving.get(zone); if (idSet != null) { return idSet.contains(objectId);