Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@7ee1cc11 Add ignite and fuse API for SulfurCube (#13944)
PaperMC/Paper@77202ea9 move a bunch of stuff out of unsafe
PaperMC/Paper@000cf99e finish migration to api bridge
PaperMC/Paper@8e5d42fa fix NPE in PaperComponents.resolveWithContext
PaperMC/Paper@f45bc608 fix infinite loop for any explosion hitting bedrock
PaperMC/Paper@6631e645 set dead flag again for dragon
This commit is contained in:
granny
2026-06-10 15:23:34 -07:00
parent c94a2c9b86
commit e3f5a93f1c
11 changed files with 26 additions and 26 deletions

View File

@@ -24,10 +24,10 @@ index 612e3457d537d6129437443753cad3e48590d542..a188eb750d6371f7e550a8971135a81d
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 86ea370201a3c92f70289ca197adcb69130b53cb..b7b82bf44c164123dd62a690421001b110b68af8 100644
index 77fc83bfe613d0e795d8623584bc79ee51d46b59..489aa599f979433ec2ae8c9a77aa9c2b0c6f0662 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -1141,4 +1141,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -1137,4 +1137,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
manager.untrackWaypoint(getHandle());
manager.trackWaypoint(getHandle());
}