From f803e7cc285e20cb89fabf8118ec64630ee64a7f Mon Sep 17 00:00:00 2001 From: MiniDigger | Martin Date: Sat, 14 Dec 2024 16:08:25 +0100 Subject: [PATCH] update mache, rebuild patches for concurrency fix --- paper-server/build.gradle.kts | 2 +- .../minecraft/world/entity/AgeableMob.java.patch | 16 ++++++++-------- .../world/entity/animal/allay/Allay.java.patch | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/paper-server/build.gradle.kts b/paper-server/build.gradle.kts index 22cdfb4fcc..b0b491497e 100644 --- a/paper-server/build.gradle.kts +++ b/paper-server/build.gradle.kts @@ -12,7 +12,7 @@ plugins { val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/" dependencies { - mache("io.papermc:mache:1.21.4+build.5") + mache("io.papermc:mache:1.21.4+build.6") paperclip("io.papermc:paperclip:3.0.3") remapper("net.fabricmc:tiny-remapper:0.10.3:fat") } diff --git a/paper-server/patches/sources/net/minecraft/world/entity/AgeableMob.java.patch b/paper-server/patches/sources/net/minecraft/world/entity/AgeableMob.java.patch index c9a6111f89..dcf72a4df6 100644 --- a/paper-server/patches/sources/net/minecraft/world/entity/AgeableMob.java.patch +++ b/paper-server/patches/sources/net/minecraft/world/entity/AgeableMob.java.patch @@ -47,18 +47,18 @@ age += amount * 20; if (age > 0) { @@ -104,6 +_,7 @@ - super.addAdditionalSaveData(tag); - tag.putInt("Age", this.getAge()); - tag.putInt("ForcedAge", this.forcedAge); -+ tag.putBoolean("AgeLocked", this.ageLocked); // CraftBukkit + super.addAdditionalSaveData(compound); + compound.putInt("Age", this.getAge()); + compound.putInt("ForcedAge", this.forcedAge); ++ compound.putBoolean("AgeLocked", this.ageLocked); // CraftBukkit } @Override @@ -111,6 +_,7 @@ - super.readAdditionalSaveData(tag); - this.setAge(tag.getInt("Age")); - this.forcedAge = tag.getInt("ForcedAge"); -+ this.ageLocked = tag.getBoolean("AgeLocked"); // CraftBukkit + super.readAdditionalSaveData(compound); + this.setAge(compound.getInt("Age")); + this.forcedAge = compound.getInt("ForcedAge"); ++ this.ageLocked = compound.getBoolean("AgeLocked"); // CraftBukkit } @Override diff --git a/paper-server/patches/sources/net/minecraft/world/entity/animal/allay/Allay.java.patch b/paper-server/patches/sources/net/minecraft/world/entity/animal/allay/Allay.java.patch index c30af2f229..8653998f89 100644 --- a/paper-server/patches/sources/net/minecraft/world/entity/animal/allay/Allay.java.patch +++ b/paper-server/patches/sources/net/minecraft/world/entity/animal/allay/Allay.java.patch @@ -56,9 +56,9 @@ .ifPresent(data -> this.vibrationData = data); } -- this.duplicationCooldown = tag.getInt("DuplicationCooldown"); -+ this.duplicationCooldown = tag.getLong("DuplicationCooldown"); // Paper - Load as long - this.entityData.set(DATA_CAN_DUPLICATE, tag.getBoolean("CanDuplicate")); +- this.duplicationCooldown = compound.getInt("DuplicationCooldown"); ++ this.duplicationCooldown = compound.getLong("DuplicationCooldown"); // Paper - Load as long + this.entityData.set(DATA_CAN_DUPLICATE, compound.getBoolean("CanDuplicate")); } @@ -508,15 +_,17 @@