Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
abca14ff9 Updated Upstream (Bukkit/CraftBukkit)
This commit is contained in:
jmp
2020-12-21 00:45:03 -08:00
parent 25c7772584
commit 3b18ff8cb9
28 changed files with 68 additions and 75 deletions

View File

@@ -169,10 +169,10 @@ index 0000000000000000000000000000000000000000..c0ec5a130985e8da4cc9e596a6b70503
+ }
+}
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index ff2e4fc8a632453e280f1a6ec05878b0e7fd2a9c..cd209dcfbb81010e916b40d61d0a038c75a6f788 100644
index 76e857c364fe79e20cf9bde54b65e5b7108174fd..5f7947cd6f3bf9f76e8b3bac339f61b9afadaaad 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -696,4 +696,35 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@@ -698,4 +698,35 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
*/
public boolean isTicking();
// Paper end