Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@de04cbc Updated Upstream (Bukkit/CraftBukkit) (#10034)
This commit is contained in:
granny
2023-12-17 01:11:46 -08:00
parent 9e1216de50
commit eb3b67d5b2
30 changed files with 100 additions and 113 deletions

View File

@@ -69,10 +69,10 @@ index 2a30499fd6f4a1340f6911f0f7f079bcbe8576a3..c3c0fbe71c9af1125c80698865cb9eaf
// Purpur start
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index 3373df9e09bd29096c4b9c039c06256e4ecf4154..a8f5f8f05973523945941e55c0c28e1e546a6a1f 100644
index 538f385404450132d295707e3bfe19028b05ad9c..5d2d4f765e7720c3e0b41d31182e3a12cc78ef54 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -1120,4 +1120,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -1119,4 +1119,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
getHandle().knockback(strength, directionX, directionZ);
};
// Paper end