diff --git a/Mage/src/main/java/mage/cards/CardImpl.java b/Mage/src/main/java/mage/cards/CardImpl.java index ebe0e0aa52c..dd671cb3fb3 100644 --- a/Mage/src/main/java/mage/cards/CardImpl.java +++ b/Mage/src/main/java/mage/cards/CardImpl.java @@ -461,7 +461,7 @@ public abstract class CardImpl extends MageObjectImpl implements Card { @Override public boolean putOntoBattlefield(Game game, Zone fromZone, UUID sourceId, UUID controllerId, boolean tapped, boolean facedown, ArrayList appliedEffects) { - ZoneChangeEvent event = new ZoneChangeEvent(this.objectId, sourceId, controllerId, fromZone, Zone.BATTLEFIELD, appliedEffects, tapped); + ZoneChangeEvent event = new ZoneChangeEvent(this.objectId, sourceId, controllerId, fromZone, Zone.BATTLEFIELD, appliedEffects); if (facedown) { this.setFaceDown(true, game); } diff --git a/Mage/src/main/java/mage/cards/MeldCard.java b/Mage/src/main/java/mage/cards/MeldCard.java index d7ccc2d6578..0fb696ae937 100644 --- a/Mage/src/main/java/mage/cards/MeldCard.java +++ b/Mage/src/main/java/mage/cards/MeldCard.java @@ -279,7 +279,7 @@ public abstract class MeldCard extends CardImpl { game.setScopeRelevant(false); game.applyEffects(); if (entered) { - if (event.getFlag()) { + if (tapped) { permanent.setTapped(true); } event.setTarget(permanent); diff --git a/Mage/src/main/java/mage/constants/Zone.java b/Mage/src/main/java/mage/constants/Zone.java index 4acb086eec7..f9718238001 100644 --- a/Mage/src/main/java/mage/constants/Zone.java +++ b/Mage/src/main/java/mage/constants/Zone.java @@ -44,7 +44,7 @@ public enum Zone { if (this.equals(EXILED)) { return "exile zone"; } - return super.toString(); //To change body of generated methods, choose Tools | Templates. + return super.toString(); } } diff --git a/Mage/src/main/java/mage/game/events/ZoneChangeEvent.java b/Mage/src/main/java/mage/game/events/ZoneChangeEvent.java index e200e22652c..f4074354e86 100644 --- a/Mage/src/main/java/mage/game/events/ZoneChangeEvent.java +++ b/Mage/src/main/java/mage/game/events/ZoneChangeEvent.java @@ -67,17 +67,12 @@ public class ZoneChangeEvent extends GameEvent { } public ZoneChangeEvent(UUID targetId, UUID sourceId, UUID playerId, Zone fromZone, Zone toZone, ArrayList appliedEffects) { - this(targetId, sourceId, playerId, fromZone, toZone, appliedEffects, false); - } - - public ZoneChangeEvent(UUID targetId, UUID sourceId, UUID playerId, Zone fromZone, Zone toZone, ArrayList appliedEffects, boolean comesIntoPlayTapped) { super(EventType.ZONE_CHANGE, targetId, sourceId, playerId); this.fromZone = fromZone; this.toZone = toZone; if (appliedEffects != null) { this.appliedEffects = appliedEffects; } - this.flag = comesIntoPlayTapped; } public ZoneChangeEvent(Permanent target, UUID playerId, Zone fromZone, Zone toZone) { @@ -111,9 +106,4 @@ public class ZoneChangeEvent extends GameEvent { public boolean isDiesEvent() { return (toZone == Zone.GRAVEYARD && fromZone == Zone.BATTLEFIELD); } - - public boolean comesIntoPlayTapped() { - return this.flag; - } - } diff --git a/Mage/src/main/java/mage/players/PlayerImpl.java b/Mage/src/main/java/mage/players/PlayerImpl.java index d921af4bd41..51c0be590fb 100644 --- a/Mage/src/main/java/mage/players/PlayerImpl.java +++ b/Mage/src/main/java/mage/players/PlayerImpl.java @@ -3179,7 +3179,7 @@ public abstract class PlayerImpl implements Player, Serializable { if (faceDown) { card.setFaceDown(true, game); } - ZoneChangeEvent event = new ZoneChangeEvent(card.getId(), source.getSourceId(), controllingPlayerId, fromZone, Zone.BATTLEFIELD, appliedEffects, tapped); + ZoneChangeEvent event = new ZoneChangeEvent(card.getId(), source.getSourceId(), controllingPlayerId, fromZone, Zone.BATTLEFIELD, appliedEffects); if (!game.replaceEvent(event)) { // get permanent Permanent permanent;