From 502ca34d14565ae25397822a1a37ca7599c97e80 Mon Sep 17 00:00:00 2001 From: xenohedron Date: Sun, 2 Jun 2024 03:25:40 -0400 Subject: [PATCH] add docs related to phasing methods, adjust method name --- .../src/main/java/mage/game/permanent/Battlefield.java | 10 ++++++++-- Mage/src/main/java/mage/players/PlayerImpl.java | 4 ++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Mage/src/main/java/mage/game/permanent/Battlefield.java b/Mage/src/main/java/mage/game/permanent/Battlefield.java index eae8cc54dce..7a57d75d044 100644 --- a/Mage/src/main/java/mage/game/permanent/Battlefield.java +++ b/Mage/src/main/java/mage/game/permanent/Battlefield.java @@ -275,7 +275,10 @@ public class Battlefield implements Serializable { } } - public List getPhasedIn(Game game, UUID controllerId) { + /** + * Returns controlled permanents with phasing ability that are phased in, so that they can be phased out + */ + public List getPhasingOut(Game game, UUID controllerId) { return field.values() .stream() .filter(perm -> perm.hasAbility(PhasingAbility.getInstance(), game) @@ -284,7 +287,10 @@ public class Battlefield implements Serializable { .collect(Collectors.toList()); } - public List getPhasedOut(Game game, UUID controllerId) { + /** + * Returns controlled permanents that are phased out, so that they can be phased in + */ + public List getPhasedOut(UUID controllerId) { return field.values() .stream() .filter(perm -> !perm.isPhasedIn() && perm.isControlledBy(controllerId)) diff --git a/Mage/src/main/java/mage/players/PlayerImpl.java b/Mage/src/main/java/mage/players/PlayerImpl.java index 831ab10fc79..37967387fe5 100644 --- a/Mage/src/main/java/mage/players/PlayerImpl.java +++ b/Mage/src/main/java/mage/players/PlayerImpl.java @@ -1886,8 +1886,8 @@ public abstract class PlayerImpl implements Player, Serializable { @Override public void phasing(Game game) { //20091005 - 502.1 - List phasedOut = game.getBattlefield().getPhasedOut(game, playerId); - for (Permanent permanent : game.getBattlefield().getPhasedIn(game, playerId)) { + List phasedOut = game.getBattlefield().getPhasedOut(playerId); + for (Permanent permanent : game.getBattlefield().getPhasingOut(game, playerId)) { // 502.15i When a permanent phases out, any local enchantments or Equipment // attached to that permanent phase out at the same time. This alternate way of // phasing out is known as phasing out "indirectly." An enchantment or Equipment