mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-21 10:27:44 +01:00
Updated Upstream (Paper)
Upstream has released updates that appears to apply and compile correctly Paper Changes: ab74bb45 Speed up processing of chunk loads and generation f5dd491f Increase Light Queue Size 9ab69348 Don't load chunks when attempting to unload a chunk 38c62622 Improve Optimize Memory use logic to make iterator safer and fix bad plugins like P2
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From 8a146aa63d0e2fa18567fef8990d10d0cab32730 Mon Sep 17 00:00:00 2001
|
||||
From e883bbd022a3366c55638d766bac3360073daef9 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
|
||||
@@ -11,10 +11,10 @@ Subject: [PATCH] Add more timings timers
|
||||
4 files changed, 44 insertions(+)
|
||||
|
||||
diff --git a/src/main/java/co/aikar/timings/MinecraftTimings.java b/src/main/java/co/aikar/timings/MinecraftTimings.java
|
||||
index 2fa2cd297a..5d65a71d67 100644
|
||||
index 7fc9a625a3..cb27ed36e6 100644
|
||||
--- a/src/main/java/co/aikar/timings/MinecraftTimings.java
|
||||
+++ b/src/main/java/co/aikar/timings/MinecraftTimings.java
|
||||
@@ -46,6 +46,22 @@ public final class MinecraftTimings {
|
||||
@@ -47,6 +47,22 @@ public final class MinecraftTimings {
|
||||
public static final Timing goalCleanup = Timings.ofSafe("PathfinderGoal - Cleanup");
|
||||
public static final Timing goalUpdate = Timings.ofSafe("PathfinderGoal - Update");
|
||||
public static final Timing goalTick = Timings.ofSafe("PathfinderGoal - Tick");
|
||||
@@ -157,10 +157,10 @@ index 2769077bb4..fdb8a0f8c7 100644
|
||||
// Purpur start
|
||||
if (EntityMoveEvent.getHandlerList().getRegisteredListeners().length > 0) {
|
||||
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
|
||||
index 6c95497ee1..04a5d0b56e 100644
|
||||
index 5b01cf947d..27c3ad7311 100644
|
||||
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
||||
@@ -808,7 +808,9 @@ public class WorldServer extends World {
|
||||
@@ -815,7 +815,9 @@ public class WorldServer extends World {
|
||||
return IRegistry.ENTITY_TYPE.getKey(entity1.getEntityType()).toString();
|
||||
});
|
||||
gameprofilerfiller.c("tickPassenger");
|
||||
|
||||
Reference in New Issue
Block a user