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

Registry: Crash earlier with conflicting name/object registrations.

Browse source
This commit is contained in:
Player 2014-04-11 06:33:36 +02:00
parent 9d00580d7e
commit 7175165d15
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
fml/src/main/java/cpw/mods/fml/common/registry/FMLControlledNamespacedRegistry.java
View file

@ -307,13 +307,13 @@ public class FMLControlledNamespacedRegistry<I> extends RegistryNamespaced {
FMLLog.bigWarning("The object %s has been registered twice for the same name %s.", thing, name);
return getId(thing);
}
if (getRaw(name) != null) // duplicate name, will crash later due to the BiMap
if (getRaw(name) != null) // duplicate name
{
FMLLog.bigWarning("The name %s has been registered twice, for %s and %s.", name, getRaw(name), thing);
throw new IllegalArgumentException(String.format("The name %s has been registered twice, for %s and %s.", name, getRaw(name), thing));
}
if (getId(thing) >= 0) // duplicate object, will crash later due to the BiMap
if (getId(thing) >= 0) // duplicate object
{
FMLLog.bigWarning("The object %s has been registered twice, using the names %s and %s.", thing, getNameForObject(thing), name);
throw new IllegalArgumentException(String.format("The object %s has been registered twice, using the names %s and %s.", thing, getNameForObject(thing), name));
}
if (GameData.isFrozen(this))
{