Fix #3576 Unnecessary warning about totem being renamed (#3614)

This commit is contained in:
ichttt authored and LexManos committed 2017-01-11 16:12:08 -08:00
1 parent a824214333
commit 3d12ef56b5
2 files changed
+17 -2

No files matched your search

@@ -761,7 +761,7 @@ public class FMLControlledNamespacedRegistry<I extends IForgeRegistryEntry<I>> e
if (currId == -1)
{
FMLLog.info("Found a missing id from the world %s", itemName);
missingIds.put(entry.getKey(), newId);
missingIds.put(itemName, newId);
continue; // no block/item -> nothing to add
}
else if (currId != newId)
@@ -772,7 +772,7 @@ public class FMLControlledNamespacedRegistry<I extends IForgeRegistryEntry<I>> e
I obj = currentRegistry.getRaw(itemName);
Preconditions.checkState(obj != null, "objectKey has an ID but no object. Reflection/ASM hackery? Registry bug?");
I sub = obj;
// If we have an object in the originals set, we use that for initial adding - substitute activation will readd the substitute if neceessary later
// If we have an object in the originals set, we use that for initial adding - substitute activation will re-add the substitute if necessary later
if (currentRegistry.substitutionOriginals.containsKey(itemName))
{
obj = currentRegistry.substitutionOriginals.get(itemName);