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:
ffecc4e2 Revert "Optimize entity list iteration requiring entities be in"
0a4286cc Prevent Fire from loading chunks
07915ea1 Add Player Client Options API (#2883)
bc48a317 Optimize entity list iteration requiring entities be in  loaded chunks
88092fef Optimize ChunkProviderServer's chunk level checking helper methods
01e8ce8d Forced Watchdog Crash support and Improve Async Shutdown
fdb8fe78 Be less strict with vanilla teleport command limits
This commit is contained in:
William Blake Galbreath
2020-04-17 15:32:51 -05:00
parent 6c4aab0053
commit e4a8964a8b
19 changed files with 221 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/server/0100-Configurable-server-mod-name.patch
View File

@@ -1,4 +1,4 @@
From 598668d4a40b05ccefe6cefc226caeb1e10350a4 Mon Sep 17 00:00:00 2001
From 413e84b63152874399d2d0908986e3f973fb7048 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 21 Mar 2020 11:47:39 -0500
Subject: [PATCH] Configurable server mod name
@@ -9,10 +9,10 @@ Subject: [PATCH] Configurable server mod name
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index f83e6de09..dd2620d31 100644
index fc255ddfd1..6f14ed2726 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1535,7 +1535,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -1563,7 +1563,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
}
public String getServerModName() {
@@ -22,7 +22,7 @@ index f83e6de09..dd2620d31 100644
public CrashReport b(CrashReport crashreport) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index c4ec51555..dd3afd4a5 100644
index c4ec515557..dd3afd4a57 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -185,6 +185,11 @@ public class PurpurConfig {
@@ -38,5 +38,5 @@ index c4ec51555..dd3afd4a5 100644
getString("settings.timings.url", "https://timings.pl3x.net");
}
--
2.25.0.windows.1
2.24.0