Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@ef0e5a6 Updated Upstream (Bukkit/CraftBukkit/Spigot)
This commit is contained in:
BillyGalbreath
2022-09-13 17:32:56 -05:00
parent 664774af5a
commit 6e7bb8323f
40 changed files with 170 additions and 170 deletions

View File

@@ -271,10 +271,10 @@ index 4e56018b64d11f76c8da43fd8f85c6de72204e36..aa8212432825db65cf485cd93f734ccd
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index 5d15295604e40ed7b580c949868ce9be5f8065a6..8393e9f64fe52724b260089349fd4e5e87e99a40 100644
index 1994dd3c272395a27474ec1b37a924a24fc50fd6..778c3f9fe4f7cff450e2bb75ae9d8414af772cd4 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -813,7 +813,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -854,7 +854,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
return EntityCategory.WATER;
}