From ff3df354678e557f86dfab8030df41e7865ae935 Mon Sep 17 00:00:00 2001 From: Oleg Agafonov Date: Sat, 7 Mar 2020 00:24:16 +0400 Subject: [PATCH] Fixed NPE errors on empty sourceId in mage reference object; --- .../src/mage/cards/v/VizierOfManyFaces.java | 12 ++++++------ .../main/java/mage/MageObjectReference.java | 18 ++++++++++++------ .../predicate/mageobject/CardIdPredicate.java | 7 +++---- .../mage/target/targetpointer/FixedTarget.java | 6 ++++-- .../target/targetpointer/FixedTargets.java | 14 +++++++------- 5 files changed, 32 insertions(+), 25 deletions(-) diff --git a/Mage.Sets/src/mage/cards/v/VizierOfManyFaces.java b/Mage.Sets/src/mage/cards/v/VizierOfManyFaces.java index ba8cc9edb23..e449f79c6d5 100644 --- a/Mage.Sets/src/mage/cards/v/VizierOfManyFaces.java +++ b/Mage.Sets/src/mage/cards/v/VizierOfManyFaces.java @@ -1,9 +1,5 @@ - package mage.cards.v; -import java.util.HashSet; -import java.util.Set; -import java.util.UUID; import mage.MageInt; import mage.MageObject; import mage.MageObjectReference; @@ -26,8 +22,12 @@ import mage.game.permanent.PermanentToken; import mage.util.functions.ApplyToPermanent; import mage.watchers.Watcher; +import java.util.HashSet; +import java.util.Objects; +import java.util.Set; +import java.util.UUID; + /** - * * @author LevelX2 */ public final class VizierOfManyFaces extends CardImpl { @@ -75,7 +75,7 @@ class VizierOfManyFacesApplyToPermanent extends ApplyToPermanent { EmbalmedThisTurnWatcher watcher = game.getState().getWatcher(EmbalmedThisTurnWatcher.class); if (watcher != null) { for (MageObjectReference mor : watcher.getEmbalmedThisTurnCards()) { - if (mor.getSourceId().equals(originalCardId) && game.getState().getZoneChangeCounter(originalCardId) == mor.getZoneChangeCounter()) { + if (Objects.equals(mor.getSourceId(), originalCardId) && game.getState().getZoneChangeCounter(originalCardId) == mor.getZoneChangeCounter()) { permanent.getManaCost().clear(); if (!permanent.hasSubtype(SubType.ZOMBIE, game)) { permanent.getSubtype(game).add(SubType.ZOMBIE); diff --git a/Mage/src/main/java/mage/MageObjectReference.java b/Mage/src/main/java/mage/MageObjectReference.java index a4f2a81302f..7a30623c5bf 100644 --- a/Mage/src/main/java/mage/MageObjectReference.java +++ b/Mage/src/main/java/mage/MageObjectReference.java @@ -9,6 +9,7 @@ import mage.game.stack.StackObject; import org.apache.log4j.Logger; import java.io.Serializable; +import java.util.Objects; import java.util.UUID; /** @@ -37,7 +38,7 @@ public class MageObjectReference implements Comparable, Ser * That values manually (can be used to let it reference to a Permanent that * is not yet on the battlefield. * - * @param sourceId + * @param sourceId can be null * @param zoneChangeCounter * @param game */ @@ -51,10 +52,15 @@ public class MageObjectReference implements Comparable, Ser this.zoneChangeCounter = -1; } + /** + * @param sourceId can be null + * @param game + */ public MageObjectReference(UUID sourceId, Game game) { this.sourceId = sourceId; if (sourceId == null) { - throw new IllegalArgumentException("MageObjectReference contains nullable sourceId"); + this.zoneChangeCounter = -1; + return; } MageObject mageObject = game.getObject(sourceId); @@ -73,8 +79,8 @@ public class MageObjectReference implements Comparable, Ser this.zoneChangeCounter = mageObject.getZoneChangeCounter(game); logger.error("SourceId found in LKI"); } else { - logger.error("SourceId NOT found in LKI"); this.zoneChangeCounter = 0; + logger.error("SourceId NOT found in LKI"); } } } @@ -90,7 +96,7 @@ public class MageObjectReference implements Comparable, Ser @Override public int compareTo(MageObjectReference o) { - if (o.getSourceId().equals(this.sourceId)) { + if (o.getSourceId() == null || this.sourceId == null || Objects.equals(o.getSourceId(), this.sourceId)) { return o.getZoneChangeCounter() - this.zoneChangeCounter; } return o.getSourceId().compareTo(sourceId); @@ -99,7 +105,7 @@ public class MageObjectReference implements Comparable, Ser @Override public boolean equals(Object v) { if (v instanceof MageObjectReference) { - if (((MageObjectReference) v).getSourceId().equals(this.sourceId)) { + if (Objects.equals(((MageObjectReference) v).getSourceId(), this.sourceId)) { return ((MageObjectReference) v).getZoneChangeCounter() == this.zoneChangeCounter; } } @@ -120,7 +126,7 @@ public class MageObjectReference implements Comparable, Ser public boolean refersTo(MageObject mageObject, Game game) { if (mageObject != null) { if (mageObject instanceof Spell) { - return ((Spell) mageObject).getSourceId().equals(sourceId) && this.zoneChangeCounter == mageObject.getZoneChangeCounter(game); + return Objects.equals(((Spell) mageObject).getSourceId(), this.sourceId) && this.zoneChangeCounter == mageObject.getZoneChangeCounter(game); } return mageObject.getId().equals(sourceId) && this.zoneChangeCounter == mageObject.getZoneChangeCounter(game); } diff --git a/Mage/src/main/java/mage/filter/predicate/mageobject/CardIdPredicate.java b/Mage/src/main/java/mage/filter/predicate/mageobject/CardIdPredicate.java index e04342dd97b..972fe1e3de8 100644 --- a/Mage/src/main/java/mage/filter/predicate/mageobject/CardIdPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/mageobject/CardIdPredicate.java @@ -1,13 +1,12 @@ - package mage.filter.predicate.mageobject; -import java.util.UUID; import mage.MageObject; import mage.filter.predicate.Predicate; import mage.game.Game; +import java.util.UUID; + /** - * * @author LevelX2 */ public class CardIdPredicate implements Predicate { @@ -25,6 +24,6 @@ public class CardIdPredicate implements Predicate { @Override public String toString() { - return "CardId(" + cardId.toString() + ')'; + return "CardId (" + (cardId != null ? cardId.toString() : "null") + ')'; } } diff --git a/Mage/src/main/java/mage/target/targetpointer/FixedTarget.java b/Mage/src/main/java/mage/target/targetpointer/FixedTarget.java index 752fe417c3c..137303c8c55 100644 --- a/Mage/src/main/java/mage/target/targetpointer/FixedTarget.java +++ b/Mage/src/main/java/mage/target/targetpointer/FixedTarget.java @@ -90,8 +90,10 @@ public class FixedTarget implements TargetPointer { } } - List list = new ArrayList<>(1); - list.add(targetId); + List list = new ArrayList<>(); + if (targetId != null) { + list.add(targetId); + } return list; } diff --git a/Mage/src/main/java/mage/target/targetpointer/FixedTargets.java b/Mage/src/main/java/mage/target/targetpointer/FixedTargets.java index 34b63ce992e..620c796d4dd 100644 --- a/Mage/src/main/java/mage/target/targetpointer/FixedTargets.java +++ b/Mage/src/main/java/mage/target/targetpointer/FixedTargets.java @@ -5,10 +5,6 @@ */ package mage.target.targetpointer; -import java.util.ArrayList; -import java.util.List; -import java.util.Set; -import java.util.UUID; import mage.MageObjectReference; import mage.abilities.Ability; import mage.cards.Card; @@ -16,8 +12,12 @@ import mage.cards.Cards; import mage.game.Game; import mage.game.permanent.Permanent; +import java.util.ArrayList; +import java.util.List; +import java.util.Set; +import java.util.UUID; + /** - * * @author LevelX2 */ public class FixedTargets implements TargetPointer { @@ -75,9 +75,9 @@ public class FixedTargets implements TargetPointer { @Override public List getTargets(Game game, Ability source) { // check target not changed zone - List list = new ArrayList<>(1); + List list = new ArrayList<>(); for (MageObjectReference mor : targets) { - if (game.getState().getZoneChangeCounter(mor.getSourceId()) == mor.getZoneChangeCounter()) { + if (mor.getSourceId() != null && game.getState().getZoneChangeCounter(mor.getSourceId()) == mor.getZoneChangeCounter()) { list.add(mor.getSourceId()); } }