Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
466820160 Upstream Update (#5211)
2a0ee4b65 Add support for hex color codes in console
4e958e229 We're going on an Adventure! (#4842)
1a9735611 Stop loop when flags set to false (#5101)
a5928db4a [Auto] Updated Upstream (CraftBukkit)
This commit is contained in:
jmp
2021-02-21 13:00:30 -08:00
parent c08f028635
commit b538cd9fba
188 changed files with 178 additions and 366 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 7fd2085fa24779df1eab354532611d3642b37a27..c3288513f240daf412d106e7d8cea1823b17a2d7 100644
index 5884cd31988c6eab3b56e857db09c96ff54d634c..d9ea837004d7e8643f93ad241a6dad3192e0afce 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1958,5 +1958,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2126,5 +2126,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* Reset the idle timer back to 0
*/
void resetIdleTimer();