* Fixed a bug that prevented most continuous effects from recognizing if a permanent made zone changes and so the permanent was considered as a valid target even if the permanent changed zones (e.g. was Cloudshifted).

This commit is contained in:
LevelX2 2014-04-05 02:51:11 +02:00
parent 042552aa1e
commit d031b93fd4
15 changed files with 39 additions and 41 deletions

View file

@ -137,8 +137,6 @@ class LilianaOfTheDarkRealmsEffect extends ContinuousEffectImpl<LilianaOfTheDark
if (player != null && player.chooseUse(Outcome.Neutral, message, game)) {
this.amount *= -1;
}
targetPointer.init(game, source);
}
@Override

View file

@ -113,7 +113,7 @@ class SharedAnimosityEffect extends ContinuousEffectImpl<SharedAnimosityEffect>
}
}
if(!isChangeling){
ArrayList<Predicate<MageObject>> predicateList = new ArrayList<Predicate<MageObject>>();
ArrayList<Predicate<MageObject>> predicateList = new ArrayList<>();
for(String subtype : permanent.getSubtype()){
predicateList.add(new SubtypePredicate(subtype));
}
@ -122,7 +122,6 @@ class SharedAnimosityEffect extends ContinuousEffectImpl<SharedAnimosityEffect>
power = game.getBattlefield().getActivePermanents(filter, source.getControllerId(), source.getId(), game).size();
}
targetPointer.init(game, source);
}
@Override

View file

@ -154,7 +154,7 @@ class RescueFromTheUnderworldCreateDelayedTriggeredAbilityEffect extends OneShot
for(Effect effect : delayedAbility.getEffects()) {
effect.getTargetPointer().init(game, source);
}
// add the scraificed creature as target
// add the sacrificed creature as target
for (Cost cost :source.getCosts()) {
if (cost instanceof SacrificeTargetCost) {
SacrificeTargetCost sacCost = (SacrificeTargetCost) cost;
@ -193,10 +193,7 @@ class RescueFromTheUnderworldDelayedTriggeredAbility extends DelayedTriggeredAbi
@Override
public boolean checkTrigger(GameEvent event, Game game) {
if (event.getType() == GameEvent.EventType.UPKEEP_STEP_PRE && event.getPlayerId().equals(this.controllerId)) {
return true;
}
return false;
return event.getType() == GameEvent.EventType.UPKEEP_STEP_PRE && event.getPlayerId().equals(this.controllerId);
}
@Override