Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@5ffdff8 Fix a couple of bed bugs (#9112)
PaperMC/Paper@e338793 Optimize hoppers by not trying to merge full items. (#9110)
PaperMC/Paper@bd35d60 [ci-skip] Fix missing closing quote (#9126)
PaperMC/Paper@8d040fa Updated Upstream (Bukkit/CraftBukkit)
This commit is contained in:
granny
2023-04-13 18:05:06 -07:00
parent f952106e1b
commit f69b21de45
9 changed files with 20 additions and 20 deletions

View File

@@ -223,10 +223,10 @@ index 714afc98b5150907b45a00060be4e41582333204..312a6d90c0a09570aef24c205dc2ff27
+ // Purpur end - OfflinePlayer API
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 9960e185a77c5084dae4d92bb83d5fa2d742b48d..3485b10b9c4550fb0ce431a46cfa99b64eb7a4f6 100644
index 1d47586b7301e883ff76876359534d71a684f3d6..133219dae9fb76418c77a18f225aff154b07ebb9 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2406,6 +2406,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2405,6 +2405,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return this.getHandle().getAbilities().walkingSpeed * 2f;
}