From 5f06c95cfad83ce664a961c31f0f95b0c5277048 Mon Sep 17 00:00:00 2001 From: cpw Date: Sun, 9 Oct 2016 18:48:35 -0400 Subject: [PATCH] Revert "Another fix for registry substitutions. Closes #3212" This reverts commit ec2977afc919c0f676f59977e6065148ea635f9e. --- .../common/registry/FMLControlledNamespacedRegistry.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/main/java/net/minecraftforge/fml/common/registry/FMLControlledNamespacedRegistry.java b/src/main/java/net/minecraftforge/fml/common/registry/FMLControlledNamespacedRegistry.java index d80f716b4..c7c1993c3 100644 --- a/src/main/java/net/minecraftforge/fml/common/registry/FMLControlledNamespacedRegistry.java +++ b/src/main/java/net/minecraftforge/fml/common/registry/FMLControlledNamespacedRegistry.java @@ -181,7 +181,6 @@ public class FMLControlledNamespacedRegistry> e this.persistentSubstitutions.clear(); this.persistentSubstitutions.putAll(otherRegistry.getPersistentSubstitutions()); this.activeSubstitutions.clear(); - this.substitutionOriginals.clear(); this.dummiedLocations.clear(); this.dummiedLocations.addAll(otherRegistry.dummiedLocations); @@ -190,11 +189,7 @@ public class FMLControlledNamespacedRegistry> e for (I thing : otherRegistry.typeSafeIterable()) { - ResourceLocation name = otherRegistry.getNameForObject(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); + addObjectRaw(otherRegistry.getId(thing), otherRegistry.getNameForObject(thing), thing); } for (ResourceLocation resloc : otherRegistry.activeSubstitutions.keySet()) {