diff --git a/Mage/src/main/java/mage/game/CardState.java b/Mage/src/main/java/mage/game/CardState.java index a5569f4e71d..8c1a618ab75 100644 --- a/Mage/src/main/java/mage/game/CardState.java +++ b/Mage/src/main/java/mage/game/CardState.java @@ -1,10 +1,7 @@ package mage.game; import java.io.Serializable; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; import mage.abilities.Abilities; @@ -21,7 +18,7 @@ import mage.util.Copyable; public class CardState implements Serializable, Copyable { protected boolean faceDown; - protected Map info; + protected Map info = new LinkedHashMap<>(); // additional info for card's rules protected Counters counters; protected Abilities abilities; protected boolean lostAllAbilities; @@ -36,10 +33,7 @@ public class CardState implements Serializable, Copyable { public CardState(final CardState state) { this.faceDown = state.faceDown; - if (state.info != null) { - info = new HashMap<>(); - info.putAll(state.info); - } + this.info.putAll(state.info); counters = state.counters.copy(); if (state.abilities != null) { abilities = new AbilitiesImpl<>(); diff --git a/Mage/src/main/java/mage/game/permanent/PermanentImpl.java b/Mage/src/main/java/mage/game/permanent/PermanentImpl.java index cd4701442db..700dfc8da36 100644 --- a/Mage/src/main/java/mage/game/permanent/PermanentImpl.java +++ b/Mage/src/main/java/mage/game/permanent/PermanentImpl.java @@ -106,7 +106,7 @@ public abstract class PermanentImpl extends CardImpl implements Permanent { protected int timesLoyaltyUsed = 0; protected int loyaltyActivationsAvailable = 1; protected int transformCount = 0; - protected Map info; + protected Map info = new LinkedHashMap<>(); // additional info for permanent's rules protected int createOrder; protected boolean legendRuleApplies = true; @@ -156,10 +156,7 @@ public abstract class PermanentImpl extends CardImpl implements Permanent { markedDamage.add(new MarkedDamageInfo(mdi.counter.copy(), mdi.sourceObject, mdi.addCounters)); } } - if (permanent.info != null) { - info = new HashMap<>(); - info.putAll(permanent.info); - } + this.info.putAll(permanent.info); this.counters = permanent.counters.copy(); this.attachedTo = permanent.attachedTo; this.attachedToZoneChangeCounter = permanent.attachedToZoneChangeCounter;