Fix King of the Oathbreaker (#10747)

This commit is contained in:
Susucre 2023-08-05 00:37:11 +02:00 committed by GitHub
parent 9889baa0bc
commit 5c58e28f9b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 10 deletions

View file

@ -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

View file

@ -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) {