Update to 1.21.10 & Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@0ff899da Prevent world mutation on copper golem spawn cancel (#13152)
PaperMC/Paper@bae47d3e Update to 1.21.10 (#13127)
PaperMC/Paper@8339bb31 Update DataConverter constants for 1.21.10
PaperMC/Paper@3982efa0 Sync Moonrise
PaperMC/Paper@fa57d4b7 Remove Vanilla packet processing at start of tick
PaperMC/Paper@fba780d6 Rebuild patches
This commit is contained in:
granny
2025-10-07 20:50:28 -07:00
parent a99ba03624
commit d7de13dd4d
15 changed files with 62 additions and 62 deletions

View File

@@ -24,10 +24,10 @@ index b605a2662b72fde523bbe22142e712b059d43a0a..11c1a0abad4efb65547c5b42869ec06b
Preconditions.checkArgument(entity != null, "Unknown entity");
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index 0d9c2a68dd665aec471f57c370a139f03e97718c..3e79cebf42b61afedd3893aee04ab051fe403280 100644
index 74e2fc6e1f1c4513accaa4e9ad7f614021a4ea76..b266da70a69b8acfb0caec96af0399126d258fb0 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -1132,4 +1132,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -1099,4 +1099,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
public CombatTracker getCombatTracker() {
return this.getHandle().getCombatTracker().paperCombatTracker;
}

View File

@@ -1,6 +1,6 @@
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -506,7 +_,7 @@
@@ -483,7 +_,7 @@
net.minecraft.server.level.ServerPlayer nmsKiller = killer == null ? null : ((CraftPlayer) killer).getHandle();
this.getHandle().setLastHurtByMob(nmsKiller);
if (nmsKiller != null) {