Fixed edge case structure block issue.

Draconic-Inc · Oct 10, 2023 · 9830b77 · 9830b77
1 parent 8d8eb43
commit 9830b77
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/Change Log.txt b/Change Log.txt
@@ -1,5 +1,5 @@
-######## 3.0.30.x ########
-- Added energy link module.
+######## 3.0.30.528 ########
+- Added energy link module. (Effectively wireless charging direct from an energy core)
 - Fixed guardian damaging itself with its own projectiles.
 - Fixed rare edge case energy pylon crash.
 - Fixed energy sometimes getting voided when adding and then removing modules containing energy.

diff --git a/src/main/java/com/brandon3055/draconicevolution/blocks/tileentity/TileEnergyCore.java b/src/main/java/com/brandon3055/draconicevolution/blocks/tileentity/TileEnergyCore.java
@@ -212,11 +212,18 @@ public void toggleActivation() {
                     continue;
                 }
 
-                BlockState state = level.getBlockState(pos);
+                BlockState originalState = level.getBlockState(pos);
+                //Fixes edge case where core can deactivate without reverting structure blocks,
+                //Only ever happened once due to a crash that is now fixed, but just to be safe...
+                if (originalState.is(DEContent.structure_block)) {
+                    deactivateCore();
+                    LOGGER.error("Detected existing structure block when attempting to activate core...");
+                    return;
+                }
                 level.setBlockAndUpdate(pos, DEContent.structure_block.defaultBlockState());
                 BlockEntity tile = level.getBlockEntity(pos);
                 if (tile instanceof TileStructureBlock) {
-                    ((TileStructureBlock) tile).blockName.set(state.getBlock().getRegistryName());
+                    ((TileStructureBlock) tile).blockName.set(originalState.getBlock().getRegistryName());
                     ((TileStructureBlock) tile).setController(this);
                 }
             }