From fbd28d86d9033a8fc740a3864bcda074197b4bde Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Tue, 11 May 2021 01:12:59 -0500 Subject: [PATCH] Updated Upstream (Paper & Tuinity) Upstream has released updates that appear to apply and compile correctly Paper Changes: 750049fa2 Fix incorrect colors in some log messages (#5609) Tuinity Changes: 138247324 Null check chunk in block changes for Starlight --- Paper | 2 +- .../server/0001-Tuinity-Server-Changes.patch | 48 +++++++------------ .../server/0002-Airplane-Server-Changes.patch | 6 +-- patches/server/0003-Rebrand.patch | 4 +- .../0011-Configurable-server-mod-name.patch | 4 +- patches/server/0013-Lagging-threshold.patch | 6 +-- .../0057-Configurable-TPS-Catchup.patch | 4 +- ...0074-Add-5-second-tps-average-in-tps.patch | 8 ++-- patches/server/0103-Ridables.patch | 4 +- patches/server/0153-Implement-TPSBar.patch | 4 +- 10 files changed, 39 insertions(+), 51 deletions(-) diff --git a/Paper b/Paper index c5fa3f0d4..750049fa2 160000 --- a/Paper +++ b/Paper @@ -1 +1 @@ -Subproject commit c5fa3f0d4cd2698283dcc5b7c7c39940d0fe69ff +Subproject commit 750049fa2b03d3880b17431625f96e1044bc7b9d diff --git a/patches/server/0001-Tuinity-Server-Changes.patch b/patches/server/0001-Tuinity-Server-Changes.patch index b47f1904a..e5d148408 100644 --- a/patches/server/0001-Tuinity-Server-Changes.patch +++ b/patches/server/0001-Tuinity-Server-Changes.patch @@ -3397,10 +3397,10 @@ index 0000000000000000000000000000000000000000..86a880d0f13f0fee70b09626c394c9e2 +} diff --git a/src/main/java/com/tuinity/tuinity/chunk/light/StarLightEngine.java b/src/main/java/com/tuinity/tuinity/chunk/light/StarLightEngine.java new file mode 100644 -index 0000000000000000000000000000000000000000..e40cf190c945754bd8b5342f76cd7fe2efd127cb +index 0000000000000000000000000000000000000000..2b0455b7475a75bba010fd71798eaa204bcf9562 --- /dev/null +++ b/src/main/java/com/tuinity/tuinity/chunk/light/StarLightEngine.java -@@ -0,0 +1,1615 @@ +@@ -0,0 +1,1603 @@ +package com.tuinity.tuinity.chunk.light; + +import com.tuinity.tuinity.util.CoordinateUtils; @@ -3847,7 +3847,7 @@ index 0000000000000000000000000000000000000000..e40cf190c945754bd8b5342f76cd7fe2 + try { + this.changedBlocksSet = positions; + final IChunkAccess chunk = this.getChunkInCache(chunkX, chunkZ); -+ if (this.isClientSide && chunk == null) { ++ if (chunk == null) { + return; + } + if (changedSections != null) { @@ -4146,18 +4146,6 @@ index 0000000000000000000000000000000000000000..e40cf190c945754bd8b5342f76cd7fe2 + final Boolean[] emptinessChanges) { + this.setupCaches(lightAccess, chunkX * 16 + 7, 128, chunkZ * 16 + 7, true, true); + try { -+ if (this.isClientSide) { -+ // force current chunk into cache -+ final IChunkAccess chunk = (IChunkAccess)lightAccess.getFeaturesReadyChunk(chunkX, chunkZ); -+ if (chunk == null) { -+ // unloaded this frame (or last), and we were still queued -+ return; -+ } -+ this.setChunkInCache(chunkX, chunkZ, chunk); -+ this.setBlocksForChunkInCache(chunkX, chunkZ, chunk.getSections()); -+ this.setNibblesForChunkInCache(chunkX, chunkZ, this.getNibblesOnChunk(chunk)); -+ this.setEmptinessMapCache(chunkX, chunkZ, this.getEmptinessMap(chunk)); -+ } + final IChunkAccess chunk = this.getChunkInCache(chunkX, chunkZ); + if (chunk == null) { + return; @@ -10947,10 +10935,10 @@ index 1d72af9cace7aa8f1d20c7c1c5be621f533e2dad..b7399d17dd64ca8b1f1fab405cb0ac91 worldData.addProperty("keep-spawn-loaded-range", world.paperConfig.keepLoadedRange); worldData.addProperty("visible-chunk-count", visibleChunks.size()); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 61712ae515b329a6b85dbe2e5960e4e864dc7731..2767a9369ddc922f1d9c7cb6c7acc8270545535a 100644 +index 35bb4d0b9ed131e6570cce0b43ae78c5557a0bff..8adbb9a77ff304f14ad3defa0f4f7ec25b0d2a2a 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -267,6 +267,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant processQueue = new java.util.concurrent.ConcurrentLinkedQueue(); public int autosavePeriod; public boolean serverAutoSave = false; // Paper -@@ -877,10 +878,11 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant { @@ -11114,7 +11102,7 @@ index 61712ae515b329a6b85dbe2e5960e4e864dc7731..2767a9369ddc922f1d9c7cb6c7acc827 return !this.canOversleep(); }); isOversleep = false;MinecraftTimings.serverOversleep.stopTiming(); -@@ -1392,6 +1452,8 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant 0; // Paper worldserver.hasEntityMoveEvent = EntityMoveEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper diff --git a/patches/server/0153-Implement-TPSBar.patch b/patches/server/0153-Implement-TPSBar.patch index ce1c18e6b..f8ef7ff85 100644 --- a/patches/server/0153-Implement-TPSBar.patch +++ b/patches/server/0153-Implement-TPSBar.patch @@ -17,10 +17,10 @@ index 2f5e8ed345ace0d9abb7edebe1fd47e562b1d272..ce95a7d9c967d723bad468bd00a5c0a6 if (commanddispatcher_servertype.d) { diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 4ceaa8e905c9ba7277ee00cea020d01d14ae2178..137c52999666ea331ac52c230f0674d489a95524 100644 +index e3c3b2eb03ad132a91140cb459fd8f378154ee2e..176fc4c8b7c5ef45b29cb8aaa1b1ff16dbfc9b7c 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -989,6 +989,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant