Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@93829bb Account for dimension type in portal void damage check (#9602)
PaperMC/Paper@a73ed95 Updated Upstream (CraftBukkit/Spigot) (#9598)
This commit is contained in:
granny
2023-08-13 22:51:10 -07:00
parent 1846bae1b6
commit aeecb71060
20 changed files with 58 additions and 58 deletions

View File

@@ -223,10 +223,10 @@ index c6129dc565b8f874b73e2fefcabd4be1c221fd73..07050f97621c0cb68b48bf39fb9c9067
+ // 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 ee2ce224defb5174f112ab25d7f470e2ce02a605..2a0c5b3dc171705d09aa1eccb094d2792d7332f2 100644
index c983872ee21ddf916e59ef50cff7d67b465374ee..6eb9869edfcbe134068cb036899b7f14f088b6c3 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2465,6 +2465,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2460,6 +2460,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return this.getHandle().getAbilities().walkingSpeed * 2f;
}