From 0ae89c453c5a2d845e3895484a4702b8fa96006e Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Sun, 12 Apr 2015 21:50:18 +0200 Subject: [PATCH] * Raid - Fixed that attacking with Meandering Towershell does fulfill the Raid condition. --- .../src/mage/sets/khansoftarkir/MeanderingTowershell.java | 3 +-- Mage/src/mage/watchers/common/PlayerAttackedWatcher.java | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Mage.Sets/src/mage/sets/khansoftarkir/MeanderingTowershell.java b/Mage.Sets/src/mage/sets/khansoftarkir/MeanderingTowershell.java index 7df660af488..87bcfe85461 100644 --- a/Mage.Sets/src/mage/sets/khansoftarkir/MeanderingTowershell.java +++ b/Mage.Sets/src/mage/sets/khansoftarkir/MeanderingTowershell.java @@ -42,7 +42,6 @@ import mage.constants.Rarity; import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; -import mage.game.events.GameEvent.EventType; import mage.game.permanent.Permanent; import mage.players.Player; @@ -70,12 +69,12 @@ public class MeanderingTowershell extends CardImpl { this.expansionSetCode = "KTK"; this.subtype.add("Turtle"); - this.color.setGreen(true); this.power = new MageInt(5); this.toughness = new MageInt(9); // Islandwalk this.addAbility(new IslandwalkAbility()); + // Whenever Meandering Towershell attacks, exile it. // Return it to the battlefield under your control tapped and attacking // at the beginning of the next declare attackers step on your next turn. diff --git a/Mage/src/mage/watchers/common/PlayerAttackedWatcher.java b/Mage/src/mage/watchers/common/PlayerAttackedWatcher.java index 3a9d6eb5314..59bf0c92ac1 100644 --- a/Mage/src/mage/watchers/common/PlayerAttackedWatcher.java +++ b/Mage/src/mage/watchers/common/PlayerAttackedWatcher.java @@ -65,9 +65,9 @@ public class PlayerAttackedWatcher extends Watcher { @Override public void watch(GameEvent event, Game game) { - if (event.getType() == GameEvent.EventType.DECLARED_ATTACKERS) { + if (event.getType() == GameEvent.EventType.ATTACKER_DECLARED) { int numberAttackers = playerAttacked.containsKey(event.getPlayerId()) ? playerAttacked.get(event.getPlayerId()) : 0; - playerAttacked.put(event.getPlayerId(), numberAttackers + game.getCombat().getAttackers().size()); + playerAttacked.put(event.getPlayerId(), numberAttackers + 1); } }