Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 09:57: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:
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:
William Blake Galbreath
2020-06-08 15:49:24 -05:00
parent eb7806de67
commit 1564cefa74
15 changed files with 59 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/server/0106-Add-more-timings-timers.patch
View File

@@ -1,4 +1,4 @@
From 078370ffd5a5cb03267ec7b44e38fa68501b371a Mon Sep 17 00:00:00 2001
From 26a819664b9b9552b1c78ba9d514b2e0543609b6 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 4 Apr 2020 02:36:45 -0500
Subject: [PATCH] Add more timings timers
@@ -12,7 +12,7 @@ Subject: [PATCH] Add more timings timers
5 files changed, 56 insertions(+)
diff --git a/src/main/java/co/aikar/timings/MinecraftTimings.java b/src/main/java/co/aikar/timings/MinecraftTimings.java
index 84b1f068ad..fefc2433c6 100644
index 48e1c50069..4949599b76 100644
--- a/src/main/java/co/aikar/timings/MinecraftTimings.java
+++ b/src/main/java/co/aikar/timings/MinecraftTimings.java
@@ -43,6 +43,28 @@ public final class MinecraftTimings {
@@ -206,10 +206,10 @@ index a68fc11ec6..4b277a6f6d 100644
}
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 3546424a1c..799dfdf696 100644
index 81d233d23b..69102082f8 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -845,7 +845,9 @@ public class WorldServer extends World {
@@ -846,7 +846,9 @@ public class WorldServer extends World {
return IRegistry.ENTITY_TYPE.getKey(entity1.getEntityType()).toString();
});
gameprofilerfiller.c("tickPassenger");
@@ -220,5 +220,5 @@ index 3546424a1c..799dfdf696 100644
}
--
2.24.0
2.26.2