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

@@ -5,10 +5,10 @@ Subject: [PATCH] Lagging threshold
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index ece4f3de..b4e55c17 100644
index 55a0590cc..39e00f922 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1797,5 +1797,14 @@ public final class Bukkit {
@@ -1818,5 +1818,14 @@ public final class Bukkit {
public static String getServerName() {
return server.getServerName();
}
@@ -24,10 +24,10 @@ index ece4f3de..b4e55c17 100644
// Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 6b6f20a1..70bcd6c3 100644
index 69c1cbdf7..237b00389 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1584,5 +1584,12 @@ public interface Server extends PluginMessageRecipient {
@@ -1603,5 +1603,12 @@ public interface Server extends PluginMessageRecipient {
*/
@NotNull
String getServerName();