Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
b0b54e4e Optimize Villager Pathfinding - Massive Villager Improvement
33a2134b Workaround for really evil plugins breaking sounds
b88ee11f Don't unregister the primary dimensions on world unload
21f9efa2 Improve implementation of chunk leak clean to not run as often
7ee71146 Add missing null check for structure start chunk access
b12177fb One more to seal the deal to improve unloading inactive chunks
78ee3b4e Restore a condition I accidently removed in last build
88a68829 Fix unloading inaccessible chunks too fast regressing gen speed
210a32f2 Unload leaked Cached Chunks
c9795e92 Fix Spigot bug with chunk unloading
This commit is contained in:
William Blake Galbreath
2020-05-27 09:24:51 -05:00
parent 16eea718fa
commit a2b3b33061
7 changed files with 38 additions and 38 deletions

View File

@@ -1,4 +1,4 @@
From 34f82044e292a66771ff5eccf4dadf2d3f8a3c97 Mon Sep 17 00:00:00 2001
From 0d1892aab03c9d9cfd0402e584734bd177349546 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 37341d2d2..918eaf0c6 100644
index 37341d2d2e..918eaf0c6b 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 {
@@ -45,7 +45,7 @@ index 37341d2d2..918eaf0c6 100644
private MinecraftTimings() {}
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
index 3adc3434e..eb0befb35 100644
index 3adc3434e1..eb0befb357 100644
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -1,5 +1,7 @@
@@ -98,7 +98,7 @@ index 3adc3434e..eb0befb35 100644
this.K();
}
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index e9ef6d00c..29b60e287 100644
index e9ef6d00c8..29b60e2879 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2398,7 +2398,9 @@ public abstract class EntityLiving extends Entity {
@@ -164,7 +164,7 @@ index e9ef6d00c..29b60e287 100644
// Purpur start
if (EntityMoveEvent.getHandlerList().getRegisteredListeners().length > 0) {
diff --git a/src/main/java/net/minecraft/server/PathfinderGoalSelector.java b/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
index 84d2abbcb..602b465f1 100644
index a68fc11ec6..4b277a6f6d 100644
--- a/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
+++ b/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
@@ -78,6 +78,7 @@ public class PathfinderGoalSelector {
@@ -206,10 +206,10 @@ index 84d2abbcb..602b465f1 100644
}
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 43535c38a..7298b41ca 100644
index 3546424a1c..799dfdf696 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -842,7 +842,9 @@ public class WorldServer extends World {
@@ -845,7 +845,9 @@ public class WorldServer extends World {
return IRegistry.ENTITY_TYPE.getKey(entity1.getEntityType()).toString();
});
gameprofilerfiller.c("tickPassenger");