Merge branch 'develop' into fix-3652

RPTools · Sep 21, 2022 · d01e652 · d01e652
2 parents 54fba53 + e0c302b
commit d01e652
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/main/java/net/rptools/maptool/model/InitiativeList.java b/src/main/java/net/rptools/maptool/model/InitiativeList.java
@@ -135,7 +135,12 @@ public InitiativeList(Zone aZone) {
    * @return The token initiative data for the passed index.
    */
   public TokenInitiative getTokenInitiative(int index) {
-    return index < tokens.size() && index >= 0 ? tokens.get(index) : null;
+    if (index < tokens.size() && index >= 0) {
+      return tokens.get(index);
+    } else {
+      LOGGER.error("getTokenInitiative: index = " + index + ", size = " + tokens.size());
+      return null;
+    }
   }
 
   /**