Extra bracket validation Creators-of-Create#6271

VoidLeech · Jul 25, 2024 · dd7eedd · dd7eedd
1 parent f6dfe7d
commit dd7eedd
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/...in/java/com/simibubi/create/content/decoration/bracket/BracketedBlockEntityBehaviour.java b/...in/java/com/simibubi/create/content/decoration/bracket/BracketedBlockEntityBehaviour.java
@@ -85,6 +85,10 @@ public BlockState removeBracket(boolean inOnReplacedContext) {
 	public boolean isBracketPresent() {
 		return bracket != null;
 	}
+
+	public boolean isBracketValid(BlockState bracketState) {
+		return bracketState.getBlock() instanceof BracketBlock;
+	}
 
 	@Nullable
 	public BlockState getBracket() {
@@ -110,7 +114,7 @@ public boolean isSafeNBT() {
 
 	@Override
 	public void write(CompoundTag nbt, boolean clientPacket) {
-		if (isBracketPresent()) {
+		if (isBracketPresent() && isBracketValid(bracket)) {
 			nbt.put("Bracket", NbtUtils.writeBlockState(bracket));
 		}
 		if (clientPacket && reRender) {
@@ -122,8 +126,12 @@ public void write(CompoundTag nbt, boolean clientPacket) {
 
 	@Override
 	public void read(CompoundTag nbt, boolean clientPacket) {
-		if (nbt.contains("Bracket"))
-			bracket = NbtUtils.readBlockState(nbt.getCompound("Bracket"));
+		if (nbt.contains("Bracket")) {
+			bracket = null;
+			BlockState readBlockState = NbtUtils.readBlockState(nbt.getCompound("Bracket"));
+			if (isBracketValid(readBlockState))
+				bracket = readBlockState;
+		}
 		if (clientPacket && nbt.contains("Redraw"))
 			getWorld().sendBlockUpdated(getPos(), blockEntity.getBlockState(), blockEntity.getBlockState(), 16);
 		super.read(nbt, clientPacket);