fix crash with no local components

Suportik-GFX · Apr 20, 2020 · fad2be4 · fad2be4
1 parent 17eabf0
commit fad2be4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/engine/src/main/java/org/destinationsol/SolApplication.java b/engine/src/main/java/org/destinationsol/SolApplication.java
@@ -58,6 +58,7 @@
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.Set;
 
 @API
@@ -127,9 +128,13 @@ public void create() {
 
         context.put(ComponentSystemManager.class, new ComponentSystemManager(moduleManager.getEnvironment(), context));
 
+        // Big, fat, ugly HACK to get a working classloader
+        // Serialisation and thus a classloader is not needed when there are no components
+        Iterator<Class<? extends Component>> componentClasses =
+                moduleManager.getEnvironment().getSubtypesOf(Component.class).iterator();
         SerialisationManager serialisationManager = new SerialisationManager(
                 SaveManager.getResourcePath("entity_store.dat"), entitySystemManager.getEntityManager(),
-                moduleManager.getEnvironment().getSubtypesOf(Component.class).iterator().next().getClassLoader());
+                componentClasses.hasNext() ? componentClasses.next().getClassLoader() : null);
         context.put(SerialisationManager.class, serialisationManager);
 
         logger.info("\n\n ------------------------------------------------------------ \n");

diff --git a/engine/src/main/java/org/destinationsol/entitysystem/SerialisationManager.java b/engine/src/main/java/org/destinationsol/entitysystem/SerialisationManager.java
@@ -108,6 +108,10 @@ public void serialise() throws IllegalArgumentException, IllegalAccessException,
 
     public void deserialise() throws IOException, ClassNotFoundException, InstantiationException,
             IllegalAccessException, NoSuchFieldException {
+        if (classLoader == null) {
+            logger.warn("Trying to deserialise with Null classloader. Aborting");
+            return;
+        }
 
         FileInputStream input = new FileInputStream(file);
         EntityData.EntityStore store = EntityData.EntityStore.parseFrom(input);