diff --git a/src/main/java/net/minecraftforge/registries/GameData.java b/src/main/java/net/minecraftforge/registries/GameData.java index f1bb1063d8..bb2e0a1ddf 100644 --- a/src/main/java/net/minecraftforge/registries/GameData.java +++ b/src/main/java/net/minecraftforge/registries/GameData.java @@ -288,6 +288,15 @@ public class GameData this.identityMap.clear(); this.objectList.clear(); } + + void remove(I key) + { + Integer prev = this.identityMap.remove(key); + if (prev != null) + { + this.objectList.set(prev, null); + } + } } @@ -302,6 +311,14 @@ public class GameData @SuppressWarnings("unchecked") ClearableObjectIntIdentityMap blockstateMap = owner.getSlaveMap(BLOCKSTATE_TO_ID, ClearableObjectIntIdentityMap.class); + if (oldBlock != null) + { + for (IBlockState state : oldBlock.getBlockState().getValidStates()) + { + blockstateMap.remove(state); + } + } + if ("minecraft:tripwire".equals(block.getRegistryName().toString())) //Tripwire is crap so we have to special case whee! { for (int meta = 0; meta < 15; meta++) @@ -387,6 +404,12 @@ public class GameData @Override public void onAdd(IForgeRegistryInternal owner, RegistryManager stage, int id, Item item, @Nullable Item oldItem) { + if (oldItem instanceof ItemBlock) + { + @SuppressWarnings("unchecked") + BiMap blockToItem = owner.getSlaveMap(BLOCK_TO_ITEM, BiMap.class); + blockToItem.remove(((ItemBlock)oldItem).getBlock()); + } if (item instanceof ItemBlock) { @SuppressWarnings("unchecked") @@ -477,6 +500,10 @@ public class GameData } @SuppressWarnings("unchecked") Map, EntityEntry> map = owner.getSlaveMap(ENTITY_CLASS_TO_ENTRY, Map.class); + if (oldEntry != null) + { + map.remove(oldEntry.getEntityClass()); + } map.put(entry.getEntityClass(), entry); }