mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-18 00:47:42 +01:00
Updated Upstream (Paper)
Upstream has released updates that appears to apply and compile correctly Paper Changes: 01b965e0 Fix getChunkAtIfCachedImmediately (#2915) 0a897d6e Rebuild patches 5792c862 Updated Upstream (Bukkit/CraftBukkit/Spigot) c9eebbb8 Fix Player#applyMending NPE (#2917) d16a5d88 Performance patches prerequisite (#2802)
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From 010289186dcb60b25f38edec1f9cd04fa4823b60 Mon Sep 17 00:00:00 2001
|
||||
From a16b381d7e18bf1f5bec89265dac170878e706f9 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,7 +9,7 @@ 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 21bc13f79..b6f8942c0 100644
|
||||
index e4d874557..c45a1161f 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 {
|
||||
@@ -29,10 +29,10 @@ index 21bc13f79..b6f8942c0 100644
|
||||
|
||||
@NotNull
|
||||
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
||||
index c12e3ba90..ee768158b 100644
|
||||
index 8179c7e72..ec702f290 100644
|
||||
--- a/src/main/java/org/bukkit/Server.java
|
||||
+++ b/src/main/java/org/bukkit/Server.java
|
||||
@@ -1414,5 +1414,12 @@ public interface Server extends PluginMessageRecipient {
|
||||
@@ -1412,5 +1412,12 @@ public interface Server extends PluginMessageRecipient {
|
||||
*/
|
||||
@NotNull
|
||||
String getServerName();
|
||||
@@ -46,5 +46,5 @@ index c12e3ba90..ee768158b 100644
|
||||
// Purpur end
|
||||
}
|
||||
--
|
||||
2.24.0.rc1
|
||||
2.24.0
|
||||
|
||||
|
||||
Reference in New Issue
Block a user