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

@@ -5,10 +5,10 @@ Subject: [PATCH] Player invulnerabilities
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 910689c6c76c13660dc1539b0c5384d0c69615f2..75ecd5d492ef443a7dc25205ba0796eea34e4ba7 100644
index 0416b3de7a2e439891aa7b8c2c7536d7f4096026..2ab176269dea6035fd778640430f4f0fd499dd3b 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2947,5 +2947,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2973,5 +2973,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* Reset the idle timer back to 0
*/
void resetIdleTimer();