diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/block/FallingBlockRemoveListener.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/block/FallingBlockRemoveListener.java
index d97dd842b..5be81793d 100644
--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/block/FallingBlockRemoveListener.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/block/FallingBlockRemoveListener.java
@@ -9,12 +9,10 @@ import net.momirealms.craftengine.core.item.Item;
 import net.momirealms.craftengine.core.plugin.CraftEngine;
 import net.momirealms.craftengine.core.plugin.context.ContextHolder;
 import net.momirealms.craftengine.core.plugin.context.parameter.DirectContextParameters;
-import net.momirealms.craftengine.core.world.World;
 import net.momirealms.craftengine.core.world.WorldPosition;
 import org.bukkit.entity.FallingBlock;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
-import org.bukkit.event.entity.EntityRemoveEvent;
 
 import java.util.Optional;
 
@@ -22,47 +20,32 @@ import java.util.Optional;
 public final class FallingBlockRemoveListener implements Listener {
 
     @EventHandler
-    public void onFallingBlockBreak(EntityRemoveEvent event) {
-        if (!(event.getEntity() instanceof FallingBlock fallingBlock)) return;
-        try {
-            if (event.getCause() == EntityRemoveEvent.Cause.DROP) {
+    public void onFallingBlockBreak(org.bukkit.event.entity.EntityRemoveEvent event) {
+        if (event.getCause() == org.bukkit.event.entity.EntityRemoveEvent.Cause.DROP && event.getEntity() instanceof FallingBlock fallingBlock) {
+            try {
                 Object fallingBlockEntity = CraftBukkitReflections.field$CraftEntity$entity.get(fallingBlock);
-                Object blockState = CoreReflections.field$FallingBlockEntity$blockState.get(fallingBlockEntity);
-                Optional<ImmutableBlockState> optionalCustomState = BlockStateUtils.getOptionalCustomBlockState(blockState);
-                if (optionalCustomState.isEmpty()) return;
-                ImmutableBlockState customState = optionalCustomState.get();
-                World world = new BukkitWorld(fallingBlock.getWorld());
-                WorldPosition position = new WorldPosition(world, CoreReflections.field$Entity$xo.getDouble(fallingBlockEntity), CoreReflections.field$Entity$yo.getDouble(fallingBlockEntity), CoreReflections.field$Entity$zo.getDouble(fallingBlockEntity));
                 boolean cancelDrop = (boolean) CoreReflections.field$FallingBlockEntity$cancelDrop.get(fallingBlockEntity);
-                if (!cancelDrop) {
-                    ContextHolder.Builder builder = ContextHolder.builder()
-                            .withParameter(DirectContextParameters.FALLING_BLOCK, true)
-                            .withParameter(DirectContextParameters.POSITION, position);
-                    for (Item<Object> item : customState.getDrops(builder, world, null)) {
-                        world.dropItemNaturally(position, item);
-                    }
-                }
-                Object entityData = CoreReflections.field$Entity$entityData.get(fallingBlockEntity);
-                boolean isSilent = (boolean) CoreReflections.method$SynchedEntityData$get.invoke(entityData, CoreReflections.instance$Entity$DATA_SILENT);
-                if (!isSilent) {
-                    world.playBlockSound(position, customState.settings().sounds().destroySound());
-                }
-            } else if (event.getCause() == EntityRemoveEvent.Cause.DESPAWN) {
-                Object fallingBlockEntity = CraftBukkitReflections.field$CraftEntity$entity.get(fallingBlock);
+                if (cancelDrop) return;
                 Object blockState = CoreReflections.field$FallingBlockEntity$blockState.get(fallingBlockEntity);
                 Optional<ImmutableBlockState> optionalCustomState = BlockStateUtils.getOptionalCustomBlockState(blockState);
                 if (optionalCustomState.isEmpty()) return;
                 ImmutableBlockState customState = optionalCustomState.get();
-                World world = new BukkitWorld(fallingBlock.getWorld());
+                net.momirealms.craftengine.core.world.World world = new BukkitWorld(fallingBlock.getWorld());
                 WorldPosition position = new WorldPosition(world, CoreReflections.field$Entity$xo.getDouble(fallingBlockEntity), CoreReflections.field$Entity$yo.getDouble(fallingBlockEntity), CoreReflections.field$Entity$zo.getDouble(fallingBlockEntity));
+                ContextHolder.Builder builder = ContextHolder.builder()
+                        .withParameter(DirectContextParameters.FALLING_BLOCK, true)
+                        .withParameter(DirectContextParameters.POSITION, position);
+                for (Item<Object> item : customState.getDrops(builder, world, null)) {
+                    world.dropItemNaturally(position, item);
+                }
                 Object entityData = CoreReflections.field$Entity$entityData.get(fallingBlockEntity);
                 boolean isSilent = (boolean) CoreReflections.method$SynchedEntityData$get.invoke(entityData, CoreReflections.instance$Entity$DATA_SILENT);
                 if (!isSilent) {
                     world.playBlockSound(position, customState.settings().sounds().destroySound());
                 }
+            } catch (ReflectiveOperationException e) {
+                CraftEngine.instance().logger().warn("Failed to handle EntityRemoveEvent", e);
             }
-        } catch (ReflectiveOperationException e) {
-            CraftEngine.instance().logger().warn("Failed to handle EntityRemoveEvent", e);
         }
     }
 }
diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/block/behavior/FallingBlockBehavior.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/block/behavior/FallingBlockBehavior.java
index 52173b8e8..308e0168e 100644
--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/block/behavior/FallingBlockBehavior.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/block/behavior/FallingBlockBehavior.java
@@ -16,7 +16,6 @@ import net.momirealms.craftengine.core.plugin.context.parameter.DirectContextPar
 import net.momirealms.craftengine.core.util.ResourceConfigUtils;
 import net.momirealms.craftengine.core.util.VersionHelper;
 import net.momirealms.craftengine.core.world.Vec3d;
-import net.momirealms.craftengine.core.world.World;
 import net.momirealms.craftengine.core.world.WorldPosition;
 
 import java.util.Map;
@@ -81,20 +80,19 @@ public class FallingBlockBehavior extends BukkitBlockBehavior {
         if (VersionHelper.isOrAbove1_20_3()) return;
         Object level = args[0];
         Object fallingBlockEntity = args[2];
+        boolean cancelDrop = (boolean) CoreReflections.field$FallingBlockEntity$cancelDrop.get(fallingBlockEntity);
+        if (cancelDrop) return;
         Object blockState = CoreReflections.field$FallingBlockEntity$blockState.get(fallingBlockEntity);
         Optional<ImmutableBlockState> optionalCustomState = BlockStateUtils.getOptionalCustomBlockState(blockState);
         if (optionalCustomState.isEmpty()) return;
         ImmutableBlockState customState = optionalCustomState.get();
-        World world = new BukkitWorld(FastNMS.INSTANCE.method$Level$getCraftWorld(level));
+        net.momirealms.craftengine.core.world.World world = new BukkitWorld(FastNMS.INSTANCE.method$Level$getCraftWorld(level));
         WorldPosition position = new WorldPosition(world, CoreReflections.field$Entity$xo.getDouble(fallingBlockEntity), CoreReflections.field$Entity$yo.getDouble(fallingBlockEntity), CoreReflections.field$Entity$zo.getDouble(fallingBlockEntity));
-        boolean cancelDrop = (boolean) CoreReflections.field$FallingBlockEntity$cancelDrop.get(fallingBlockEntity);
-        if (!cancelDrop) {
-            ContextHolder.Builder builder = ContextHolder.builder()
-                    .withParameter(DirectContextParameters.FALLING_BLOCK, true)
-                    .withParameter(DirectContextParameters.POSITION, position);
-            for (Item<Object> item : customState.getDrops(builder, world, null)) {
-                world.dropItemNaturally(position, item);
-            }
+        ContextHolder.Builder builder = ContextHolder.builder()
+                .withParameter(DirectContextParameters.FALLING_BLOCK, true)
+                .withParameter(DirectContextParameters.POSITION, position);
+        for (Item<Object> item : customState.getDrops(builder, world, null)) {
+            world.dropItemNaturally(position, item);
         }
         Object entityData = CoreReflections.field$Entity$entityData.get(fallingBlockEntity);
         boolean isSilent = (boolean) CoreReflections.method$SynchedEntityData$get.invoke(entityData, CoreReflections.instance$Entity$DATA_SILENT);