Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@ebaca20 Added getHostname to AsyncPlayerPreLoginEvent (#6656)
PaperMC/Paper@0c64d40 Updated Upstream (Bukkit/CraftBukkit) (#7323)
PaperMC/Paper@6663747 Some block state hunks were in the wrong patch (#7308)
PaperMC/Paper@78999b5 Remove redundant getRemoteAddress that can cause an NPE (#7331)
This commit is contained in:
BillyGalbreath
2022-01-13 22:06:23 -06:00
parent 9723e945ab
commit cb1a6366bf
18 changed files with 52 additions and 52 deletions

View File

@@ -223,10 +223,10 @@ index 88bc0807e8bf66a65422f85f1112336334eb3de2..d0e822b329085b9d0a42276c3cacd6cb
+ // 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 7c971f558c2d47984059e19a5db5297d7e59c2f4..f4aa60c4c55a965637cd706125fa55b243ab3ee0 100644
index f77b65a595fd2c7e79998bd343e9ce255e21d5e9..9a307b74a1c6e43d497dc59286e3885116fb1cb4 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1923,6 +1923,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1937,6 +1937,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return this.getHandle().getAbilities().walkingSpeed * 2f;
}