From f3bb31e2c9e7a0c66758580b33ec6a5341c4b6c9 Mon Sep 17 00:00:00 2001
From: IThundxr <me@ithundxr.dev>
Date: Mon, 4 Nov 2024 16:51:39 -0500
Subject: [PATCH] Fix Fabricators-of-Create/Create#1552

---
 .../kinetics/simpleRelays/AbstractSimpleShaftBlock.java      | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/AbstractSimpleShaftBlock.java b/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/AbstractSimpleShaftBlock.java
index d4ad89d447..c6eaeb67ed 100644
--- a/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/AbstractSimpleShaftBlock.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/AbstractSimpleShaftBlock.java
@@ -37,7 +37,10 @@ public PushReaction getPistonPushReaction(BlockState state) {
 
 	@Override
 	public void onRemove(BlockState state, Level world, BlockPos pos, BlockState newState, boolean isMoving) {
-		if (state != newState && !isMoving)
+		boolean wasWaterLogged = state.hasProperty(WATERLOGGED) &&
+				newState.hasProperty(WATERLOGGED) &&
+				(state.getValue(WATERLOGGED) != newState.getValue(WATERLOGGED));
+		if (state != newState && !isMoving && !wasWaterLogged)
 			removeBracket(world, pos, true).ifPresent(stack -> Block.popResource(world, pos, stack));
 		super.onRemove(state, world, pos, newState, isMoving);
 	}