Update Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly
This commit is contained in:
Ben Kerllenevich
2021-08-31 07:23:46 -04:00
parent 64547876a0
commit 19293aabc5
36 changed files with 113 additions and 113 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 a894626a7900798812b2afc3712d04fa583ae31e..8e59e4e4bf3a9ca80332ddd7b6de5a93855c2d0c 100644
index e95cd5c57010eb338de48782525635ba64e26399..cda1e6a62e80fcca796454828acc3810920cd91c 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2326,5 +2326,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2320,5 +2320,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* Reset the idle timer back to 0
*/
void resetIdleTimer();