From cdeb78687734abf38ec671f6c3740ddea102ac1d Mon Sep 17 00:00:00 2001 From: LexManos Date: Tue, 4 Jun 2024 15:48:07 -0700 Subject: [PATCH] Fix NPE when calling ForgeHooks.getDefaultCreatorModId(ItemStack) on Spawn Eggs. Closes #10002 --- src/main/java/net/minecraftforge/common/ForgeHooks.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/minecraftforge/common/ForgeHooks.java b/src/main/java/net/minecraftforge/common/ForgeHooks.java index 6886364f4f..3af1cb8af7 100644 --- a/src/main/java/net/minecraftforge/common/ForgeHooks.java +++ b/src/main/java/net/minecraftforge/common/ForgeHooks.java @@ -697,7 +697,7 @@ public final class ForgeHooks { if (potion != null && potion.unwrapKey().isPresent()) return potion.unwrapKey().get().location().getNamespace(); } else if (item instanceof SpawnEggItem egg) { - var resourceLocation = ForgeRegistries.ENTITY_TYPES.getKey(egg.getType(null)); + var resourceLocation = ForgeRegistries.ENTITY_TYPES.getKey(egg.getType(itemStack)); if (resourceLocation != null) return resourceLocation.getNamespace(); }