Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-26 12:36:07 +01:00
Code Issues Projects Releases Wiki Activity
d54ce6c17f
Paper/Spigot-Server-Patches/0254-Don-t-blindly-send-unlit-chunks-when-lighting-update.patch

49 lines
2.1 KiB
Diff
Raw Normal View History

clear current chunk and entity slice on chunk unload ideally this should of never mattered, as it will only be hit if you teleport out of an unloaded chunk... But apparently some people are triggering this. See #1223
2018-07-30 06:51:58 +02:00
From a8a22980dc19c2c484b6abecee5029bb927fea4a Mon Sep 17 00:00:00 2001
Don't blindly send unlit chunks when lighting updates are allowed Spigot, by default, disables several mechanisms around how chunks are lit, if ever, which has forced them to always send chunks before vanilla would consider them ready to send, causing for lots of issues around lighting glitches. Shamefully, the amount of work to relight chunks can be detremental to some servers, meaning that forcibily disabling light updates can cause major performance issues. as such, we make a compromise; if this "feature" is disabled, we will only send chunks which are actually ready to be sent, otherwise, we will always send chunks.
2017-12-18 08:37:50 +01:00
From: Shane Freeder <theboyetronic@gmail.com>
Date: Mon, 18 Dec 2017 07:26:56 +0000
Subject: [PATCH] Don't blindly send unlit chunks when lighting updates are
allowed
Spigot, by default, disables several mechanisms around how chunks are
lit, if ever, which has forced them to always send chunks before vanilla
would consider them ready to send, causing for lots of issues around
lighting glitches.
Shamefully, the amount of work to relight chunks can be detremental
to some servers, meaning that forcibily disabling light updates can
cause major performance issues.
as such, we make a compromise; if this "feature" is disabled, we will
only send chunks which are actually ready to be sent, otherwise, we
will always send chunks.
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
clear current chunk and entity slice on chunk unload ideally this should of never mattered, as it will only be hit if you teleport out of an unloaded chunk... But apparently some people are triggering this. See #1223
2018-07-30 06:51:58 +02:00
index 59793763ee..97485cf89e 100644
Don't blindly send unlit chunks when lighting updates are allowed Spigot, by default, disables several mechanisms around how chunks are lit, if ever, which has forced them to always send chunks before vanilla would consider them ready to send, causing for lots of issues around lighting glitches. Shamefully, the amount of work to relight chunks can be detremental to some servers, meaning that forcibily disabling light updates can cause major performance issues. as such, we make a compromise; if this "feature" is disabled, we will only send chunks which are actually ready to be sent, otherwise, we will always send chunks.
2017-12-18 08:37:50 +01:00
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
Current Chunk for Entity and Block Entities, counts by entity type This enables us a fast reference to the entities current chunk instead of having to look it up by hashmap lookups. We also store counts by type to further enable other performance optimizations in later patches.
2018-07-04 09:55:24 +02:00
@@ -68,7 +68,7 @@ public class Chunk {
// Paper end
Don't blindly send unlit chunks when lighting updates are allowed Spigot, by default, disables several mechanisms around how chunks are lit, if ever, which has forced them to always send chunks before vanilla would consider them ready to send, causing for lots of issues around lighting glitches. Shamefully, the amount of work to relight chunks can be detremental to some servers, meaning that forcibily disabling light updates can cause major performance issues. as such, we make a compromise; if this "feature" is disabled, we will only send chunks which are actually ready to be sent, otherwise, we will always send chunks.
2017-12-18 08:37:50 +01:00
private boolean done;
private boolean lit;
- private boolean r;
+ private boolean r; private boolean isTicked() { return r; }; // Paper - OBFHELPER
private boolean s;
private boolean t;
private long lastSaved;
clear current chunk and entity slice on chunk unload ideally this should of never mattered, as it will only be hit if you teleport out of an unloaded chunk... But apparently some people are triggering this. See #1223
2018-07-30 06:51:58 +02:00
@@ -1171,7 +1171,11 @@ public class Chunk {
Don't blindly send unlit chunks when lighting updates are allowed Spigot, by default, disables several mechanisms around how chunks are lit, if ever, which has forced them to always send chunks before vanilla would consider them ready to send, causing for lots of issues around lighting glitches. Shamefully, the amount of work to relight chunks can be detremental to some servers, meaning that forcibily disabling light updates can cause major performance issues. as such, we make a compromise; if this "feature" is disabled, we will only send chunks which are actually ready to be sent, otherwise, we will always send chunks.
2017-12-18 08:37:50 +01:00
* We cannot unfortunately do this lighting stage during chunk gen as it appears to put a lot more noticeable load on the server, than when it is done at play time.
* For now at least we will simply send all chunks, in accordance with pre 1.7 behaviour.
*/
- return true;
+ // Paper Start
[CI-SKIP] Fix comment on unlit chunk sending patch
2018-06-12 16:46:08 +02:00
+ // if randomLightUpdates are disabled, we should always return true, otherwise chunks may never send
Don't blindly send unlit chunks when lighting updates are allowed Spigot, by default, disables several mechanisms around how chunks are lit, if ever, which has forced them to always send chunks before vanilla would consider them ready to send, causing for lots of issues around lighting glitches. Shamefully, the amount of work to relight chunks can be detremental to some servers, meaning that forcibily disabling light updates can cause major performance issues. as such, we make a compromise; if this "feature" is disabled, we will only send chunks which are actually ready to be sent, otherwise, we will always send chunks.
2017-12-18 08:37:50 +01:00
+ // to the client due to not being lit, otherwise retain standard behavior and only send properly lit chunks.
+ return !this.world.spigotConfig.randomLightUpdates || (this.isTicked() && this.done && this.lit);
+ // Paper End
// Spigot End
}
--
Fix issues with getBlockState(false) not loading Tile Entity data This only impacted people who used our useSnapshots new API in a plugin, which obviously was no one as the data result was completely broken. Merged the NPE check patch into mine since it has to handle it too.
2018-06-30 07:40:52 +02:00
2.18.0
Don't blindly send unlit chunks when lighting updates are allowed Spigot, by default, disables several mechanisms around how chunks are lit, if ever, which has forced them to always send chunks before vanilla would consider them ready to send, causing for lots of issues around lighting glitches. Shamefully, the amount of work to relight chunks can be detremental to some servers, meaning that forcibily disabling light updates can cause major performance issues. as such, we make a compromise; if this "feature" is disabled, we will only send chunks which are actually ready to be sent, otherwise, we will always send chunks.
2017-12-18 08:37:50 +01:00
Reference in New Issue Copy Permalink