From ec749ecc8e9973337881dd49861935aa2189cc71 Mon Sep 17 00:00:00 2001
From: Alexdoru <57050655+Alexdoru@users.noreply.github.com>
Date: Tue, 3 Dec 2024 02:39:34 +0100
Subject: [PATCH] Fix mob spawners spawning mobs at world 0 0 0 (#563)

---
 src/main/java/codechicken/nei/asm/NEITransformer.java | 10 ----------
 src/main/resources/assets/nei/asm/blocks.asm          |  7 -------
 2 files changed, 17 deletions(-)

diff --git a/src/main/java/codechicken/nei/asm/NEITransformer.java b/src/main/java/codechicken/nei/asm/NEITransformer.java
index 973c68e4..a3556f16 100644
--- a/src/main/java/codechicken/nei/asm/NEITransformer.java
+++ b/src/main/java/codechicken/nei/asm/NEITransformer.java
@@ -66,16 +66,6 @@ public class NEITransformer implements IClassTransformer {
                                     "func_149689_a",
                                     "(Lnet/minecraft/world/World;IIILnet/minecraft/entity/EntityLivingBase;Lnet/minecraft/item/ItemStack;)V"),
                             asmblocks.get("spawnerPlaced")));
-
-            // Make MobSpawnerBaseLogic use getSpawnerWorld when creating new entities
-            transformer.add(
-                    new MethodReplacer(
-                            new ObfMapping(
-                                    "net/minecraft/tileentity/MobSpawnerBaseLogic",
-                                    "func_98281_h",
-                                    "()Lnet/minecraft/entity/Entity;"),
-                            asmblocks.get("d_spawnerWorld"),
-                            asmblocks.get("spawnerWorld")));
         }
 
         // Removes trailing seperators from NBTTagList/Compound.toString because OCD
diff --git a/src/main/resources/assets/nei/asm/blocks.asm b/src/main/resources/assets/nei/asm/blocks.asm
index c171ff86..681f140a 100644
--- a/src/main/resources/assets/nei/asm/blocks.asm
+++ b/src/main/resources/assets/nei/asm/blocks.asm
@@ -7,13 +7,6 @@ ILOAD 4
 PUTSTATIC codechicken/nei/ItemMobSpawner.placedZ:I
 RETURN
 
-list d_spawnerWorld
-ACONST_NULL
-
-list spawnerWorld
-ALOAD 0
-INVOKEVIRTUAL net/minecraft/tileentity/MobSpawnerBaseLogic.func_98271_a()Lnet/minecraft/world/World;
-
 list n_commaFix
 LDC *
 INVOKEVIRTUAL java/lang/StringBuilder.append (Ljava/lang/String;)Ljava/lang/StringBuilder;