Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@2eca2a2 Add Player#sendEquipmentChange(Map) API (#8800)
PaperMC/Paper@b082d89 Win Screen API (#8802)
PaperMC/Paper@b1b19b6 [ci skip] Fix PiglinBarterEvent JavaDoc (#8795)
This commit is contained in:
granny
2023-01-23 00:15:17 -08:00
parent 1dcc7bf149
commit cac8a9b5a8
45 changed files with 43 additions and 92 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 32e71b5bd7aae211f9e6715eaf6bd67521a79253..0d63c9e3487c5543be1783d6c220214cbb86bc35 100644
index bbfd1f9a35b0ae0a960b2cedbf92a8239b90fefa..440dd0a91077776267943fe13fedbfc405c5a886 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2232,6 +2232,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2245,6 +2245,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return this.getHandle().getAbilities().walkingSpeed * 2f;
}