fixed Generous Patron not triggering

This commit is contained in:
Evan Kranzler 2018-06-05 21:39:40 -04:00
parent 91c0c700cc
commit e58e4c4615

View file

@ -1,4 +1,3 @@
package mage.cards.g;
import java.util.UUID;
@ -63,12 +62,16 @@ class GenerousPatronTriggeredAbility extends TriggeredAbilityImpl {
@Override
public boolean checkTrigger(GameEvent event, Game game) {
if (!getControllerId().equals(game.getControllerId(event.getSourceId()))) {
return false;
}
Permanent permanent = game.getPermanentOrLKIBattlefield(event.getTargetId());
return event.getPlayerId().equals(this.getControllerId())
&& permanent != null
if (permanent == null) {
permanent = game.getPermanentEntering(event.getTargetId());
}
return permanent != null
&& permanent.isCreature()
&& !permanent.getControllerId().equals(getControllerId())
&& event.getAmount() > 0;
&& !permanent.getControllerId().equals(getControllerId());
}
@Override