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

Fixed typo in registry alias writing causing infinite loop. Closes #6689

Browse source
This commit is contained in:
LexManos 2020-05-15 09:38:20 -07:00
parent 549007a4a6
commit 0f48e851a3
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/main/java/net/minecraftforge/registries/ForgeRegistry.java
View file

@ -399,6 +399,13 @@ public class ForgeRegistry<V extends IForgeRegistryEntry<V>> implements IForgeRe
{ {
if (this.isLocked()) if (this.isLocked())
throw new IllegalStateException(String.format("Attempted to register the alias %s -> %s to late", from, to)); throw new IllegalStateException(String.format("Attempted to register the alias %s -> %s to late", from, to));
if (from.equals(to))
{
LOGGER.warn(REGISTRIES, "Registry {} Ignoring invalid alias: {} -> {}", this.superType.getSimpleName(), from, to);
return;
}
this.aliases.put(from, to); this.aliases.put(from, to);
LOGGER.trace(REGISTRIES,"Registry {} alias: {} -> {}", this.superType.getSimpleName(), from, to); LOGGER.trace(REGISTRIES,"Registry {} alias: {} -> {}", this.superType.getSimpleName(), from, to);
} }
@ -830,7 +837,7 @@ public class ForgeRegistry<V extends IForgeRegistryEntry<V>> implements IForgeRe
{ {
CompoundNBT tag = new CompoundNBT(); CompoundNBT tag = new CompoundNBT();
tag.putString("K", e.getKey().toString()); tag.putString("K", e.getKey().toString());
tag.putString("V", e.getKey().toString()); tag.putString("V", e.getValue().toString());
aliases.add(tag); aliases.add(tag);
}); });
data.put("aliases", aliases); data.put("aliases", aliases);