mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-05 02:10:30 +01:00
69 lines
3.2 KiB
Diff
69 lines
3.2 KiB
Diff
From 1b68fda5180070010d05a20a1c0b8b2fc820f6b9 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Fri, 28 Sep 2018 20:46:29 -0400
|
|
Subject: [PATCH] Optimize Light Recalculations
|
|
|
|
The server triggers light recalculations even if the new block
|
|
is the same as the old block. At this time, BlockData Properties
|
|
do not impact light calculations.
|
|
|
|
So the only way light should change, is if the block itself
|
|
changes from 1 block to another.
|
|
|
|
Also optimizes to not repeatedly look up the same chunk for
|
|
light lookups.
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
|
|
index cb998887..027f9863 100644
|
|
--- a/src/main/java/net/minecraft/server/Chunk.java
|
|
+++ b/src/main/java/net/minecraft/server/Chunk.java
|
|
@@ -347,7 +347,7 @@ public class Chunk implements IChunkAccess {
|
|
private void a(int i, int j, int k, int l) {
|
|
if (l > k && this.areNeighborsLoaded(1)) { // Paper
|
|
for (int i1 = k; i1 < l; ++i1) {
|
|
- this.world.c(EnumSkyBlock.SKY, new BlockPosition(i, i1, j));
|
|
+ this.world.updateBrightness(EnumSkyBlock.SKY, new BlockPosition(i, i1, j), this); // Paper
|
|
}
|
|
|
|
this.x = true;
|
|
@@ -578,7 +578,7 @@ public class Chunk implements IChunkAccess {
|
|
} else {
|
|
if (flag1) {
|
|
this.initLighting();
|
|
- } else {
|
|
+ } else if (block != block1) { // Paper - Optimize light recalculations
|
|
this.runOrQueueLightUpdate(() -> { // Paper - Queue light update
|
|
int i1 = iblockdata.b(this.world, blockposition);
|
|
int j1 = iblockdata1.b(this.world, blockposition);
|
|
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
|
index bbcedb8f..540d237c 100644
|
|
--- a/src/main/java/net/minecraft/server/World.java
|
|
+++ b/src/main/java/net/minecraft/server/World.java
|
|
@@ -589,8 +589,9 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
|
|
}
|
|
|
|
if (this.worldProvider.g()) {
|
|
- for (i1 = k; i1 <= l; ++i1) {
|
|
- this.c(EnumSkyBlock.SKY, new BlockPosition(i, i1, j));
|
|
+ Chunk chunk = getChunkIfLoaded(i >> 4, j >> 4); // Paper
|
|
+ for (i1 = k; chunk != null && i1 <= l; ++i1) { // Paper
|
|
+ this.updateBrightness(EnumSkyBlock.SKY, new BlockPosition(i, i1, j), chunk); // Paper
|
|
}
|
|
}
|
|
|
|
@@ -2294,6 +2295,11 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
|
|
public boolean c(EnumSkyBlock enumskyblock, BlockPosition blockposition) {
|
|
// CraftBukkit start - Use neighbor cache instead of looking up
|
|
Chunk chunk = this.getChunkIfLoaded(blockposition.getX() >> 4, blockposition.getZ() >> 4);
|
|
+ // Paper start - optimize light updates where chunk is known
|
|
+ return updateBrightness(enumskyblock, blockposition, chunk);
|
|
+ }
|
|
+ public boolean updateBrightness(EnumSkyBlock enumskyblock, BlockPosition blockposition, Chunk chunk) {
|
|
+ // Paper end
|
|
if (chunk == null || !chunk.areNeighborsLoaded(1) /*!this.areChunksLoaded(blockposition, 17, false)*/) {
|
|
// CraftBukkit end
|
|
return false;
|
|
--
|
|
2.19.1
|
|
|