Cleanup after the patching process

kiooeht · Sep 16, 2018 · 8ae356f · 8ae356f
1 parent e216bb1
commit 8ae356f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 ## Changelog ##
 #### dev ####
 * SpireOverride: Allow overriding private methods from superclasses
+* Cleanup after the patching process
 
 #### v3.1.0 ####
 * Option dependencies field in ModInfo

diff --git a/src/main/java/com/evacipated/cardcrawl/modthespire/Loader.java b/src/main/java/com/evacipated/cardcrawl/modthespire/Loader.java
@@ -56,7 +56,7 @@ public static boolean isModLoaded(String modID)
 
     public static ClassPool getClassPool()
     {
-        return new ClassPool(POOL);
+        return POOL;
     }
 
     public static void main(String[] args) {
@@ -178,7 +178,6 @@ public static void runMods(File[] modJars) {
 
                 System.out.println("Begin patching...");
                 ClassPool pool = new MTSClassPool(tmpPatchingLoader);
-                POOL = pool;
                 pool.insertClassPath(new LoaderClassPath(tmpPatchingLoader));
                 tmpPatchingLoader.addStreamToClassPool(pool); // Inserts infront of above path
                 SortedMap<String, CtClass> ctClasses = new TreeMap<>();
@@ -200,6 +199,13 @@ public static void runMods(File[] modJars) {
                 Patcher.finalizePatches(tmpPatchingLoader);
                 Patcher.compilePatches(loader, ctClasses);
 
+                ctClasses.clear();
+                tmpPatchingLoader.close();
+
+                POOL = new MTSClassPool(loader);
+                POOL.insertClassPath(new LoaderClassPath(loader));
+                loader.addStreamToClassPool(POOL);
+
                 System.out.printf("Patching enums...");
                 Patcher.patchEnums(loader, Loader.class.getResource(Loader.COREPATCHES_JAR));
                 // Patch SpireEnums from mods