From fca3b9a42a955d6584254256d2fc9a19fb36bb5d Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Thu, 7 Apr 2016 22:56:32 +0200 Subject: [PATCH] Fixed usable zone check for transformmable permanents (fixes #1800). --- .../sets/darkascension/HuntmasterOfTheFells.java | 12 ------------ .../mage/sets/darkascension/RavagerOfTheFells.java | 9 --------- .../sets/shadowsoverinnistrad/AvacynThePurifier.java | 10 ---------- .../mage/sets/shadowsoverinnistrad/AwokenHorror.java | 9 --------- .../sets/shadowsoverinnistrad/KindlyStranger.java | 10 ---------- .../shadowsoverinnistrad/LunarchInquisitors.java | 10 ---------- 6 files changed, 60 deletions(-) diff --git a/Mage.Sets/src/mage/sets/darkascension/HuntmasterOfTheFells.java b/Mage.Sets/src/mage/sets/darkascension/HuntmasterOfTheFells.java index 715c63ce32a..db0e4bcf07a 100644 --- a/Mage.Sets/src/mage/sets/darkascension/HuntmasterOfTheFells.java +++ b/Mage.Sets/src/mage/sets/darkascension/HuntmasterOfTheFells.java @@ -29,7 +29,6 @@ package mage.sets.darkascension; import java.util.UUID; import mage.MageInt; -import mage.MageObject; import mage.abilities.TriggeredAbility; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -99,17 +98,6 @@ class HuntmasterOfTheFellsAbility extends TriggeredAbilityImpl { return new HuntmasterOfTheFellsAbility(this); } - @Override - public boolean isInUseableZone(Game game, MageObject source, GameEvent event) { - if (event.getType() == GameEvent.EventType.TRANSFORMED) { - Permanent currentSourceObject = (Permanent) getSourceObjectIfItStillExists(game); - if (currentSourceObject != null && !currentSourceObject.isNightCard()) { - return true; - } - } - return super.isInUseableZone(game, source, event); - } - @Override public boolean checkEventType(GameEvent event, Game game) { return event.getType() == GameEvent.EventType.TRANSFORMED || event.getType() == GameEvent.EventType.ENTERS_THE_BATTLEFIELD; diff --git a/Mage.Sets/src/mage/sets/darkascension/RavagerOfTheFells.java b/Mage.Sets/src/mage/sets/darkascension/RavagerOfTheFells.java index 84b6c9c713a..e510f4c3051 100644 --- a/Mage.Sets/src/mage/sets/darkascension/RavagerOfTheFells.java +++ b/Mage.Sets/src/mage/sets/darkascension/RavagerOfTheFells.java @@ -121,15 +121,6 @@ class RavagerOfTheFellsAbility extends TriggeredAbilityImpl { return event.getType() == GameEvent.EventType.TRANSFORMED; } - @Override - public boolean isInUseableZone(Game game, MageObject source, GameEvent event) { - Permanent currentSourceObject = (Permanent) getSourceObjectIfItStillExists(game); - if (currentSourceObject != null && currentSourceObject.isNightCard()) { - return true; - } - return super.isInUseableZone(game, source, event); - } - @Override public boolean checkTrigger(GameEvent event, Game game) { if (event.getTargetId().equals(sourceId)) { diff --git a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/AvacynThePurifier.java b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/AvacynThePurifier.java index f3860600798..d99e222d22c 100644 --- a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/AvacynThePurifier.java +++ b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/AvacynThePurifier.java @@ -30,7 +30,6 @@ package mage.sets.shadowsoverinnistrad; import java.util.List; import java.util.UUID; import mage.MageInt; -import mage.MageObject; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.OneShotEffect; @@ -102,15 +101,6 @@ class AvacynThePurifierAbility extends TriggeredAbilityImpl { return event.getType() == GameEvent.EventType.TRANSFORMED; } - @Override - public boolean isInUseableZone(Game game, MageObject source, GameEvent event) { - Permanent currentSourceObject = (Permanent) getSourceObjectIfItStillExists(game); - if (currentSourceObject != null && currentSourceObject.isNightCard()) { - return true; - } - return super.isInUseableZone(game, source, event); - } - @Override public boolean checkTrigger(GameEvent event, Game game) { if (event.getTargetId().equals(sourceId)) { diff --git a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/AwokenHorror.java b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/AwokenHorror.java index a1705b9cb75..9ee4e82518c 100644 --- a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/AwokenHorror.java +++ b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/AwokenHorror.java @@ -99,15 +99,6 @@ class AwokenHorrorAbility extends TriggeredAbilityImpl { return event.getType() == GameEvent.EventType.TRANSFORMED; } -// @Override -// public boolean isInUseableZone(Game game, MageObject source, GameEvent event) { -// Permanent currentSourceObject = (Permanent) getSourceObjectIfItStillExists(game); -// if (currentSourceObject != null && currentSourceObject.isTransformed()) { -// // hard to check if the not transformed source hat the ability. But if it was transformed it probably had it, but maybe no perfect solution -// return true; -// } -// return false; -// } @Override public boolean checkTrigger(GameEvent event, Game game) { if (event.getTargetId().equals(sourceId)) { diff --git a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/KindlyStranger.java b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/KindlyStranger.java index dcb1884ce82..e96049f06b7 100644 --- a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/KindlyStranger.java +++ b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/KindlyStranger.java @@ -29,7 +29,6 @@ package mage.sets.shadowsoverinnistrad; import java.util.UUID; import mage.MageInt; -import mage.MageObject; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.condition.common.DeliriumCondition; import mage.abilities.costs.mana.ManaCostsImpl; @@ -107,15 +106,6 @@ class DemonPossessedWitchAbility extends TriggeredAbilityImpl { return event.getType() == GameEvent.EventType.TRANSFORMED; } - @Override - public boolean isInUseableZone(Game game, MageObject source, GameEvent event) { - Permanent currentSourceObject = (Permanent) getSourceObjectIfItStillExists(game); - if (currentSourceObject != null && currentSourceObject.isNightCard()) { - return true; - } - return super.isInUseableZone(game, source, event); - } - @Override public boolean checkTrigger(GameEvent event, Game game) { if (event.getTargetId().equals(sourceId)) { diff --git a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/LunarchInquisitors.java b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/LunarchInquisitors.java index 179f45dc05e..1904584277a 100644 --- a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/LunarchInquisitors.java +++ b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/LunarchInquisitors.java @@ -29,7 +29,6 @@ package mage.sets.shadowsoverinnistrad; import java.util.UUID; import mage.MageInt; -import mage.MageObject; import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.delayed.OnLeaveReturnExiledToBattlefieldAbility; @@ -106,15 +105,6 @@ class LunarchInquisitorsAbility extends TriggeredAbilityImpl { return event.getType() == GameEvent.EventType.TRANSFORMED; } - @Override - public boolean isInUseableZone(Game game, MageObject source, GameEvent event) { - Permanent currentSourceObject = (Permanent) getSourceObjectIfItStillExists(game); - if (currentSourceObject != null && currentSourceObject.isNightCard()) { - return true; - } - return super.isInUseableZone(game, source, event); - } - @Override public boolean checkTrigger(GameEvent event, Game game) { if (event.getTargetId().equals(sourceId)) {