Fixed hopper update bug

Author: Ghost-chu

src/main/java/org/maxgamer/quickshop/listener/BlockListener.java

@@ -36,7 +36,6 @@
 import org.bukkit.event.block.BlockPlaceEvent;
 import org.bukkit.event.block.SignChangeEvent;
 import org.bukkit.event.inventory.InventoryMoveItemEvent;
-import org.bukkit.inventory.Inventory;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.maxgamer.quickshop.Cache;
@@ -60,6 +59,7 @@ public class BlockListener extends AbstractProtectionListener {
 
     public BlockListener(@NotNull final QuickShop plugin, @Nullable final Cache cache) {
         super(plugin, cache);
+        init();
     }
 
     private void init() {
@@ -169,20 +169,36 @@ private Shop getShopNextTo(@NotNull Location loc) {
     @EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR)
     public void onInventoryMove(InventoryMoveItemEvent event) {
         if (!this.update_sign_when_inventory_moving) {
+            Util.debugLog("Sign update was disabled");
             return;
         }
 
-        final Inventory inventory = event.getDestination();
-        final Location location = inventory.getLocation();
-
-        if (location == null) {
-            return;
+        Location destination = event.getDestination().getLocation();
+        Location source = event.getSource().getLocation();
+        Shop destShop = null;
+        Shop sourceShop = null;
+        if (destination != null) {
+            destination = Util.getBlockLocation(destination);
+            Util.debugLog("Destination found: " + destination);
+            destShop = getShopPlayer(destination, true);
+        }
+        if (source != null) {
+            source = Util.getBlockLocation(source);
+            Util.debugLog("Source found: " + destination);
+            sourceShop = getShopPlayer(source, true);
         }
 
-        // Delayed task. Event triggers when item is moved, not when it is received.
-        final Shop shop = getShopRedstone(location, true);
-        if (shop != null) {
-            super.getPlugin().getSignUpdateWatcher().scheduleSignUpdate(shop);
+        if (destShop != null) {
+            Util.debugLog("Destination shop found: " + destShop);
+            super.getPlugin().getSignUpdateWatcher().scheduleSignUpdate(destShop);
+        } else {
+            Util.debugLog("Destination shop not found.");
+        }
+        if (sourceShop != null) {
+            Util.debugLog("Source shop found: " + sourceShop);
+            super.getPlugin().getSignUpdateWatcher().scheduleSignUpdate(sourceShop);
+        } else {
+            Util.debugLog("Source shop not found.");
         }
     }
 

src/main/java/org/maxgamer/quickshop/util/Util.java

@@ -1330,4 +1330,19 @@ public static String createRegexFromGlob(@NotNull String glob) {
         return out.toString();
     }
 
+    /**
+     * Get location that converted to block position (.0)
+     *
+     * @param loc location
+     * @return blocked location
+     */
+    @NotNull
+    public static Location getBlockLocation(@NotNull Location loc) {
+        loc = loc.clone();
+        loc.setX(loc.getBlockX());
+        loc.setY(loc.getBlockY());
+        loc.setZ(loc.getBlockZ());
+        return loc;
+    }
+
 }