Merge pull request #3496 from Irarara/readresolve

Fix for errors when loading certain campaign files
RPTools · Jul 17, 2022 · d8be06a · d8be06a
2 parents de5db06 + 9ab13ad
commit d8be06a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/src/main/java/net/rptools/maptool/model/LightSource.java b/src/main/java/net/rptools/maptool/model/LightSource.java
@@ -225,6 +225,9 @@ private Object readResolve() {
     if (type == null) {
       type = Type.NORMAL;
     }
+    if (lightList == null) {
+      lightList = new LinkedList<>();
+    }
     return this;
   }
 

diff --git a/src/main/java/net/rptools/maptool/model/MacroButtonProperties.java b/src/main/java/net/rptools/maptool/model/MacroButtonProperties.java
@@ -1105,6 +1105,8 @@ public Object readResolve() {
     if (compareApplyToSelectedTokens == null) compareApplyToSelectedTokens = true;
     if (allowPlayerEdits == null)
       allowPlayerEdits = AppPreferences.getAllowPlayerMacroEditsDefault();
+    if (macroUUID == null) macroUUID = getMacroUUID();
+    if (displayHotKey == null) displayHotKey = true;
     return this;
   }
 

diff --git a/src/main/java/net/rptools/maptool/model/Zone.java b/src/main/java/net/rptools/maptool/model/Zone.java
@@ -2110,6 +2110,10 @@ protected Object readResolve() {
     if (aStarRounding == null) {
       aStarRounding = AStarRoundingOptions.NONE;
     }
+
+    if (tokenSelection == null) {
+      tokenSelection = TokenSelection.ALL;
+    }
     return this;
   }