Fix Fabric crash on explosion, Closes #174

CyclopsMC · Nov 19, 2024 · 41b1935 · 41b1935
1 parent 3c4fff5
commit 41b1935
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -44,4 +44,4 @@ org.gradle.daemon=false
 org.gradle.caching=true
 
 # Common dependencies
-cyclopscore_version=1.25.1-627
+cyclopscore_version=1.25.3-636
diff --git a/loader-fabric/src/main/java/org/cyclops/colossalchests/block/ChestWallFabric.java b/loader-fabric/src/main/java/org/cyclops/colossalchests/block/ChestWallFabric.java
@@ -9,7 +9,11 @@
 public class ChestWallFabric extends ChestWall {
     public ChestWallFabric(Properties properties, ChestMaterial material) {
         super(properties, material);
-        IBlockExplodedEvent.EVENT.register((blockState, level, blockPos, explosion, biConsumer) -> onBlockExplodedCommon(blockState, level, blockPos, explosion));
+        IBlockExplodedEvent.EVENT.register((blockState, level, blockPos, explosion, biConsumer) -> {
+            if (blockState.getBlock() == this) {
+                onBlockExplodedCommon(blockState, level, blockPos, explosion);
+            }
+        });
     }
 
     @Override

diff --git a/loader-fabric/src/main/java/org/cyclops/colossalchests/block/ColossalChestFabric.java b/loader-fabric/src/main/java/org/cyclops/colossalchests/block/ColossalChestFabric.java
@@ -10,7 +10,11 @@
 public class ColossalChestFabric extends ColossalChest {
     public ColossalChestFabric(Properties properties, ChestMaterial material) {
         super(properties, material, BlockEntityColossalChest::new);
-        IBlockExplodedEvent.EVENT.register((blockState, level, blockPos, explosion, biConsumer) -> onBlockExplodedCommon(blockState, level, blockPos, explosion));
+        IBlockExplodedEvent.EVENT.register((blockState, level, blockPos, explosion, biConsumer) -> {
+            if (blockState.getBlock() == this) {
+                onBlockExplodedCommon(blockState, level, blockPos, explosion);
+            }
+        });
     }
 
     @Override

diff --git a/loader-fabric/src/main/java/org/cyclops/colossalchests/block/InterfaceFabric.java b/loader-fabric/src/main/java/org/cyclops/colossalchests/block/InterfaceFabric.java
@@ -10,7 +10,11 @@
 public class InterfaceFabric extends Interface {
     public InterfaceFabric(Properties properties, ChestMaterial material) {
         super(properties, material, BlockEntityInterface::new);
-        IBlockExplodedEvent.EVENT.register((blockState, level, blockPos, explosion, biConsumer) -> onBlockExplodedCommon(blockState, level, blockPos, explosion));
+        IBlockExplodedEvent.EVENT.register((blockState, level, blockPos, explosion, biConsumer) -> {
+            if (blockState.getBlock() == this) {
+                onBlockExplodedCommon(blockState, level, blockPos, explosion);
+            }
+        });
     }
 
     @Override