keith
/
ForgePatch
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Fix problem with spam from registry on loading a second world. Empty the staging.

This commit is contained in:
cpw 2015-11-29 22:41:11 -05:00
parent a13ed35031
commit d58ad8db68
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/net/minecraftforge/fml/common/registry/PersistentRegistryManager.java
View File

@ -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()