diff --git a/paper-server/patches/sources/net/minecraft/world/level/block/entity/trialspawner/TrialSpawner.java.patch b/paper-server/patches/sources/net/minecraft/world/level/block/entity/trialspawner/TrialSpawner.java.patch
index 028fc739b8..52a66eabed 100644
--- a/paper-server/patches/sources/net/minecraft/world/level/block/entity/trialspawner/TrialSpawner.java.patch
+++ b/paper-server/patches/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/paper-server/patches/sources/net/minecraft/world/level/block/entity/trialspawner/TrialSpawnerData.java.patch b/paper-server/patches/sources/net/minecraft/world/level/block/entity/trialspawner/TrialSpawnerData.java.patch
index 351f01f843..b1ff9e67bf 100644
--- a/paper-server/patches/sources/net/minecraft/world/level/block/entity/trialspawner/TrialSpawnerData.java.patch
+++ b/paper-server/patches/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/paper-server/patches/sources/net/minecraft/world/level/block/entity/trialspawner/TrialSpawnerState.java.patch b/paper-server/patches/sources/net/minecraft/world/level/block/entity/trialspawner/TrialSpawnerState.java.patch
deleted file mode 100644
index 28b53c34d3..0000000000
--- a/paper-server/patches/sources/net/minecraft/world/level/block/entity/trialspawner/TrialSpawnerState.java.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/net/minecraft/world/level/block/entity/trialspawner/TrialSpawnerState.java
-+++ b/net/minecraft/world/level/block/entity/trialspawner/TrialSpawnerState.java
-@@ -145,7 +_,7 @@
- yield ACTIVE;
- } else if (data.isCooldownFinished(level)) {
- spawner.removeOminous(level, pos);
-- data.reset();
-+ data.reset(spawner); // Paper - Fix TrialSpawner forgets assigned mob; MC-273635
- yield WAITING_FOR_PLAYERS;
- } else {
- yield this;