Merge pull request #2973 from spjspj/master

Fix for UndeadAlchemist
This commit is contained in:
spjspj 2017-03-16 00:50:08 +11:00 committed by GitHub
commit 4824b96640

View file

@ -150,8 +150,9 @@ class UndeadAlchemistEffect extends ReplacementEffectImpl {
public boolean applies(GameEvent event, Ability source, Game game) {
DamagePlayerEvent damageEvent = (DamagePlayerEvent) event;
if (damageEvent.isCombatDamage()) {
UUID controllerId = source.getControllerId();
Permanent permanent = game.getPermanent(event.getSourceId());
if (permanent != null && permanent.hasSubtype("Zombie", game)) {
if (permanent != null && permanent.hasSubtype("Zombie", game) && permanent.getControllerId() == controllerId) {
return true;
}
}