Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
b8372fc0 Improve handling of indestructable blocks
a2a06640 Add moon phase API
47f71aea Fix SpawnChangeEvent not firing for all use-cases
b6c860f2 Don't require FACING data
0c1716a1 Add #setMaxPlayers API
02aed275 [CI-SKIP] Require dependencies script (#4172)
1ccc1c67 Add smithing item helpers
20d9ec6b Fix MC-197271
e9287056 [CI-SKIP] Update issue templates with notices
This commit is contained in:
William Blake Galbreath
2020-08-23 16:09:37 -05:00
parent d394fce3e9
commit 949a9956ab
16 changed files with 66 additions and 66 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 9abb3ba7f..60746ff04 100644
index f19d865dd..36bb9d37e 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1786,5 +1786,14 @@ public final class Bukkit {
@@ -1797,5 +1797,14 @@ public final class Bukkit {
public static String getServerName() {
return server.getServerName();
}
@@ -24,10 +24,10 @@ index 9abb3ba7f..60746ff04 100644
// Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 1f44ee201..1b743968b 100644
index ad45e2a4c..5b04a7699 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1575,5 +1575,12 @@ public interface Server extends PluginMessageRecipient {
@@ -1584,5 +1584,12 @@ public interface Server extends PluginMessageRecipient {
*/
@NotNull
String getServerName();