Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@1cda66e Hotfix Entity isInRain reobf issue
PaperMC/Paper@61768e0 [ci skip] Remove no longer needed mappings change
PaperMC/Paper@e035fd7 Updated Upstream (Bukkit/CraftBukkit/Spigot)
PaperMC/Paper@c215ce1 [ci skip] cleanup patch diff from last commit
This commit is contained in:
granny
2023-12-25 18:45:01 -08:00
parent 6aec125590
commit 10685bb957
24 changed files with 75 additions and 75 deletions

View File

@@ -237,10 +237,10 @@ index 4e56018b64d11f76c8da43fd8f85c6de72204e36..9607675e6c5bff2183c4420d11fc63ee
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index 25ffc92c3d6055285a64d9fe36c0054228fe81dd..538f385404450132d295707e3bfe19028b05ad9c 100644
index 1f1ef68a9a449a4a90c284f34a397ab4b6d905f6..1b75b8286f6203a7268746b5a487d6f089405127 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -916,7 +916,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -915,7 +915,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
return EntityCategory.WATER;
}