Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
a8ef0a93 Drop remove leaked chunk patch - causing many issues
ff4ca31f Fix premature unloading of neighbor chunks for world gen
fde81356 Fix Chunks unloading immediately for priority access - Fixes #3461
9980f427 Fix some logic on villager poi max attempts
919ab67a Fix concurrency issue in light engine (Vanilla bug)
0d5ec653 Cleanup async chunks (#3456)
c3c005c9 Updated Upstream (Bukkit/CraftBukkit) (Fixes #3443)
This commit is contained in:
William Blake Galbreath
2020-05-29 17:42:32 -05:00
parent a2b3b33061
commit a032d548bf
5 changed files with 17 additions and 17 deletions

View File

@@ -1,4 +1,4 @@
From a75f52ba9053f7276ad8e6a950381c9c2e35f7d8 Mon Sep 17 00:00:00 2001
From a86a2da2c5932ea73094f9e8612250867ae7b89c 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 1209fbf1c9..0ebd2f8799 100644
index 54e89c9cc6..9af2c5c747 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -782,11 +782,12 @@ public class ChunkProviderServer extends IChunkProvider {
@@ -781,11 +781,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 1209fbf1c9..0ebd2f8799 100644
// CraftBukkit end
this.world.getMethodProfiler().enter("naturalSpawnCount");
@@ -833,40 +834,11 @@ public class ChunkProviderServer extends IChunkProvider {
@@ -831,40 +832,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