Drop patch for MC-273635 fixed in MC 1.21.4 (#11987)

PaperMC · Jan 18, 2025 · 73f7736 · 73f7736
1 parent a35cfe9
commit 73f7736
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 32 deletions.
diff --git a/...tches/sources/net/minecraft/world/level/block/entity/trialspawner/TrialSpawner.java.patch b/...tches/sources/net/minecraft/world/level/block/entity/trialspawner/TrialSpawner.java.patch
@@ -36,12 +36,3 @@
              for (ItemStack itemStack : randomItems) {
                  DefaultDispenseItemBehavior.spawnItem(level, itemStack, 2, Direction.UP, Vec3.atBottomCenterOf(pos).relative(Direction.UP, 1.2));
              }
-@@ -362,7 +_,7 @@
-     }
-
-     public void overrideEntityToSpawn(EntityType<?> entityType, Level level) {
--        this.data.reset();
-+        this.data.reset(this); // Paper - Fix TrialSpawner forgets assigned mob; MC-273635
-         this.normalConfig = Holder.direct(this.normalConfig.value().withSpawning(entityType));
-         this.ominousConfig = Holder.direct(this.ominousConfig.value().withSpawning(entityType));
-         this.setState(level, TrialSpawnerState.INACTIVE);
diff --git a/...s/sources/net/minecraft/world/level/block/entity/trialspawner/TrialSpawnerData.java.patch b/...s/sources/net/minecraft/world/level/block/entity/trialspawner/TrialSpawnerData.java.patch
@@ -1,17 +1,5 @@
 --- a/net/minecraft/world/level/block/entity/trialspawner/TrialSpawnerData.java
 +++ b/net/minecraft/world/level/block/entity/trialspawner/TrialSpawnerData.java
-@@ -101,9 +_,9 @@
-         this.ejectingLootTable = ejectingLootTable;
-     }
-
--    public void reset() {
-+    public void reset(TrialSpawner spawner) { // Paper - Fix TrialSpawner forgets assigned mob; MC-273635
-         this.currentMobs.clear();
--        this.nextSpawnData = Optional.empty();
-+        if (!spawner.getConfig().spawnPotentialsDefinition().isEmpty()) this.nextSpawnData = Optional.empty(); // Paper - Fix TrialSpawner forgets assigned mob; MC-273635
-         this.resetStatistics();
-     }
-
 @@ -206,7 +_,7 @@
                      mob.dropPreservedEquipment(level);
                  }

diff --git a/.../sources/net/minecraft/world/level/block/entity/trialspawner/TrialSpawnerState.java.patch b/.../sources/net/minecraft/world/level/block/entity/trialspawner/TrialSpawnerState.java.patch