OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-28 15:30:19 +01:00
Code Issues Projects Releases Packages Wiki Activity

update mache, rebuild patches for concurrency fix

Browse source
This commit is contained in:
MiniDigger | Martin 2024-12-14 16:08:25 +01:00
parent 649f20ca93
commit f803e7cc28
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
paper-server/build.gradle.kts
View file

@ -12,7 +12,7 @@ plugins {
val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/" val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/"
dependencies { 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") paperclip("io.papermc:paperclip:3.0.3")
remapper("net.fabricmc:tiny-remapper:0.10.3:fat") remapper("net.fabricmc:tiny-remapper:0.10.3:fat")
} }

16
paper-server/patches/sources/net/minecraft/world/entity/AgeableMob.java.patch
View file

@ -47,18 +47,18 @@
age += amount * 20; age += amount * 20;
if (age > 0) { if (age > 0) {
@@ -104,6 +_,7 @@ @@ -104,6 +_,7 @@
super.addAdditionalSaveData(tag); super.addAdditionalSaveData(compound);
tag.putInt("Age", this.getAge()); compound.putInt("Age", this.getAge());
tag.putInt("ForcedAge", this.forcedAge); compound.putInt("ForcedAge", this.forcedAge);
+ tag.putBoolean("AgeLocked", this.ageLocked); // CraftBukkit + compound.putBoolean("AgeLocked", this.ageLocked); // CraftBukkit
} }
@Override @Override
@@ -111,6 +_,7 @@ @@ -111,6 +_,7 @@
super.readAdditionalSaveData(tag); super.readAdditionalSaveData(compound);
this.setAge(tag.getInt("Age")); this.setAge(compound.getInt("Age"));
this.forcedAge = tag.getInt("ForcedAge"); this.forcedAge = compound.getInt("ForcedAge");
+ this.ageLocked = tag.getBoolean("AgeLocked"); // CraftBukkit + this.ageLocked = compound.getBoolean("AgeLocked"); // CraftBukkit
} }
@Override @Override

6
paper-server/patches/sources/net/minecraft/world/entity/animal/allay/Allay.java.patch
View file

@ -56,9 +56,9 @@
.ifPresent(data -> this.vibrationData = data); .ifPresent(data -> this.vibrationData = data);
} }
- this.duplicationCooldown = tag.getInt("DuplicationCooldown"); - this.duplicationCooldown = compound.getInt("DuplicationCooldown");
+ this.duplicationCooldown = tag.getLong("DuplicationCooldown"); // Paper - Load as long + this.duplicationCooldown = compound.getLong("DuplicationCooldown"); // Paper - Load as long
this.entityData.set(DATA_CAN_DUPLICATE, tag.getBoolean("CanDuplicate")); this.entityData.set(DATA_CAN_DUPLICATE, compound.getBoolean("CanDuplicate"));
} }
@@ -508,15 +_,17 @@ @@ -508,15 +_,17 @@