Fix actors not being loaded if the scene doesn't contain any other entities

leMaik · leMaik · commit 6f19cac0a631 · 2020-03-14T21:21:38.000+01:00
diff --git a/chunky/src/java/se/llbit/chunky/renderer/scene/Scene.java b/chunky/src/java/se/llbit/chunky/renderer/scene/Scene.java
@@ -2494,7 +2494,7 @@ public synchronized void importFromJson(JsonObject json) {
       }
     }
 
-    if (json.get("entities").isArray()) {
+    if (json.get("entities").isArray() || json.get("actors").isArray()) {
       entities = new LinkedList<>();
       actors = new LinkedList<>();
       // Previously poseable entities were stored in the entities array

Original file line number	Diff line number	Diff line change
`@@ -2494,7 +2494,7 @@ public synchronized void importFromJson(JsonObject json) {`
`2494`	`2494`	`}`
`2495`	`2495`	`}`
`2496`	`2496`
`2497`		`- if (json.get("entities").isArray()) {`
	`2497`	`+ if (json.get("entities").isArray() \|\| json.get("actors").isArray()) {`
`2498`	`2498`	`entities = new LinkedList<>();`
`2499`	`2499`	`actors = new LinkedList<>();`
`2500`	`2500`	`// Previously poseable entities were stored in the entities array`