diff --git a/Mage.Sets/src/mage/sets/fatereforged/BrutalHordechief.java b/Mage.Sets/src/mage/sets/fatereforged/BrutalHordechief.java index ae02ca23c5..35703bbb86 100644 --- a/Mage.Sets/src/mage/sets/fatereforged/BrutalHordechief.java +++ b/Mage.Sets/src/mage/sets/fatereforged/BrutalHordechief.java @@ -150,6 +150,17 @@ class BrutalHordechiefReplacementEffect extends ReplacementEffectImpl { return false; } + @Override + public boolean checksEventType(GameEvent event, Game game) { + return event.getType() == GameEvent.EventType.DECLARING_BLOCKERS; + } + + @Override + public boolean applies(GameEvent event, Ability source, Game game) { + Player controller = game.getPlayer(source.getControllerId()); + return controller != null && controller.hasOpponent(event.getPlayerId(), game); + } + @Override public boolean replaceEvent(GameEvent event, Ability source, Game game) { Player blockController = game.getPlayer(source.getControllerId()); @@ -158,16 +169,5 @@ class BrutalHordechiefReplacementEffect extends ReplacementEffectImpl { return true; } return false; - } - - @Override - public boolean checksEventType(GameEvent event, Game game) { - return event.getType() == GameEvent.EventType.DECLARING_BLOCKERS; - } - - @Override - public boolean applies(GameEvent event, Ability source, Game game) { - // this won't work correctly if coop formats are supported someday - return event.getPlayerId().equals(source.getSourceId()); - } -} \ No newline at end of file + } +} diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/AshcloudPhoenix.java b/Mage.Sets/src/mage/sets/khansoftarkir/AshcloudPhoenix.java index 5a03885f3d..115370c7f9 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/AshcloudPhoenix.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/AshcloudPhoenix.java @@ -59,7 +59,6 @@ public class AshcloudPhoenix extends CardImpl { this.expansionSetCode = "KTK"; this.subtype.add("Phoenix"); - this.color.setRed(true); this.power = new MageInt(4); this.toughness = new MageInt(1); diff --git a/Mage/src/mage/game/events/GameEvent.java b/Mage/src/mage/game/events/GameEvent.java index 5e85f5b032..994274a1be 100644 --- a/Mage/src/mage/game/events/GameEvent.java +++ b/Mage/src/mage/game/events/GameEvent.java @@ -109,7 +109,16 @@ public class GameEvent { COUNTER, COUNTERED, DECLARING_ATTACKERS, DECLARED_ATTACKERS, DECLARE_ATTACKER, ATTACKER_DECLARED, - DECLARING_BLOCKERS, DECLARED_BLOCKERS, + + /* DECLARING_BLOCKERS + targetId attackerId + sourceId not used for this event + playerId attackerId + amount not used for this event + flag not used for this event + */ + DECLARING_BLOCKERS, + DECLARED_BLOCKERS, DECLARE_BLOCKER, BLOCKER_DECLARED, CREATURE_BLOCKED, SEARCH_LIBRARY, LIBRARY_SEARCHED,