Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
0ed6da7a Fix issues with 167 causing crashes due to missing chunks - Fixes #3122
This commit is contained in:
William Blake Galbreath
2020-04-10 13:47:07 -05:00
parent ef94c821f3
commit 94b1df84a7
3 changed files with 6 additions and 6 deletions

2
Paper

Submodule Paper updated: 23ee0a8a88...0ed6da7ab2

View File

@@ -1 +1 @@
1.15.2--0c4c1a42e0ce8f78669b86873cc1c3e9138e4022
1.15.2--02a000c7ee17e8217c3b0a580b2f054f6f7d2ec7

View File

@@ -1,4 +1,4 @@
From 5edce62e30b52fab1714882adddf2e49bd67690b Mon Sep 17 00:00:00 2001
From 8d74454f45f74963f24703a984868e23ce73b6ce 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
@@ -10,7 +10,7 @@ Subject: [PATCH] Optimize Chunk Ticks
3 files changed, 51 insertions(+), 63 deletions(-)
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
index 15450f36a4..276f1adcec 100644
index bacfc4cba6..e5a59e8e21 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -632,11 +632,12 @@ public class ChunkProviderServer extends IChunkProvider {
@@ -135,10 +135,10 @@ index 3ed7fa324f..7f236585db 100644
+ // Purpur end
}
diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
index 32fed8a39a..488be0c130 100644
index 92c9ab43d7..f42bc2180c 100644
--- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
+++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
@@ -1358,28 +1358,28 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -1359,28 +1359,28 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
}
boolean isOutsideOfRange(ChunkCoordIntPair chunkcoordintpair, boolean reducedRange) {