From 89f8a1ef3d6ae33d2b0532a81b8f9fc8162751f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Cichocki?=
 <53957038+plytki@users.noreply.github.com>
Date: Fri, 5 Jul 2024 13:19:09 +0200
Subject: [PATCH 1/8] fixed issue with NBTItem

---
 .../virtualrealty/listener/player/PlayerActionListener.java     | 2 ++
 .../modnmetl/virtualrealty/listener/stake/DraftListener.java    | 1 +
 2 files changed, 3 insertions(+)

diff --git a/src/main/java/com/modnmetl/virtualrealty/listener/player/PlayerActionListener.java b/src/main/java/com/modnmetl/virtualrealty/listener/player/PlayerActionListener.java
index a24ea09..176575d 100644
--- a/src/main/java/com/modnmetl/virtualrealty/listener/player/PlayerActionListener.java
+++ b/src/main/java/com/modnmetl/virtualrealty/listener/player/PlayerActionListener.java
@@ -338,6 +338,8 @@ public void onPlotItemDraft(PlayerInteractEvent e) {
         PlayerInventory inv = player.getInventory();
         ItemStack claimItem = VirtualRealty.legacyVersion ? player.getItemInHand() : inv.getItemInMainHand();
 
+        if (claimItem == null || claimItem.getType() == Material.AIR) return;
+
         String item = NBT.get(claimItem, nbt -> {
             return nbt.getString("vrplot_item");
         });
diff --git a/src/main/java/com/modnmetl/virtualrealty/listener/stake/DraftListener.java b/src/main/java/com/modnmetl/virtualrealty/listener/stake/DraftListener.java
index 81cece6..ba2189b 100644
--- a/src/main/java/com/modnmetl/virtualrealty/listener/stake/DraftListener.java
+++ b/src/main/java/com/modnmetl/virtualrealty/listener/stake/DraftListener.java
@@ -73,6 +73,7 @@ public void onPlayerDeath(PlayerDeathEvent e) {
     public void onBlockPlace(BlockPlaceEvent e) {
         Player player = e.getPlayer();
         ItemStack itemInHand = VirtualRealty.legacyVersion ? player.getItemInHand() : player.getInventory().getItemInMainHand();
+        if (itemInHand == null || itemInHand.getType() == Material.AIR) return;
         boolean hasItemKey = NBT.get(itemInHand, nbt -> {
             return nbt.hasTag("vrplot_item");
         });

From ceedd8afd545671323863de93ddb63ec154c1e16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Cichocki?=
 <53957038+plytki@users.noreply.github.com>
Date: Fri, 5 Jul 2024 13:19:49 +0200
Subject: [PATCH 2/8] Revert "fixed issue with NBTItem"

This reverts commit 89f8a1ef3d6ae33d2b0532a81b8f9fc8162751f9.
---
 .../virtualrealty/listener/player/PlayerActionListener.java     | 2 --
 .../modnmetl/virtualrealty/listener/stake/DraftListener.java    | 1 -
 2 files changed, 3 deletions(-)

diff --git a/src/main/java/com/modnmetl/virtualrealty/listener/player/PlayerActionListener.java b/src/main/java/com/modnmetl/virtualrealty/listener/player/PlayerActionListener.java
index 176575d..a24ea09 100644
--- a/src/main/java/com/modnmetl/virtualrealty/listener/player/PlayerActionListener.java
+++ b/src/main/java/com/modnmetl/virtualrealty/listener/player/PlayerActionListener.java
@@ -338,8 +338,6 @@ public void onPlotItemDraft(PlayerInteractEvent e) {
         PlayerInventory inv = player.getInventory();
         ItemStack claimItem = VirtualRealty.legacyVersion ? player.getItemInHand() : inv.getItemInMainHand();
 
-        if (claimItem == null || claimItem.getType() == Material.AIR) return;
-
         String item = NBT.get(claimItem, nbt -> {
             return nbt.getString("vrplot_item");
         });
diff --git a/src/main/java/com/modnmetl/virtualrealty/listener/stake/DraftListener.java b/src/main/java/com/modnmetl/virtualrealty/listener/stake/DraftListener.java
index ba2189b..81cece6 100644
--- a/src/main/java/com/modnmetl/virtualrealty/listener/stake/DraftListener.java
+++ b/src/main/java/com/modnmetl/virtualrealty/listener/stake/DraftListener.java
@@ -73,7 +73,6 @@ public void onPlayerDeath(PlayerDeathEvent e) {
     public void onBlockPlace(BlockPlaceEvent e) {
         Player player = e.getPlayer();
         ItemStack itemInHand = VirtualRealty.legacyVersion ? player.getItemInHand() : player.getInventory().getItemInMainHand();
-        if (itemInHand == null || itemInHand.getType() == Material.AIR) return;
         boolean hasItemKey = NBT.get(itemInHand, nbt -> {
             return nbt.hasTag("vrplot_item");
         });

From 48eceef075e44aa9b30398e90d557e9e652672b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Cichocki?=
 <53957038+plytki@users.noreply.github.com>
Date: Fri, 5 Jul 2024 13:21:37 +0200
Subject: [PATCH 3/8] fixed issue with NBTItem

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 2e13386..852c2cc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.modnmetl</groupId>
     <artifactId>virtualrealty</artifactId>
-    <version>2.8.1</version>
+    <version>2.8.2</version>
     <packaging>jar</packaging>
 
     <description>A plot creation and management plugin for Minecraft</description>

From 0415853d88b6792e60adecccfb283b160c584440 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Cichocki?=
 <53957038+plytki@users.noreply.github.com>
Date: Fri, 5 Jul 2024 13:22:06 +0200
Subject: [PATCH 4/8] Revert "fixed issue with NBTItem"

This reverts commit 05484bdacd3c187e3c219d30f1b3dc9101b25842.
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 852c2cc..2e13386 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.modnmetl</groupId>
     <artifactId>virtualrealty</artifactId>
-    <version>2.8.2</version>
+    <version>2.8.1</version>
     <packaging>jar</packaging>
 
     <description>A plot creation and management plugin for Minecraft</description>

From 0373799863a56a1f218cd35495ddff7ad5614616 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Cichocki?=
 <53957038+plytki@users.noreply.github.com>
Date: Fri, 5 Jul 2024 13:22:07 +0200
Subject: [PATCH 5/8] Revert "Revert "fixed issue with NBTItem""

This reverts commit 01e92bf7decbe3694ce3ca4957479037c48e10fa.
---
 .../virtualrealty/listener/player/PlayerActionListener.java     | 2 ++
 .../modnmetl/virtualrealty/listener/stake/DraftListener.java    | 1 +
 2 files changed, 3 insertions(+)

diff --git a/src/main/java/com/modnmetl/virtualrealty/listener/player/PlayerActionListener.java b/src/main/java/com/modnmetl/virtualrealty/listener/player/PlayerActionListener.java
index a24ea09..176575d 100644
--- a/src/main/java/com/modnmetl/virtualrealty/listener/player/PlayerActionListener.java
+++ b/src/main/java/com/modnmetl/virtualrealty/listener/player/PlayerActionListener.java
@@ -338,6 +338,8 @@ public void onPlotItemDraft(PlayerInteractEvent e) {
         PlayerInventory inv = player.getInventory();
         ItemStack claimItem = VirtualRealty.legacyVersion ? player.getItemInHand() : inv.getItemInMainHand();
 
+        if (claimItem == null || claimItem.getType() == Material.AIR) return;
+
         String item = NBT.get(claimItem, nbt -> {
             return nbt.getString("vrplot_item");
         });
diff --git a/src/main/java/com/modnmetl/virtualrealty/listener/stake/DraftListener.java b/src/main/java/com/modnmetl/virtualrealty/listener/stake/DraftListener.java
index 81cece6..ba2189b 100644
--- a/src/main/java/com/modnmetl/virtualrealty/listener/stake/DraftListener.java
+++ b/src/main/java/com/modnmetl/virtualrealty/listener/stake/DraftListener.java
@@ -73,6 +73,7 @@ public void onPlayerDeath(PlayerDeathEvent e) {
     public void onBlockPlace(BlockPlaceEvent e) {
         Player player = e.getPlayer();
         ItemStack itemInHand = VirtualRealty.legacyVersion ? player.getItemInHand() : player.getInventory().getItemInMainHand();
+        if (itemInHand == null || itemInHand.getType() == Material.AIR) return;
         boolean hasItemKey = NBT.get(itemInHand, nbt -> {
             return nbt.hasTag("vrplot_item");
         });

From b2aebf7faf9c3834d2b2e08390da58e46eb2ed50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Cichocki?=
 <53957038+plytki@users.noreply.github.com>
Date: Fri, 5 Jul 2024 13:22:07 +0200
Subject: [PATCH 6/8] Revert "fixed issue with NBTItem"

This reverts commit 89f8a1ef3d6ae33d2b0532a81b8f9fc8162751f9.
---
 .../virtualrealty/listener/player/PlayerActionListener.java     | 2 --
 .../modnmetl/virtualrealty/listener/stake/DraftListener.java    | 1 -
 2 files changed, 3 deletions(-)

diff --git a/src/main/java/com/modnmetl/virtualrealty/listener/player/PlayerActionListener.java b/src/main/java/com/modnmetl/virtualrealty/listener/player/PlayerActionListener.java
index 176575d..a24ea09 100644
--- a/src/main/java/com/modnmetl/virtualrealty/listener/player/PlayerActionListener.java
+++ b/src/main/java/com/modnmetl/virtualrealty/listener/player/PlayerActionListener.java
@@ -338,8 +338,6 @@ public void onPlotItemDraft(PlayerInteractEvent e) {
         PlayerInventory inv = player.getInventory();
         ItemStack claimItem = VirtualRealty.legacyVersion ? player.getItemInHand() : inv.getItemInMainHand();
 
-        if (claimItem == null || claimItem.getType() == Material.AIR) return;
-
         String item = NBT.get(claimItem, nbt -> {
             return nbt.getString("vrplot_item");
         });
diff --git a/src/main/java/com/modnmetl/virtualrealty/listener/stake/DraftListener.java b/src/main/java/com/modnmetl/virtualrealty/listener/stake/DraftListener.java
index ba2189b..81cece6 100644
--- a/src/main/java/com/modnmetl/virtualrealty/listener/stake/DraftListener.java
+++ b/src/main/java/com/modnmetl/virtualrealty/listener/stake/DraftListener.java
@@ -73,7 +73,6 @@ public void onPlayerDeath(PlayerDeathEvent e) {
     public void onBlockPlace(BlockPlaceEvent e) {
         Player player = e.getPlayer();
         ItemStack itemInHand = VirtualRealty.legacyVersion ? player.getItemInHand() : player.getInventory().getItemInMainHand();
-        if (itemInHand == null || itemInHand.getType() == Material.AIR) return;
         boolean hasItemKey = NBT.get(itemInHand, nbt -> {
             return nbt.hasTag("vrplot_item");
         });

From 4112b26f405b28ada1d68642653e26f18db89909 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Cichocki?=
 <53957038+plytki@users.noreply.github.com>
Date: Fri, 5 Jul 2024 13:23:53 +0200
Subject: [PATCH 7/8] fixed issue with NBTItem

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 2e13386..852c2cc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.modnmetl</groupId>
     <artifactId>virtualrealty</artifactId>
-    <version>2.8.1</version>
+    <version>2.8.2</version>
     <packaging>jar</packaging>
 
     <description>A plot creation and management plugin for Minecraft</description>

From 303cbd391e5bc249f14e337f23bcb46c3f19d027 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Cichocki?=
 <53957038+plytki@users.noreply.github.com>
Date: Fri, 5 Jul 2024 13:25:16 +0200
Subject: [PATCH 8/8] fixed issue with NBTItem

---
 .../virtualrealty/listener/player/PlayerActionListener.java     | 2 +-
 .../modnmetl/virtualrealty/listener/stake/DraftListener.java    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/modnmetl/virtualrealty/listener/player/PlayerActionListener.java b/src/main/java/com/modnmetl/virtualrealty/listener/player/PlayerActionListener.java
index a24ea09..046c4f7 100644
--- a/src/main/java/com/modnmetl/virtualrealty/listener/player/PlayerActionListener.java
+++ b/src/main/java/com/modnmetl/virtualrealty/listener/player/PlayerActionListener.java
@@ -337,7 +337,7 @@ public void onPlotItemDraft(PlayerInteractEvent e) {
         }
         PlayerInventory inv = player.getInventory();
         ItemStack claimItem = VirtualRealty.legacyVersion ? player.getItemInHand() : inv.getItemInMainHand();
-
+        if (claimItem == null || claimItem.getType() == Material.AIR) return;
         String item = NBT.get(claimItem, nbt -> {
             return nbt.getString("vrplot_item");
         });
diff --git a/src/main/java/com/modnmetl/virtualrealty/listener/stake/DraftListener.java b/src/main/java/com/modnmetl/virtualrealty/listener/stake/DraftListener.java
index 81cece6..ba2189b 100644
--- a/src/main/java/com/modnmetl/virtualrealty/listener/stake/DraftListener.java
+++ b/src/main/java/com/modnmetl/virtualrealty/listener/stake/DraftListener.java
@@ -73,6 +73,7 @@ public void onPlayerDeath(PlayerDeathEvent e) {
     public void onBlockPlace(BlockPlaceEvent e) {
         Player player = e.getPlayer();
         ItemStack itemInHand = VirtualRealty.legacyVersion ? player.getItemInHand() : player.getInventory().getItemInMainHand();
+        if (itemInHand == null || itemInHand.getType() == Material.AIR) return;
         boolean hasItemKey = NBT.get(itemInHand, nbt -> {
             return nbt.hasTag("vrplot_item");
         });