From aa89e642566af6e66000d37f26b40f963f7ba29a Mon Sep 17 00:00:00 2001
From: mfnalex <1122571+mfnalex@users.noreply.github.com>
Date: Thu, 21 May 2020 10:44:31 +0200
Subject: [PATCH] Possible fix for #57

---
 pom.xml                                                     | 2 +-
 .../JeffChestSortAdditionalHotkeyListener.java              | 6 ++++++
 src/main/resources/plugin.yml                               | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index e28e7be..96c59f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
 	<groupId>de.jeffclan</groupId>
 	<artifactId>JeffChestSort</artifactId>
-	<version>8.2</version>
+	<version>8.3</version>
 	<packaging>jar</packaging>
 
 	<name>JeffChestSort</name>
diff --git a/src/main/java/de/jeffclan/JeffChestSort/JeffChestSortAdditionalHotkeyListener.java b/src/main/java/de/jeffclan/JeffChestSort/JeffChestSortAdditionalHotkeyListener.java
index 1e42b82..e874907 100644
--- a/src/main/java/de/jeffclan/JeffChestSort/JeffChestSortAdditionalHotkeyListener.java
+++ b/src/main/java/de/jeffclan/JeffChestSort/JeffChestSortAdditionalHotkeyListener.java
@@ -1,5 +1,6 @@
 package de.jeffclan.JeffChestSort;
 
+import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
@@ -26,6 +27,10 @@ public class JeffChestSortAdditionalHotkeyListener implements Listener {
 		if(e.getClickedInventory()!=null) {
 			return;
 		}
+		// Possible fix for #57
+		if(e.getInventory().getHolder()==null) return;
+		if(!(e.getInventory().getHolder() instanceof Block)) return;
+		// End Possible fix for #57
 		if(e.getInventory().getType() != InventoryType.CHEST
 				&& e.getInventory().getType() != InventoryType.DISPENSER
 				&& e.getInventory().getType() != InventoryType.DROPPER
@@ -34,6 +39,7 @@ public class JeffChestSortAdditionalHotkeyListener implements Listener {
 				&& (e.getInventory().getHolder() == null || !e.getInventory().getHolder().getClass().toString().endsWith(".CraftBarrel"))) {
 			return;
 		}
+		
 		Player p = (Player) e.getWhoClicked();
 		
 		if(!p.hasPermission("chestsort.use")) return;
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 430256b..371c470 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -1,6 +1,6 @@
 main: de.jeffclan.JeffChestSort.JeffChestSortPlugin
 name: ChestSort
-version: 8.2
+version: 8.3
 api-version: 1.13
 description: Allows automatic chest sorting
 author: mfnalex