mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-18 17:07:43 +01:00
Updated Upstream (Paper)
Upstream has released updates that appears to apply and compile correctly Paper Changes: 34e5942b Fix timings task name generation for extreme cases - Fixes #3499 5e3bacbc Ensure ThreadDeath propagates fully - Fixes #3521 9fa6ba26 Optimize Light Engine dfd3848e Use seed based lookup for Treasure Maps - Fixes lag from carto/sunken maps 74dcb3c9 Revert "Fix enchantment costs (#3519)" 6d72ea16 Fix enchantment costs (#3519) 68cc8d79 Maps shouldn't load chunks (#3518) e7cf34a0 Fix villager trading demand MC-163962 (#3498) 51f9edf2 Change name and id to get from profile in AsyncPlayerPreLoginEvent (#3511)
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From d212c0e4b58360d4ebd4846cabfcebdba7f13b3c Mon Sep 17 00:00:00 2001
|
||||
From aaf81940ff06eed3ca9f1470d22e44737f8d4a80 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 50922dd367..fb066bc10b 100644
|
||||
index 57acbbce17..c4f784f3d7 100644
|
||||
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
@@ -1579,7 +1579,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
|
||||
@@ -1587,7 +1587,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
|
||||
}
|
||||
|
||||
public String getServerModName() {
|
||||
@@ -38,5 +38,5 @@ index fe38b3ce90..a729e7d204 100644
|
||||
getString("settings.timings.url", "https://timings.pl3x.net");
|
||||
}
|
||||
--
|
||||
2.24.0
|
||||
2.26.2
|
||||
|
||||
|
||||
Reference in New Issue
Block a user