twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-05-19 05:30:23 -07:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Pedro 2025-01-18 10:30:13 -03:00 committed by GitHub
parent a35cfe93f9
commit 73f7736eb9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 0 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
paper-server/patches/sources/net/minecraft/world/level/block/entity/trialspawner/TrialSpawner.java.patch
View File

@ -36,12 +36,3 @@
for (ItemStack itemStack : randomItems) { for (ItemStack itemStack : randomItems) {
DefaultDispenseItemBehavior.spawnItem(level, itemStack, 2, Direction.UP, Vec3.atBottomCenterOf(pos).relative(Direction.UP, 1.2)); 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);

12
paper-server/patches/sources/net/minecraft/world/level/block/entity/trialspawner/TrialSpawnerData.java.patch
View File

@ -1,17 +1,5 @@
--- a/net/minecraft/world/level/block/entity/trialspawner/TrialSpawnerData.java --- a/net/minecraft/world/level/block/entity/trialspawner/TrialSpawnerData.java
+++ b/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 @@ @@ -206,7 +_,7 @@
mob.dropPreservedEquipment(level); mob.dropPreservedEquipment(level);
} }

11
paper-server/patches/sources/net/minecraft/world/level/block/entity/trialspawner/TrialSpawnerState.java.patch
View File

@ -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;