From 400a6a28c102feea265b64f4c211ea2de5568423 Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 22 Aug 2022 14:39:08 -0400 Subject: [PATCH] Fixed #7417 --- core/src/mindustry/io/JsonIO.java | 5 ++++- core/src/mindustry/maps/Map.java | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/core/src/mindustry/io/JsonIO.java b/core/src/mindustry/io/JsonIO.java index 8263dae6c5..b89f013b0c 100644 --- a/core/src/mindustry/io/JsonIO.java +++ b/core/src/mindustry/io/JsonIO.java @@ -308,7 +308,10 @@ public class JsonIO{ int i = 0; for(var value = data.child; value != null; value = value.next, i++){ for(var parent = value.get("parents").child; parent != null; parent = parent.next){ - exec.all.get(i).parents.add(exec.all.get(parent.asInt())); + int val = parent.asInt(); + if(val >= 0 && val < exec.all.size){ + exec.all.get(i).parents.add(exec.all.get(val)); + } } } diff --git a/core/src/mindustry/maps/Map.java b/core/src/mindustry/maps/Map.java index 0abe2aaffa..8bbaee5748 100644 --- a/core/src/mindustry/maps/Map.java +++ b/core/src/mindustry/maps/Map.java @@ -105,7 +105,7 @@ public class Map implements Comparable, Publishable{ return result; }catch(Exception e){ //error reading rules. ignore? - e.printStackTrace(); + Log.err(e); return new Rules(); } }