Updated Upstream (Paper & Tuinity)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
4bcebab1 Add getOfflinePlayerIfCached(String)
67c30690 Fix ghost blocks in ticking view distance
8e6d90c2 [CI-SKIP] Add a GitHub Actions job (#4703)
0ac53efb Avoid crashing clients when fishing loot is empty, Fixes #4235 (#4681)
b64ee74a Fix armor stands still doing entity collision

Tuinity Changes:
576e2cc Rate limit incoming packets
This commit is contained in:
William Blake Galbreath
2020-11-01 15:11:50 -06:00
parent 3fec5dae98
commit 0fa478d031
14 changed files with 416 additions and 156 deletions

View File

@@ -8,7 +8,7 @@ Tuinity config
API to retrieve raw YamlConfiguration + timing exports
diff --git a/pom.xml b/pom.xml
index 29dafd4b..3b5dcb43 100644
index a22e6517d..c4168709b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,18 +3,18 @@
@@ -37,10 +37,10 @@ index 29dafd4b..3b5dcb43 100644
<properties>
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 7c0a7889..740a86a8 100644
index 3e6331807..7a51edbde 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1456,6 +1456,14 @@ public interface Server extends PluginMessageRecipient {
@@ -1475,6 +1475,14 @@ public interface Server extends PluginMessageRecipient {
}
// Paper end