Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 08:57:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appears to apply and compile correctly

Paper Changes:
3dafa6a0 Updated Upstream (CraftBukkit)
77b05b9c Updated Upstream (Bukkit/CraftBukkit/Spigot)
This commit is contained in:
William Blake Galbreath
2020-02-03 04:33:26 -06:00
parent 853bcfb6de
commit 23d7b00d9c
16 changed files with 76 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/api/0012-Implement-lagging-threshold.patch
View File

@@ -1,4 +1,4 @@
From a16b381d7e18bf1f5bec89265dac170878e706f9 Mon Sep 17 00:00:00 2001
From 41324ce78820672bb1261893cceefd11d6022bd0 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Tue, 23 Jul 2019 10:07:24 -0500
Subject: [PATCH] Implement lagging threshold
@@ -9,10 +9,10 @@ Subject: [PATCH] Implement lagging threshold
2 files changed, 16 insertions(+)
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index e4d874557..c45a1161f 100644
index 79560dcca..5c39d73f2 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1614,6 +1614,15 @@ public final class Bukkit {
@@ -1628,6 +1628,15 @@ public final class Bukkit {
public static String getServerName() {
return server.getServerName();
}
@@ -29,10 +29,10 @@ index e4d874557..c45a1161f 100644
@NotNull
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 8179c7e72..ec702f290 100644
index 863da99d4..88b7d606c 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1412,5 +1412,12 @@ public interface Server extends PluginMessageRecipient {
@@ -1424,5 +1424,12 @@ public interface Server extends PluginMessageRecipient {
*/
@NotNull
String getServerName();