Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@2a306f5 Add Multi Block Change API (#7333)
PaperMC/Paper@feb72b8 Update ASM EventExecutor generator patch to respect event handler return types. Fixes #7311 (#7317)
This commit is contained in:
BillyGalbreath
2022-01-20 17:45:15 -06:00
parent 43657416e9
commit 762fcddb3e
15 changed files with 46 additions and 46 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 f77b65a595fd2c7e79998bd343e9ce255e21d5e9..9a307b74a1c6e43d497dc59286e3885116fb1cb4 100644
index 944d0e118e0bed160fc6e40a147c043aade1599f..f4ed262e51a0cc64df56dfc23ba816c23c5ce11e 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1937,6 +1937,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1967,6 +1967,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return this.getHandle().getAbilities().walkingSpeed * 2f;
}