Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features

core/src/mindustry/core/Platform.java

@@ -33,7 +33,7 @@ public interface Platform{
                         loadedClass = findClass(name);
                     }catch(ClassNotFoundException e){
                         //use parent if not found
-                        loadedClass = super.loadClass(name, resolve);
+                        return parent.loadClass(name);
                     }
                 }
 

core/src/mindustry/mod/ModClassLoader.java

@@ -26,16 +26,19 @@ public class ModClassLoader extends ClassLoader{
         ClassNotFoundException last = null;
         int size = children.size;
 
-        inChild.set(true);
         //if it doesn't exist in the main class loader, try all the children
         for(int i = 0; i < size; i++){
             try{
+                try{
+                    inChild.set(true);
                     return children.get(i).loadClass(name);
+                }finally{
+                    inChild.set(false);
+                }
             }catch(ClassNotFoundException e){
                 last = e;
             }
         }
-        inChild.set(false);
 
         throw (last == null ? new ClassNotFoundException(name) : last);
     }