From d58ad8db68da19c0603b5d104f847bbd03a5081c Mon Sep 17 00:00:00 2001
From: cpw <cpw@weeksfamily.ca>
Date: Sun, 29 Nov 2015 22:41:11 -0500
Subject: [PATCH] Fix problem with spam from registry on loading a second
 world. Empty the staging.

---
 .../fml/common/registry/PersistentRegistryManager.java       | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/main/java/net/minecraftforge/fml/common/registry/PersistentRegistryManager.java b/src/main/java/net/minecraftforge/fml/common/registry/PersistentRegistryManager.java
index 138cfd882f..b27ccec4ed 100644
--- a/src/main/java/net/minecraftforge/fml/common/registry/PersistentRegistryManager.java
+++ b/src/main/java/net/minecraftforge/fml/common/registry/PersistentRegistryManager.java
@@ -188,6 +188,9 @@ public class PersistentRegistryManager
         // The id map changed, ensure we apply object holders
         ObjectHolderRegistry.INSTANCE.applyObjectHolders();
 
+        // Clean out the staging registry now, we're done with it
+        PersistentRegistry.STAGING.clean();
+
         // Return an empty list, because we're good
         return ImmutableList.of();
     }
@@ -259,8 +262,10 @@ public class PersistentRegistryManager
         }
         // the id mapping has reverted, fire remap events for those that care about id changes
         Loader.instance().fireRemapEvent(ImmutableMap.<ResourceLocation, Integer[]>of(), ImmutableMap.<ResourceLocation, Integer[]>of());
+
         // the id mapping has reverted, ensure we sync up the object holders
         ObjectHolderRegistry.INSTANCE.applyObjectHolders();
+        FMLLog.fine("Frozen state restored.");
     }
 
     public static void freezeData()