From 5c58e28f9b90d267694b947c668a132b8f30017f Mon Sep 17 00:00:00 2001 From: Susucre <34709007+Susucre@users.noreply.github.com> Date: Sat, 5 Aug 2023 00:37:11 +0200 Subject: [PATCH] Fix King of the Oathbreaker (#10747) --- .../common/PhaseInTriggeredAbility.java | 4 ++-- .../java/mage/game/permanent/PermanentImpl.java | 17 +++++++++-------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Mage/src/main/java/mage/abilities/common/PhaseInTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/PhaseInTriggeredAbility.java index 7f07a57f7a9..6446aa0f358 100644 --- a/Mage/src/main/java/mage/abilities/common/PhaseInTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/PhaseInTriggeredAbility.java @@ -9,7 +9,6 @@ import mage.game.events.GameEvent; import mage.game.permanent.Permanent; /** - * * @author TheElk801 */ public class PhaseInTriggeredAbility extends TriggeredAbilityImpl { @@ -26,8 +25,9 @@ public class PhaseInTriggeredAbility extends TriggeredAbilityImpl { setTriggerPhrase("Whenever " + filter.getMessage() + " phases in, "); } - public PhaseInTriggeredAbility(final PhaseInTriggeredAbility ability) { + private PhaseInTriggeredAbility(final PhaseInTriggeredAbility ability) { super(ability); + this.filter = ability.filter; } @Override diff --git a/Mage/src/main/java/mage/game/permanent/PermanentImpl.java b/Mage/src/main/java/mage/game/permanent/PermanentImpl.java index 31e9e1d594e..8573d494d13 100644 --- a/Mage/src/main/java/mage/game/permanent/PermanentImpl.java +++ b/Mage/src/main/java/mage/game/permanent/PermanentImpl.java @@ -669,7 +669,7 @@ public abstract class PermanentImpl extends CardImpl implements Permanent { attachedPerm.phaseIn(game, false); } } - fireEvent(EventType.PHASED_IN, game); + game.addSimultaneousEvent(GameEvent.getEvent(EventType.PHASED_IN, this.objectId, null, this.controllerId)); return true; } return false; @@ -1636,11 +1636,11 @@ public abstract class PermanentImpl extends CardImpl implements Permanent { @Override public void setRingBearer(Game game, boolean value) { - if(value == this.ringBearerFlag){ + if (value == this.ringBearerFlag) { return; } - if(value) { + if (value) { // The player may have another Ringbearer. We need to clear it if so. // // 701.52a Certain spells and abilities have the text “the Ring tempts you.” @@ -1649,17 +1649,16 @@ public abstract class PermanentImpl extends CardImpl implements Permanent { // becomes your Ring-bearer or another player gains control of it. Player player = game.getPlayer(getControllerId()); String playername = ""; - if(player != null){ + if (player != null) { playername = player.getLogName(); Permanent existingRingbearer = player.getRingBearer(game); - if(existingRingbearer != null && existingRingbearer.getId() != this.getId()){ + if (existingRingbearer != null && existingRingbearer.getId() != this.getId()) { existingRingbearer.setRingBearer(game, false); } } addInfo(ringbearerInfoKey, CardUtil.addToolTipMarkTags("Is " + playername + "'s Ring-bearer"), game); - } - else { + } else { addInfo(ringbearerInfoKey, null, game); } @@ -1821,7 +1820,9 @@ public abstract class PermanentImpl extends CardImpl implements Permanent { } @Override - public boolean isRingBearer() { return ringBearerFlag; } + public boolean isRingBearer() { + return ringBearerFlag; + } @Override public boolean fight(Permanent fightTarget, Ability source, Game game) {