From d8cda624c863f1ef832c1f130e368404237a86e6 Mon Sep 17 00:00:00 2001
From: Konstantin Shandurenko <iam@kostya.sexy>
Date: Wed, 13 Apr 2022 23:03:25 +0300
Subject: [PATCH] PlayerDiggingListener fix (#918)

---
 .../net/minestom/server/listener/PlayerDiggingListener.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/net/minestom/server/listener/PlayerDiggingListener.java b/src/main/java/net/minestom/server/listener/PlayerDiggingListener.java
index cc48f7b7e..8c2aa3558 100644
--- a/src/main/java/net/minestom/server/listener/PlayerDiggingListener.java
+++ b/src/main/java/net/minestom/server/listener/PlayerDiggingListener.java
@@ -24,14 +24,17 @@ public final class PlayerDiggingListener {
         final ClientPlayerDiggingPacket.Status status = packet.status();
         final Point blockPosition = packet.blockPosition();
         final Instance instance = player.getInstance();
-        if (instance == null || !instance.isChunkLoaded(blockPosition)) return;
+        if (instance == null) return;
 
         DiggingResult diggingResult = null;
         if (status == ClientPlayerDiggingPacket.Status.STARTED_DIGGING) {
+            if (!instance.isChunkLoaded(blockPosition)) return;
             diggingResult = startDigging(player, instance, blockPosition);
         } else if (status == ClientPlayerDiggingPacket.Status.CANCELLED_DIGGING) {
+            if (!instance.isChunkLoaded(blockPosition)) return;
             diggingResult = cancelDigging(instance, blockPosition);
         } else if (status == ClientPlayerDiggingPacket.Status.FINISHED_DIGGING) {
+            if (!instance.isChunkLoaded(blockPosition)) return;
             diggingResult = finishDigging(player, instance, blockPosition);
         } else if (status == ClientPlayerDiggingPacket.Status.DROP_ITEM_STACK) {
             dropStack(player);