mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-20 09:57: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 a7ce770713962d590d3f52703ad66ae10465a8a4 Mon Sep 17 00:00:00 2001
|
||||
From 80511018e34ec212cbcea76fa4b3a3748880bfa0 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Sat, 4 May 2019 01:02:11 -0500
|
||||
Subject: [PATCH] Rebrand
|
||||
@@ -107,10 +107,10 @@ index cd6e259239..bb227bc0fb 100644
|
||||
);
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
index 395e5034ea..d7e29a59de 100644
|
||||
index b853d50a4a..88333e3aeb 100644
|
||||
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
@@ -1561,7 +1561,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
|
||||
@@ -1569,7 +1569,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
|
||||
}
|
||||
|
||||
public String getServerModName() {
|
||||
@@ -280,5 +280,5 @@ index 674096cab1..e9aee2d8a9 100644
|
||||
|
||||
if (stream != null) {
|
||||
--
|
||||
2.24.0
|
||||
2.26.2
|
||||
|
||||
|
||||
Reference in New Issue
Block a user