From 48cfe249f722a706dbfc90179a76fc1d238c9d95 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Tue, 20 Mar 2018 13:39:48 +0100 Subject: [PATCH] * Fixed a problem that a gained "is all creature types" from continous effects were not propertly reset on permanents. --- Mage/src/main/java/mage/MageObjectImpl.java | 1 + Mage/src/main/java/mage/cards/CardImpl.java | 11 ----------- .../main/java/mage/game/permanent/PermanentCard.java | 1 + .../main/java/mage/game/permanent/PermanentToken.java | 1 + 4 files changed, 3 insertions(+), 11 deletions(-) diff --git a/Mage/src/main/java/mage/MageObjectImpl.java b/Mage/src/main/java/mage/MageObjectImpl.java index e733dc1fba9..d29811d8095 100644 --- a/Mage/src/main/java/mage/MageObjectImpl.java +++ b/Mage/src/main/java/mage/MageObjectImpl.java @@ -105,6 +105,7 @@ public abstract class MageObjectImpl implements MageObject { abilities = object.abilities.copy(); this.cardType.addAll(object.cardType); this.subtype.addAll(object.subtype); + isAllCreatureTypes = object.isAllCreatureTypes; supertype.addAll(object.supertype); this.copy = object.copy; textParts = new ArrayList<>(); diff --git a/Mage/src/main/java/mage/cards/CardImpl.java b/Mage/src/main/java/mage/cards/CardImpl.java index 4fc6a220e94..2ebac99fff3 100644 --- a/Mage/src/main/java/mage/cards/CardImpl.java +++ b/Mage/src/main/java/mage/cards/CardImpl.java @@ -89,7 +89,6 @@ public abstract class CardImpl extends MageObjectImpl implements Card { protected boolean usesVariousArt = false; protected boolean splitCard; protected boolean morphCard; - protected boolean allCreatureTypes; protected List attachments = new ArrayList<>(); @@ -857,16 +856,6 @@ public abstract class CardImpl extends MageObjectImpl implements Card { return super.getSubtype(game); } - @Override - public boolean isAllCreatureTypes() { - return allCreatureTypes; - } - - @Override - public void setIsAllCreatureTypes(boolean value) { - allCreatureTypes = value; - } - @Override public List getAttachments() { return attachments; diff --git a/Mage/src/main/java/mage/game/permanent/PermanentCard.java b/Mage/src/main/java/mage/game/permanent/PermanentCard.java index 1e7e10d2dd9..e4f6d9f0c79 100644 --- a/Mage/src/main/java/mage/game/permanent/PermanentCard.java +++ b/Mage/src/main/java/mage/game/permanent/PermanentCard.java @@ -124,6 +124,7 @@ public class PermanentCard extends PermanentImpl { } this.subtype.clear(); this.subtype.addAll(card.getSubtype(game)); + this.isAllCreatureTypes = card.isAllCreatureTypes(); this.supertype.clear(); supertype.addAll(card.getSuperType()); this.expansionSetCode = card.getExpansionSetCode(); diff --git a/Mage/src/main/java/mage/game/permanent/PermanentToken.java b/Mage/src/main/java/mage/game/permanent/PermanentToken.java index 51f62bd528c..c005bef4294 100644 --- a/Mage/src/main/java/mage/game/permanent/PermanentToken.java +++ b/Mage/src/main/java/mage/game/permanent/PermanentToken.java @@ -92,6 +92,7 @@ public class PermanentToken extends PermanentImpl { this.supertype.addAll(token.getSuperType()); this.subtype.clear(); this.subtype.addAll(token.getSubtype(game)); + this.isAllCreatureTypes = token.isAllCreatureTypes(); this.tokenDescriptor = token.getTokenDescriptor(); }