SteamWar/Paper
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update patches to latest 1.21.4 #1

Merged
Chaoscaot merged 242 commits from update/1.21.4 into main 2025-04-23 22:27:11 +02:00
Conversation 0 Commits 242 Files Changed 2289 +2321 -1026
231 changed files with 2321 additions and 1026 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 73f7736eb9 - Show all commits

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) {
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
+++ 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);
}

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;