bug: Fixed cannon contraption breaking in place of existing cannon resulting in new cannon disconnecting

Author: rbasamoyai

CHANGELOG.md

@@ -12,6 +12,7 @@ Fixed:
 - Fixed NO_DAMAGE munition damage setting not applying to shrapnel (including flak and grapeshot)
 - Fixed Create Pulleys and Gantries pushing more blocks than in vanilla Create
 - Fixed display of upside down Cannon Mount and manual Autocannon when solid blocks are above player
+- Fixed cannon contraption breaking in place of existing cannon resulting in new cannon disconnecting
 
 ## [5.11.2] - 2026-02-27
 

src/main/java/rbasamoyai/createbigcannons/cannons/CannonBehavior.java

@@ -21,6 +21,7 @@ public abstract class CannonBehavior extends BlockEntityBehaviour {
 	protected final Set<Direction> connectedTowards = EnumSet.noneOf(Direction.class);
 	protected final Set<Direction> weldedTowards = EnumSet.noneOf(Direction.class);
 	protected Direction currentFacing;
+    protected boolean protectedFromSurroundingRemovals = false;
 
 	protected CannonBehavior(SmartBlockEntity te) {
 		super(te);
@@ -29,6 +30,7 @@ protected CannonBehavior(SmartBlockEntity te) {
 	@Override
 	public void tick() {
 		super.tick();
+        this.protectedFromSurroundingRemovals = false;
 
 		BlockState state = this.blockEntity.getBlockState();
 		if (state.hasProperty(BlockStateProperties.FACING)) {
@@ -111,6 +113,7 @@ public void write(CompoundTag nbt, boolean spawnPacket) {
 
 	@Override
 	public void read(CompoundTag nbt, boolean clientPacket) {
+        this.protectedFromSurroundingRemovals = true;
 		this.currentFacing = nbt.contains("Facing") ? Direction.byName(nbt.getString("Facing")) : null;
 
 		boolean updateFlag = false;
@@ -162,4 +165,6 @@ public boolean canConnectToSide(Direction face) {
 		return state.getBlock() instanceof CannonContraptionProviderBlock cBlock && cBlock.canConnectToSide(state, face);
 	}
 
+    public boolean isProtectedFromSurroundingRemovals() { return this.protectedFromSurroundingRemovals; }
+
 }

src/main/java/rbasamoyai/createbigcannons/cannons/autocannon/AutocannonBlock.java

@@ -52,7 +52,8 @@ default void onRemoveCannon(BlockState state, Level level, BlockPos pos, BlockSt
             if (state1.getBlock() instanceof AutocannonBlock cBlock1
                     && cBlock1.getAutocannonMaterialInLevel(level, state1, pos1) == material
                     && cBlock1.canConnectToSide(state1, opposite)
-                    && be1 instanceof IAutocannonBlockEntity cbe1) {
+                    && be1 instanceof IAutocannonBlockEntity cbe1
+                    && !cbe1.cannonBehavior().isProtectedFromSurroundingRemovals()) {
                 cbe1.cannonBehavior().setConnectedFace(opposite, false);
                 cbe1.cannonBehavior().setWelded(opposite, false);
 				cbe1.cannonBehavior().blockEntity.setChanged();
@@ -67,7 +68,8 @@ default void onRemoveCannon(BlockState state, Level level, BlockPos pos, BlockSt
             if (state2.getBlock() instanceof AutocannonBlock cBlock2
                     && cBlock2.getAutocannonMaterialInLevel(level, state2, pos2) == material
                     && cBlock2.canConnectToSide(state2, facing)
-                    && be2 instanceof IAutocannonBlockEntity cbe2) {
+                    && be2 instanceof IAutocannonBlockEntity cbe2
+                    && !cbe2.cannonBehavior().isProtectedFromSurroundingRemovals()) {
                 cbe2.cannonBehavior().setConnectedFace(facing, false);
                 cbe2.cannonBehavior().setWelded(facing, false);
                 cbe2.cannonBehavior().blockEntity.setChanged();

src/main/java/rbasamoyai/createbigcannons/cannons/big_cannons/BigCannonBlock.java

@@ -81,8 +81,9 @@ default void onRemoveCannon(BlockState state, Level level, BlockPos pos, BlockSt
 		if (this.canConnectToSide(state, facing)
 			&& state1.getBlock() instanceof BigCannonBlock cBlock1
 			&& cBlock1.getCannonMaterialInLevel(level, state1, pos1) == material
+            && cBlock1.canConnectToSide(state1, opposite)
 			&& be1 instanceof IBigCannonBlockEntity cbe1
-			&& cBlock1.canConnectToSide(state1, opposite)) {
+            && !cbe1.cannonBehavior().isProtectedFromSurroundingRemovals()) {
 			cbe1.cannonBehavior().setConnectedFace(opposite, false);
 			cbe1.cannonBehavior().setWelded(opposite, false);
 			if (cbe1 instanceof LayeredBigCannonBlockEntity layered) {
@@ -99,8 +100,9 @@ default void onRemoveCannon(BlockState state, Level level, BlockPos pos, BlockSt
 		if (this.canConnectToSide(state, opposite)
 			&& state2.getBlock() instanceof BigCannonBlock cBlock2
 			&& cBlock2.getCannonMaterialInLevel(level, state2, pos2) == material
+            && cBlock2.canConnectToSide(state2, facing)
 			&& be2 instanceof IBigCannonBlockEntity cbe2
-			&& cBlock2.canConnectToSide(state2, facing)) {
+            && !cbe2.cannonBehavior().isProtectedFromSurroundingRemovals()) {
 			cbe2.cannonBehavior().setConnectedFace(facing, false);
 			cbe2.cannonBehavior().setWelded(facing, false);
 			if (cbe2 instanceof LayeredBigCannonBlockEntity layered) {
@@ -151,7 +153,6 @@ static void onPlace(Level level, BlockPos pos) {
 			if (be instanceof IBigCannonBlockEntity cbe) {
 				BlockPos pos1 = pos.relative(facing);
 				BlockState state1 = level.getBlockState(pos1);
-				BlockEntity be1 = level.getBlockEntity(pos1);
 
 				if (cBlock.canConnectToSide(state, facing)
 					&& state1.getBlock() instanceof BigCannonBlock cBlock1
@@ -188,7 +189,6 @@ static void onPlace(Level level, BlockPos pos) {
 
 				BlockPos pos2 = pos.relative(opposite);
 				BlockState state2 = level.getBlockState(pos2);
-				BlockEntity be2 = level.getBlockEntity(pos2);
 
 				if (cBlock.canConnectToSide(state, opposite)
 					&& state2.getBlock() instanceof BigCannonBlock cBlock2