Refactor lighting code, fix loaded chunks (Minestom#2164)

OneLiteFeatherNET · May 30, 2024 · 1c7fc6c · 1c7fc6c
1 parent d46c626
commit 1c7fc6c
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 12 deletions.
diff --git a/src/main/java/net/minestom/server/instance/LightingChunk.java b/src/main/java/net/minestom/server/instance/LightingChunk.java
@@ -191,7 +191,15 @@ public void onGenerate() {
                 if (neighborChunk == null) continue;
 
                 if (neighborChunk instanceof LightingChunk light) {
-                    if (light.doneInit) light.resendTimer.set(20);
+                    if (light.doneInit) {
+                        light.resendTimer.set(20);
+                        light.invalidate();
+
+                        for (int section = minSection; section < maxSection; section++) {
+                            light.getSection(section).blockLight().invalidate();
+                            light.getSection(section).skyLight().invalidate();
+                        }
+                    }
                 }
             }
         }
@@ -316,13 +324,6 @@ public void tick(long time) {
 
         if (doneInit && resendTimer.get() > 0) {
             if (resendTimer.decrementAndGet() == 0) {
-                invalidate();
-
-                for (int section = minSection; section < maxSection; section++) {
-                    getSection(section).blockLight().invalidate();
-                    getSection(section).skyLight().invalidate();
-                }
-
                 sendLighting();
             }
         }
@@ -520,4 +521,9 @@ private static Set<Chunk> relight(Instance instance, Set<Point> queue, LightType
         lightingChunk.entries.putAll(entries);
         return lightingChunk;
     }
+
+    @Override
+    public boolean isLoaded() {
+        return super.isLoaded() && doneInit;
+    }
 }
diff --git a/src/main/java/net/minestom/server/instance/light/BlockLight.java b/src/main/java/net/minestom/server/instance/light/BlockLight.java
@@ -24,8 +24,8 @@ final class BlockLight implements Light {
     private byte[] contentPropagation;
     private byte[] contentPropagationSwap;
 
-    private AtomicBoolean isValidBorders = new AtomicBoolean(true);
-    private AtomicBoolean needsSend = new AtomicBoolean(false);
+    private final AtomicBoolean isValidBorders = new AtomicBoolean(true);
+    private final AtomicBoolean needsSend = new AtomicBoolean(false);
 
     private Set<Point> toUpdateSet = new HashSet<>();
     private final Section[] neighborSections = new Section[BlockFace.values().length];
@@ -202,7 +202,7 @@ public void set(byte[] copyArray) {
         this.content = copyArray.clone();
         this.contentPropagation = this.content;
         this.isValidBorders.set(true);
-        this.needsSend.set(false);
+        this.needsSend.set(true);
     }
 
     @Override

diff --git a/src/main/java/net/minestom/server/instance/light/SkyLight.java b/src/main/java/net/minestom/server/instance/light/SkyLight.java
@@ -224,7 +224,7 @@ public void set(byte[] copyArray) {
         this.content = copyArray.clone();
         this.contentPropagation = this.content;
         this.isValidBorders.set(true);
-        this.needsSend.set(false);
+        this.needsSend.set(true);
     }
 
     @Override