upstream/MinecraftForge
1
0 Fork 0
mirror of https://github.com/MinecraftForge/MinecraftForge.git synced 2026-11-12 00:07:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move substitution activation after id loading. This should fix the problem of null for existing object.

Browse Source
This commit is contained in:
cpw committed 2016-01-02 12:06:53 -05:00
1 parent d105c444ee
commit fb54ea94c0
1 file changed
+1 -1
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/net/minecraftforge/fml/common/registry/PersistentRegistryManager.java
+1 -1
View File
@@ -321,11 +321,11 @@ public class PersistentRegistryManager
substitutions = Sets.union(snapshotEntry.substitutions, currentRegistry.getActiveSubstitutions());
}
newRegistry.loadAliases(snapshotEntry.aliases);
newRegistry.loadSubstitutions(substitutions);
newRegistry.loadBlocked(snapshotEntry.blocked);
missing.put(registryName, Maps.<ResourceLocation, Integer>newLinkedHashMap());
remaps.put(registryName, Maps.<ResourceLocation, Integer[]>newHashMap());
newRegistry.loadIds(snapshotEntry.ids, missing.get(registryName), remaps.get(registryName), currentRegistry, registryName);
newRegistry.loadSubstitutions(substitutions);
// Load current dummies AFTER the snapshot is loaded
newRegistry.loadDummied(snapshotEntry.dummied);
}