Merge remote-tracking branch 'production/master' into production_master

This commit is contained in:
Oleg Agafonov 2017-12-29 06:16:51 +04:00
commit 78b8d64649

View file

@ -40,6 +40,7 @@ import mage.game.events.GameEvent;
import mage.game.events.ZoneChangeEvent;
import mage.game.permanent.Permanent;
import mage.game.permanent.PermanentCard;
import mage.game.permanent.PermanentImpl;
import mage.game.stack.StackAbility;
import mage.players.Player;
import mage.target.Target;
@ -98,7 +99,7 @@ public class AuraReplacementEffect extends ReplacementEffectImpl {
// Aura enters the battlefield attached
Object object = game.getState().getValue("attachTo:" + card.getId());
if (object != null) {
if (object instanceof PermanentCard) {
if (object instanceof PermanentImpl) {
// Aura is attached to a permanent on the battlefield
return false;
}