Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@a622eba Fix beehives generating from using bonemeal (#9052)
PaperMC/Paper@fbf74ba Updated Upstream (CraftBukkit) (#9053)
This commit is contained in:
granny
2023-03-26 23:43:18 -07:00
parent 49d99462fa
commit 7e014a84b5
31 changed files with 99 additions and 99 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 2aaebeb6dc44f5be176471816de29056ea4e1043..9e8bdd260cec5bb02a87bd946301fc29afa15279 100644
index 2813032e6cfe0a4f2258dc7246c5bde0426dfe0b..51be48d1ebfcceac087cf7f03ce332d8d402360c 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2365,6 +2365,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2375,6 +2375,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return this.getHandle().getAbilities().walkingSpeed * 2f;
}