From c63785748089471a030e400437d2e8d53226fe5e Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Sat, 23 Jun 2018 21:39:36 -0400 Subject: [PATCH] Added null detection to MageObjectReference --- Mage/src/main/java/mage/MageObjectReference.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Mage/src/main/java/mage/MageObjectReference.java b/Mage/src/main/java/mage/MageObjectReference.java index c9e67326439..ff72668e405 100644 --- a/Mage/src/main/java/mage/MageObjectReference.java +++ b/Mage/src/main/java/mage/MageObjectReference.java @@ -1,4 +1,3 @@ - package mage; import java.io.Serializable; @@ -24,6 +23,11 @@ public class MageObjectReference implements Comparable, Ser private final int zoneChangeCounter; public MageObjectReference(MageObject mageObject, Game game) { + if (mageObject == null) { + this.sourceId = null; + this.zoneChangeCounter = -1; + return; + } this.sourceId = mageObject.getId(); this.zoneChangeCounter = mageObject.getZoneChangeCounter(game); }