Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 17:07:43 +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:
a4f066cc Fix method profiler inbalance introduced in a2a9ffe (#3132)
c65dcad3 Don't delay chunk unloads during entity ticking
bc17ce69 Delay unsafe actions until after entity ticking is done - Fixes #3114
5553e6b3 Disable Sync Events firing Async errors during shutdown
e12c51d9 Use better variable for isStopping() API
586ee2bb Remove patch for MC-111480, fixed in 1.14
09a94215 Remove streams from Mob AI System
bb5c294e Fix Disabling Asynchronous Chunks
089d8356 Implement Chunk Priority / Urgency System for World Gen
fce69af7 Use dedicated thread for main thread blocking chunk loads
588b62e4 Add tick times API and /mspt command (#3102)
11de41c7 Add API MinecraftServer#isStopping (#3129)
942ff3c2 My patches are under MIT (#3130)
This commit is contained in:
William Blake Galbreath
2020-04-12 03:45:54 -05:00
parent bf845ca9e4
commit 193c511fce
95 changed files with 275 additions and 665 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/api/0010-Bring-back-server-name.patch
View File

@@ -1,4 +1,4 @@
From 59d3509aaea5bc9b3b15b30602af394a6ef741ec Mon Sep 17 00:00:00 2001
From d4f6fbd999d628857801e5d9a405ee5b010e9ab5 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 26 May 2019 15:18:40 -0500
Subject: [PATCH] Bring back server name
@@ -9,10 +9,10 @@ Subject: [PATCH] Bring back server name
2 files changed, 16 insertions(+)
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 6935cf272..abf7caf0b 100644
index 14e85ac6c..ce82eadb5 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1666,6 +1666,15 @@ public final class Bukkit {
@@ -1694,6 +1694,15 @@ public final class Bukkit {
}
// Purpur start
@@ -29,10 +29,10 @@ index 6935cf272..abf7caf0b 100644
* Get a sample of the servers last tick times (in nanos)
*
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 9d306c084..89e9395e8 100644
index 90b439071..d2a3114eb 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1467,6 +1467,13 @@ public interface Server extends PluginMessageRecipient {
@@ -1489,6 +1489,13 @@ public interface Server extends PluginMessageRecipient {
// Paper end
// Purpur start