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 996bfc559c8d08e6ba40434b6dd1ef37778779e9 Mon Sep 17 00:00:00 2001
From a75f52ba9053f7276ad8e6a950381c9c2e35f7d8 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 2 Apr 2020 00:28:06 -0500
Subject: [PATCH] Optimize Chunk Ticks
@@ -9,10 +9,10 @@ Subject: [PATCH] Optimize Chunk Ticks
2 files changed, 25 insertions(+), 39 deletions(-)
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
index 54e89c9cc..9af2c5c74 100644
index 1209fbf1c9..0ebd2f8799 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -781,11 +781,12 @@ public class ChunkProviderServer extends IChunkProvider {
@@ -782,11 +782,12 @@ public class ChunkProviderServer extends IChunkProvider {
int k = this.world.getGameRules().getInt(GameRules.RANDOM_TICK_SPEED);
BlockPosition blockposition = this.world.getSpawn();
// CraftBukkit start - Other mob type spawn tick rate
@@ -30,7 +30,7 @@ index 54e89c9cc..9af2c5c74 100644
// CraftBukkit end
this.world.getMethodProfiler().enter("naturalSpawnCount");
@@ -831,40 +832,11 @@ public class ChunkProviderServer extends IChunkProvider {
@@ -833,40 +834,11 @@ public class ChunkProviderServer extends IChunkProvider {
if (flag1 && (this.allowMonsters || this.allowAnimals) && this.world.getWorldBorder().isInBounds(chunk.getPos()) && !this.playerChunkMap.isOutsideOfRange(playerchunk, chunkcoordintpair, true)) { // Spigot // Paper - optimise isOutsideOfRange
this.world.getMethodProfiler().enter("spawner");
this.world.timings.mobSpawn.startTiming(); // Spigot
@@ -77,7 +77,7 @@ index 54e89c9cc..9af2c5c74 100644
// Paper start - only allow spawns upto the limit per chunk and update count afterwards
diff --git a/src/main/java/net/minecraft/server/EnumCreatureType.java b/src/main/java/net/minecraft/server/EnumCreatureType.java
index 3ed7fa324..7f236585d 100644
index 3ed7fa324f..7f236585db 100644
--- a/src/main/java/net/minecraft/server/EnumCreatureType.java
+++ b/src/main/java/net/minecraft/server/EnumCreatureType.java
@@ -31,11 +31,25 @@ public enum EnumCreatureType {