Merge remote-tracking branch 'origin/master-1.18' into master-1.19-lts

CyclopsMC · Jul 31, 2023 · ca3c8b6 · ca3c8b6
2 parents e41e6b6 + 130242a
commit ca3c8b6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/resources/changelog/1.18.2-1.13.8.txt b/resources/changelog/1.18.2-1.13.8.txt
@@ -0,0 +1,6 @@
+As always, don't forget to backup your world before updating!
+Requires CyclopsCore version 1.17.0 or higher.
+
+Fixes:
+* Fix invisible light crash in debug worlds, Closes #1287
+
diff --git a/src/main/java/org/cyclops/integrateddynamics/block/BlockInvisibleLight.java b/src/main/java/org/cyclops/integrateddynamics/block/BlockInvisibleLight.java
@@ -66,7 +66,7 @@ public void fillItemCategory(CreativeModeTab p_149666_1_, NonNullList<ItemStack>
     @Override
     public int getLightEmission(BlockState state, BlockGetter world, BlockPos pos) {
         if (state.getBlock() == this) {
-            return world.getBlockState(pos).getValue(LIGHT);
+            return state.getValue(LIGHT);
         }
         return super.getLightEmission(state, world, pos);
     }