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

@@ -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 7335391d0b394fe3c34659cba4bc972b1d2ee2c9..e93dc909c2e6fbc9daf0af66dfc2a4135646b91d 100644
index 8325e527710d4b577d4ff98c2aa5c4277019e329..4e6e7795f7c797da264a08f4a68f5ff48152f177 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2655,5 +2655,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2676,5 +2676,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* Reset the idle timer back to 0
*/
void resetIdleTimer();