Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 01:17:42 +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:
df0d7b0d Update upstream CB
6ea3c2cf [CI-SKIP] Rebuild patches
d7bed4cb Heavily optimise random block ticking (#2914)
b66d9ff8 Update upstream CB
ba71c5d6 Stop stripping private use block Unicode from signs
28d9dcfc Entity Jump API (#1587)
9976a768 Fix PlayerNaturallySpawnCreaturesEvent boolean inversion
054e20da Clean up imports on ThrownEggHatchEvent
a8984ccb Add ThrownEggHatchEvent (#1982)
9f24d495 Allow nerfed blazes, endermen to take water damage (#2847)
This commit is contained in:
William Blake Galbreath
2020-02-12 21:21:34 -06:00
parent e52e23265f
commit 4757060211
159 changed files with 6166 additions and 4642 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 41324ce78820672bb1261893cceefd11d6022bd0 Mon Sep 17 00:00:00 2001
From ae537506a49446a9f91e2fec2bfc636debe99fe4 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,14 +9,13 @@ 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 79560dcca..5c39d73f2 100644
index 451dc570..7bdd962b 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1628,6 +1628,15 @@ public final class Bukkit {
public static String getServerName() {
@@ -1631,6 +1631,15 @@ public final class Bukkit {
return server.getServerName();
}
+
+ /**
+ * Check if server is lagging according to laggy threshold setting
+ *
@@ -25,26 +24,28 @@ index 79560dcca..5c39d73f2 100644
+ public static boolean isLagging() {
+ return server.isLagging();
+ }
// Purpur end
@NotNull
+
/**
* Get the last 100 tick times (in nanos)
* @return Last 100 tick times (in nanos)
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 863da99d4..88b7d606c 100644
index 57bb2dde..ca195120 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1424,5 +1424,12 @@ public interface Server extends PluginMessageRecipient {
*/
@@ -1422,6 +1422,13 @@ public interface Server extends PluginMessageRecipient {
@NotNull
String getServerName();
+
+ /**
+ * Check if server is lagging according to laggy threshold setting
+ *
+ * @return True if lagging
+ */
+ boolean isLagging();
// Purpur end
}
+
/**
* Get the last 100 tick times (in nanos)
*
--
2.24.0