External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-22 11:32:00 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed usable zone check for transformmable permanents (fixes #1800).

Browse source
This commit is contained in:
LevelX2 2016-04-07 22:56:32 +02:00
parent 24faec3d12
commit fca3b9a42a
6 changed files with 0 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Mage.Sets/src/mage/sets/darkascension/HuntmasterOfTheFells.java
View file

@ -29,7 +29,6 @@ package mage.sets.darkascension;
import java.util.UUID; import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.MageObject;
import mage.abilities.TriggeredAbility; import mage.abilities.TriggeredAbility;
import mage.abilities.TriggeredAbilityImpl; import mage.abilities.TriggeredAbilityImpl;
import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility;
@ -99,17 +98,6 @@ class HuntmasterOfTheFellsAbility extends TriggeredAbilityImpl {
return new HuntmasterOfTheFellsAbility(this); 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 @Override
public boolean checkEventType(GameEvent event, Game game) { public boolean checkEventType(GameEvent event, Game game) {
return event.getType() == GameEvent.EventType.TRANSFORMED || event.getType() == GameEvent.EventType.ENTERS_THE_BATTLEFIELD; return event.getType() == GameEvent.EventType.TRANSFORMED || event.getType() == GameEvent.EventType.ENTERS_THE_BATTLEFIELD;

9
Mage.Sets/src/mage/sets/darkascension/RavagerOfTheFells.java
View file

@ -121,15 +121,6 @@ class RavagerOfTheFellsAbility extends TriggeredAbilityImpl {
return event.getType() == GameEvent.EventType.TRANSFORMED; 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 @Override
public boolean checkTrigger(GameEvent event, Game game) { public boolean checkTrigger(GameEvent event, Game game) {
if (event.getTargetId().equals(sourceId)) { if (event.getTargetId().equals(sourceId)) {

10
Mage.Sets/src/mage/sets/shadowsoverinnistrad/AvacynThePurifier.java
View file

@ -30,7 +30,6 @@ package mage.sets.shadowsoverinnistrad;
import java.util.List; import java.util.List;
import java.util.UUID; import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.MageObject;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.TriggeredAbilityImpl; import mage.abilities.TriggeredAbilityImpl;
import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.OneShotEffect;
@ -102,15 +101,6 @@ class AvacynThePurifierAbility extends TriggeredAbilityImpl {
return event.getType() == GameEvent.EventType.TRANSFORMED; 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 @Override
public boolean checkTrigger(GameEvent event, Game game) { public boolean checkTrigger(GameEvent event, Game game) {
if (event.getTargetId().equals(sourceId)) { if (event.getTargetId().equals(sourceId)) {

9
Mage.Sets/src/mage/sets/shadowsoverinnistrad/AwokenHorror.java
View file

@ -99,15 +99,6 @@ class AwokenHorrorAbility extends TriggeredAbilityImpl {
return event.getType() == GameEvent.EventType.TRANSFORMED; 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 @Override
public boolean checkTrigger(GameEvent event, Game game) { public boolean checkTrigger(GameEvent event, Game game) {
if (event.getTargetId().equals(sourceId)) { if (event.getTargetId().equals(sourceId)) {

10
Mage.Sets/src/mage/sets/shadowsoverinnistrad/KindlyStranger.java
View file

@ -29,7 +29,6 @@ package mage.sets.shadowsoverinnistrad;
import java.util.UUID; import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.MageObject;
import mage.abilities.TriggeredAbilityImpl; import mage.abilities.TriggeredAbilityImpl;
import mage.abilities.condition.common.DeliriumCondition; import mage.abilities.condition.common.DeliriumCondition;
import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.costs.mana.ManaCostsImpl;
@ -107,15 +106,6 @@ class DemonPossessedWitchAbility extends TriggeredAbilityImpl {
return event.getType() == GameEvent.EventType.TRANSFORMED; 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 @Override
public boolean checkTrigger(GameEvent event, Game game) { public boolean checkTrigger(GameEvent event, Game game) {
if (event.getTargetId().equals(sourceId)) { if (event.getTargetId().equals(sourceId)) {

10
Mage.Sets/src/mage/sets/shadowsoverinnistrad/LunarchInquisitors.java
View file

@ -29,7 +29,6 @@ package mage.sets.shadowsoverinnistrad;
import java.util.UUID; import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.MageObject;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.TriggeredAbilityImpl; import mage.abilities.TriggeredAbilityImpl;
import mage.abilities.common.delayed.OnLeaveReturnExiledToBattlefieldAbility; import mage.abilities.common.delayed.OnLeaveReturnExiledToBattlefieldAbility;
@ -106,15 +105,6 @@ class LunarchInquisitorsAbility extends TriggeredAbilityImpl {
return event.getType() == GameEvent.EventType.TRANSFORMED; 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 @Override
public boolean checkTrigger(GameEvent event, Game game) { public boolean checkTrigger(GameEvent event, Game game) {
if (event.getTargetId().equals(sourceId)) { if (event.getTargetId().equals(sourceId)) {