1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-04-10 17:00:08 -09:00

Merge pull request from SpikesCafe-google/SpikesCafe-google-reyhan

Fix Reyhan death trigger (fixes )
This commit is contained in:
SpikesCafe-google 2018-01-20 23:40:29 -05:00 committed by GitHub
commit 57a9c04032
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -108,19 +108,31 @@ class ReyhanLastOfTheAbzanTriggeredAbility extends TriggeredAbilityImpl {
@Override @Override
public boolean checkTrigger(GameEvent event, Game game) { public boolean checkTrigger(GameEvent event, Game game) {
if ((((ZoneChangeEvent) event).getToZone() == Zone.GRAVEYARD || ((ZoneChangeEvent) event).getToZone() == Zone.COMMAND) ZoneChangeEvent zcEvent = (ZoneChangeEvent) event;
&& ((ZoneChangeEvent) event).getFromZone() == Zone.BATTLEFIELD) { // Dies or is put in the command zone
Permanent permanent = (Permanent) game.getLastKnownInformation(event.getTargetId(), Zone.BATTLEFIELD); if (zcEvent.getFromZone() != Zone.BATTLEFIELD) {
if (permanent.getControllerId().equals(this.getControllerId()) && permanent.isCreature()) { return false;
int countersOn = permanent.getCounters(game).getCount(CounterType.P1P1);
if (countersOn > 0) {
this.getEffects().clear();
this.addEffect(new AddCountersTargetEffect(CounterType.P1P1.createInstance(countersOn)));
}
return true;
}
} }
return false; if (zcEvent.getToZone() != Zone.GRAVEYARD && zcEvent.getToZone() != Zone.COMMAND) {
return false;
}
Permanent permanent = (Permanent) game.getLastKnownInformation(event.getTargetId(), Zone.BATTLEFIELD);
// A creature you control
if (!permanent.getControllerId().equals(this.getControllerId()) || !permanent.isCreature()) {
return false;
}
// If it had one or more +1/+1 counters on it
int countersOn = permanent.getCounters(game).getCount(CounterType.P1P1);
if (countersOn == 0) {
return false;
}
// You may put that may +1/+1 counters on target creature
this.getEffects().clear();
this.addEffect(new AddCountersTargetEffect(CounterType.P1P1.createInstance(countersOn)));
return true;
} }
@Override @Override