From 71d45beaec50c207cabcde5643f9252b6719924b Mon Sep 17 00:00:00 2001
From: bloodshot <jdroque@gmail.com>
Date: Tue, 11 Feb 2020 12:54:51 -0500
Subject: [PATCH] Fix NPE during claim create.

---
 bukkit/src/main/java/com/griefdefender/claim/GDClaim.java       | 1 +
 .../java/com/griefdefender/listener/PlayerEventHandler.java     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/bukkit/src/main/java/com/griefdefender/claim/GDClaim.java b/bukkit/src/main/java/com/griefdefender/claim/GDClaim.java
index 727c4ee..170e8d5 100644
--- a/bukkit/src/main/java/com/griefdefender/claim/GDClaim.java
+++ b/bukkit/src/main/java/com/griefdefender/claim/GDClaim.java
@@ -1514,6 +1514,7 @@ private ClaimResult checkSizeLimits(Player player, GDPlayerData playerData, Vect
                 final Component message = MessageCache.getInstance().CREATE_SUBDIVISION_ONLY;
                 GriefDefenderPlugin.sendMessage(player, message);
                 playerData.lastShovelLocation = null;
+                playerData.claimResizing = null;
                 // TODO: Add new result type for this
                 return new GDClaimResult(ClaimResultType.BELOW_MIN_SIZE_X, message);
             }
diff --git a/bukkit/src/main/java/com/griefdefender/listener/PlayerEventHandler.java b/bukkit/src/main/java/com/griefdefender/listener/PlayerEventHandler.java
index ccf025c..05690d2 100644
--- a/bukkit/src/main/java/com/griefdefender/listener/PlayerEventHandler.java
+++ b/bukkit/src/main/java/com/griefdefender/listener/PlayerEventHandler.java
@@ -984,7 +984,7 @@ private void onPlayerHandleClaimCreateAction(PlayerInteractEvent event, Block cl
             return;
         }
 
-        if (playerData.claimResizing != null) {
+        if (playerData.claimResizing != null && playerData.lastShovelLocation != null) {
             handleResizeFinish(event, player, location, playerData);
             GDTimings.PLAYER_HANDLE_SHOVEL_ACTION.stopTiming();
             return;