Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Jan 18, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Original file line number Diff line number Diff line change
@@ -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);
}
Expand Down

This file was deleted.

Loading