Updated Upstream (Paper & Pufferfish)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@4e99466 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#8874)

Pufferfish Changes:
pufferfish-gg/Pufferfish@52307ae Updated Upstream (Paper)
This commit is contained in:
granny
2023-03-11 21:20:53 -08:00
parent 9e436f732a
commit 235d5075a1
19 changed files with 104 additions and 95 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 ffecdbe20a685d880ca4cc07153697c28724a430..fd8a91c414e31287839579e5afe29e9538173698 100644
index be259ceb95a0fc6bfbbfdb27987824ec7944c91c..40fe24de4a7bd49f47bb76ad1a25aa7f3c4cbfd9 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2293,6 +2293,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2297,6 +2297,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return this.getHandle().getAbilities().walkingSpeed * 2f;
}