From 9a758565d75a0400b7d1bc91643047b34af9b7ab Mon Sep 17 00:00:00 2001
From: Frank <developer@ambertation.de>
Date: Tue, 19 Dec 2023 13:22:25 +0100
Subject: [PATCH] Fixed `playerWillDestroy` signature

---
 .../org/betterx/betterend/blocks/MengerSpongeWetBlock.java | 6 +++++-
 .../org/betterx/betterend/blocks/RespawnObeliskBlock.java  | 7 ++++---
 .../org/betterx/betterend/blocks/SilkMothNestBlock.java    | 5 +++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/betterx/betterend/blocks/MengerSpongeWetBlock.java b/src/main/java/org/betterx/betterend/blocks/MengerSpongeWetBlock.java
index b3f8ae4d..040faa2c 100644
--- a/src/main/java/org/betterx/betterend/blocks/MengerSpongeWetBlock.java
+++ b/src/main/java/org/betterx/betterend/blocks/MengerSpongeWetBlock.java
@@ -29,6 +29,8 @@ import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 
+import org.jetbrains.annotations.NotNull;
+
 @SuppressWarnings("deprecation")
 public class MengerSpongeWetBlock extends BaseBlockNotFull implements RenderLayerProvider {
     public MengerSpongeWetBlock() {
@@ -91,7 +93,7 @@ public class MengerSpongeWetBlock extends BaseBlockNotFull implements RenderLaye
     }
 
     @Override
-    public void playerWillDestroy(Level world, BlockPos pos, BlockState state, Player player) {
+    public @NotNull BlockState playerWillDestroy(Level world, BlockPos pos, BlockState state, Player player) {
         BlocksHelper.setWithUpdate(world, pos, Blocks.AIR);
         if (!world.isClientSide()) {
             world.levelEvent(2001, pos, getId(state));
@@ -106,6 +108,8 @@ public class MengerSpongeWetBlock extends BaseBlockNotFull implements RenderLaye
             );
             world.addFreshEntity(drop);
         }
+
+        return state;
     }
 
     @Override
diff --git a/src/main/java/org/betterx/betterend/blocks/RespawnObeliskBlock.java b/src/main/java/org/betterx/betterend/blocks/RespawnObeliskBlock.java
index 36dae72a..62bd19f1 100644
--- a/src/main/java/org/betterx/betterend/blocks/RespawnObeliskBlock.java
+++ b/src/main/java/org/betterx/betterend/blocks/RespawnObeliskBlock.java
@@ -46,6 +46,7 @@ import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import com.google.common.collect.Lists;
 
 import java.util.List;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public class RespawnObeliskBlock extends BaseBlock.Stone implements CustomColorProvider, RenderLayerProvider {
@@ -75,7 +76,7 @@ public class RespawnObeliskBlock extends BaseBlock.Stone implements CustomColorP
     @SuppressWarnings("deprecation")
     public boolean canSurvive(BlockState state, LevelReader world, BlockPos pos) {
         for (int i = 0; i < 3; i++) {
-            if (!world.getBlockState(pos.above(i)).canBeReplaced()){
+            if (!world.getBlockState(pos.above(i)).canBeReplaced()) {
                 return false;
             }
         }
@@ -129,7 +130,7 @@ public class RespawnObeliskBlock extends BaseBlock.Stone implements CustomColorP
     }
 
     @Override
-    public void playerWillDestroy(Level world, BlockPos pos, BlockState state, Player player) {
+    public @NotNull BlockState playerWillDestroy(Level world, BlockPos pos, BlockState state, Player player) {
         if (player.isCreative()) {
             TripleShape shape = state.getValue(SHAPE);
             if (shape == TripleShape.MIDDLE) {
@@ -138,7 +139,7 @@ public class RespawnObeliskBlock extends BaseBlock.Stone implements CustomColorP
                 BlocksHelper.setWithUpdate(world, pos.below(2), Blocks.AIR);
             }
         }
-        super.playerWillDestroy(world, pos, state, player);
+        return super.playerWillDestroy(world, pos, state, player);
     }
 
     @Override
diff --git a/src/main/java/org/betterx/betterend/blocks/SilkMothNestBlock.java b/src/main/java/org/betterx/betterend/blocks/SilkMothNestBlock.java
index 88e9a63d..4d581713 100644
--- a/src/main/java/org/betterx/betterend/blocks/SilkMothNestBlock.java
+++ b/src/main/java/org/betterx/betterend/blocks/SilkMothNestBlock.java
@@ -45,6 +45,7 @@ import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 
 import java.util.Collections;
 import java.util.List;
+import org.jetbrains.annotations.NotNull;
 
 public class SilkMothNestBlock extends BaseBlock implements RenderLayerProvider, AddMineableShears {
     public static final BooleanProperty ACTIVE = EndBlockProperties.ACTIVE;
@@ -124,7 +125,7 @@ public class SilkMothNestBlock extends BaseBlock implements RenderLayerProvider,
     }
 
     @Override
-    public void playerWillDestroy(Level world, BlockPos pos, BlockState state, Player player) {
+    public @NotNull BlockState playerWillDestroy(Level world, BlockPos pos, BlockState state, Player player) {
         if (!state.getValue(ACTIVE) && player.isCreative()) {
             BlocksHelper.setWithUpdate(world, pos.below(), Blocks.AIR);
         }
@@ -132,7 +133,7 @@ public class SilkMothNestBlock extends BaseBlock implements RenderLayerProvider,
         if (up.is(this) && !up.getValue(ACTIVE)) {
             BlocksHelper.setWithUpdate(world, pos.above(), Blocks.AIR);
         }
-        super.playerWillDestroy(world, pos, state, player);
+        return super.playerWillDestroy(world, pos, state, player);
     }
 
     @Override