Attempt to fix NPE (#527)

CaffeineMC · Jun 21, 2024 · a063311 · a063311
1 parent c611027
commit a063311
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/...a/me/jellysquid/mods/lithium/common/entity/block_tracking/ChunkSectionChangeCallback.java b/...a/me/jellysquid/mods/lithium/common/entity/block_tracking/ChunkSectionChangeCallback.java
@@ -50,14 +50,16 @@ public static ChunkSectionChangeCallback create(long sectionPos, World world) {
         return chunkSectionChangeCallback;
     }
 
-    public short onBlockChange(int flagIndex, BlockListeningSection section) {
-        ArrayList<SectionedBlockChangeTracker> sectionedBlockChangeTrackers = this.trackers[flagIndex];
-        this.trackers[flagIndex] = null;
-        //noinspection ForLoopReplaceableByForEach
-        for (int i = 0; i < sectionedBlockChangeTrackers.size(); i++) {
-            sectionedBlockChangeTrackers.get(i).setChanged(section);
+    public short onBlockChange(int blockGroupIndex, BlockListeningSection section) {
+        ArrayList<SectionedBlockChangeTracker> sectionedBlockChangeTrackers = this.trackers[blockGroupIndex];
+        this.trackers[blockGroupIndex] = null;
+        if (sectionedBlockChangeTrackers != null) {
+            //noinspection ForLoopReplaceableByForEach
+            for (int i = 0; i < sectionedBlockChangeTrackers.size(); i++) {
+                sectionedBlockChangeTrackers.get(i).setChanged(section);
+            }
         }
-        this.listeningMask &= (short) ~(1 << flagIndex);
+        this.listeningMask &= (short) ~(1 << blockGroupIndex);
 
         return this.listeningMask;
     }

diff --git a/src/main/java/me/jellysquid/mods/lithium/mixin/util/block_tracking/ChunkSectionMixin.java b/src/main/java/me/jellysquid/mods/lithium/mixin/util/block_tracking/ChunkSectionMixin.java
@@ -165,8 +165,9 @@ private void updateFlagCounters(int x, int y, int z, BlockState newState, boolea
     @Override
     @Unique
     public void lithium$invalidateListeningSection(ChunkSectionPos sectionPos) {
-        if ((this.listeningMask) != 0) {
+        if (this.listeningMask != 0) {
             this.changeListener.onChunkSectionInvalidated(sectionPos);
+            this.listeningMask = 0;
         }
     }
 }