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

Revert "Another fix for registry substitutions. Closes #3212" 

This reverts commit ec2977afc9.
This commit is contained in:
cpw 2016-10-09 18:48:35 -04:00
parent 6e8c05343c
commit 5f06c95cfa
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/net/minecraftforge/fml/common/registry/FMLControlledNamespacedRegistry.java
View File

@ -181,7 +181,6 @@ public class FMLControlledNamespacedRegistry<I extends IForgeRegistryEntry<I>> e
this.persistentSubstitutions.clear(); this.persistentSubstitutions.clear();
this.persistentSubstitutions.putAll(otherRegistry.getPersistentSubstitutions()); this.persistentSubstitutions.putAll(otherRegistry.getPersistentSubstitutions());
this.activeSubstitutions.clear(); this.activeSubstitutions.clear();
this.substitutionOriginals.clear();
this.dummiedLocations.clear(); this.dummiedLocations.clear();
this.dummiedLocations.addAll(otherRegistry.dummiedLocations); this.dummiedLocations.addAll(otherRegistry.dummiedLocations);
@ -190,11 +189,7 @@ public class FMLControlledNamespacedRegistry<I extends IForgeRegistryEntry<I>> e
for (I thing : otherRegistry.typeSafeIterable()) for (I thing : otherRegistry.typeSafeIterable())
{ {
ResourceLocation name = otherRegistry.getNameForObject(thing); addObjectRaw(otherRegistry.getId(thing), otherRegistry.getNameForObject(thing), thing);
if (otherRegistry.activeSubstitutions.containsKey(name)) // If this is subed, use the orig, the loop below will reinstate the sub.
addObjectRaw(otherRegistry.getId(thing), name, otherRegistry.substitutionOriginals.get(name));
else
addObjectRaw(otherRegistry.getId(thing), name, thing);
} }
for (ResourceLocation resloc : otherRegistry.activeSubstitutions.keySet()) for (ResourceLocation resloc : otherRegistry.activeSubstitutions.keySet())
{ {