From cae5103bb185714f9ca24fc7c532d24e86b1983b Mon Sep 17 00:00:00 2001
From: jhqwqmc <2110242767@qq.com>
Date: Wed, 26 Mar 2025 07:57:34 +0800
Subject: [PATCH] =?UTF-8?q?fix(bukkit):=20=E4=BF=AE=E5=A4=8D=E6=96=B9?=
 =?UTF-8?q?=E5=9D=97=E7=A0=B4=E5=9D=8F=E8=BF=9B=E5=BA=A6=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=8F=8A=E5=BF=AB=E9=80=9F=E5=85=BC=E5=AE=B9?=
 =?UTF-8?q?client-mod-1.21.5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../craftengine/bukkit/plugin/user/BukkitServerPlayer.java    | 4 +++-
 client-mod/src/main/resources/fabric.mod.json                 | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/user/BukkitServerPlayer.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/user/BukkitServerPlayer.java
index 7828f7562..3fb0627e6 100644
--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/user/BukkitServerPlayer.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/user/BukkitServerPlayer.java
@@ -8,6 +8,7 @@ import net.momirealms.craftengine.bukkit.plugin.BukkitCraftEngine;
 import net.momirealms.craftengine.bukkit.util.*;
 import net.momirealms.craftengine.bukkit.world.BukkitWorld;
 import net.momirealms.craftengine.core.block.ImmutableBlockState;
+import net.momirealms.craftengine.core.block.PackedBlockState;
 import net.momirealms.craftengine.core.entity.player.InteractionHand;
 import net.momirealms.craftengine.core.entity.player.Player;
 import net.momirealms.craftengine.core.item.Item;
@@ -310,7 +311,8 @@ public class BukkitServerPlayer extends Player {
         if (custom && getDestroyProgress(state, pos) >= 1f) {
             assert immutableBlockState != null;
             // not an instant break on client side
-            if (getDestroyProgress(immutableBlockState.vanillaBlockState().handle(), pos) < 1f) {
+            PackedBlockState vanillaBlockState = immutableBlockState.vanillaBlockState();
+            if (vanillaBlockState != null && getDestroyProgress(vanillaBlockState.handle(), pos) < 1f) {
                 try {
                     Object levelEventPacket = Reflections.constructor$ClientboundLevelEventPacket.newInstance(2001, LocationUtils.toBlockPos(pos), BlockStateUtils.blockStateToId(this.destroyedState), false);
                     sendPacket(levelEventPacket, false);
diff --git a/client-mod/src/main/resources/fabric.mod.json b/client-mod/src/main/resources/fabric.mod.json
index 534f4f8f7..fc6261618 100644
--- a/client-mod/src/main/resources/fabric.mod.json
+++ b/client-mod/src/main/resources/fabric.mod.json
@@ -27,7 +27,7 @@
   "depends": {
     "fabricloader": ">=${loader_version}",
     "fabric": "*",
-    "minecraft": "${minecraft_version}",
+    "minecraft": ">=${minecraft_version}",
     "modmenu": ">=${modmenu_version}",
     "cloth-config": ">=${cloth_version}"
   }