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 befc63f9359defeab79a8b2407b047d2e29636c7 Mon Sep 17 00:00:00 2001
From 84c4a40a15f523104c986a0a12140d94c537a8eb Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 7 Jul 2019 19:52:16 -0500
Subject: [PATCH] Zombie horse naturally spawn
@@ -9,10 +9,10 @@ Subject: [PATCH] Zombie horse naturally spawn
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index d13dc8fce..fc3a41e35 100644
index 854c97bddb..b65df63333 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -597,12 +597,18 @@ public class WorldServer extends World {
@@ -600,12 +600,18 @@ public class WorldServer extends World {
boolean flag1 = this.getGameRules().getBoolean(GameRules.DO_MOB_SPAWNING) && this.random.nextDouble() < (double) difficultydamagescaler.b() * paperConfig.skeleHorseSpawnChance; // Paper
if (flag1) {
@@ -38,7 +38,7 @@ index d13dc8fce..fc3a41e35 100644
this.strikeLightning(new EntityLightning(this, (double) blockposition.getX() + 0.5D, (double) blockposition.getY(), (double) blockposition.getZ() + 0.5D, flag1), org.bukkit.event.weather.LightningStrikeEvent.Cause.WEATHER); // CraftBukkit
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 96a66926f..4c7469b90 100644
index 96a66926fc..4c7469b903 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -657,9 +657,11 @@ public class PurpurWorldConfig {