fixed inconsistency in listeners

GhastCraftHD · Mar 29, 2024 · bd61676 · bd61676
1 parent 8014af6
commit bd61676
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/src/main/java/de/leghast/miniaturise/handler/AdjusterInteractionHandler.java b/src/main/java/de/leghast/miniaturise/handler/AdjusterInteractionHandler.java
@@ -1,6 +1,7 @@
 package de.leghast.miniaturise.handler;
 
 import de.leghast.miniaturise.Miniaturise;
+import de.leghast.miniaturise.constant.Message;
 import de.leghast.miniaturise.miniature.PlacedMiniature;
 import de.leghast.miniaturise.settings.AdjusterSettings;
 import de.leghast.miniaturise.ui.UserInterface;
@@ -15,6 +16,11 @@ public AdjusterInteractionHandler(Miniaturise main, Player player, Action action
             main.getSettingsManager().addAdjusterSettings(player.getUniqueId());
         }
 
+        if(!main.getMiniatureManager().hasPlacedMiniature(player.getUniqueId())){
+            player.sendMessage(Message.SELECT_PLACED_MINIATURE_FIRST);
+            return;
+        }
+
         if(action.isLeftClick()){
             PlacedMiniature placedMiniature = main.getMiniatureManager().getPlacedMiniature(player.getUniqueId());
             AdjusterSettings settings = main.getSettingsManager().getAdjusterSettings(player.getUniqueId());

diff --git a/src/main/java/de/leghast/miniaturise/listener/PlayerInteractListener.java b/src/main/java/de/leghast/miniaturise/listener/PlayerInteractListener.java
@@ -31,15 +31,11 @@ public void onPlayerInteract(PlayerInteractEvent e){
         if(!player.hasPermission(Miniaturise.PERMISSION)) return;
 
         if(material == ConfigManager.SELECTOR_TOOL){
-            e.setCancelled(true);
             new SelectorInteractionHandler(main, player, e.getAction(), e.getClickedBlock(), e.getHand());
+            e.setCancelled(true);
         }else if(material == ConfigManager.ADJUSTER_TOOL){
-            if(main.getMiniatureManager().hasPlacedMiniature(player.getUniqueId())){
-                e.setCancelled(true);
-                new AdjusterInteractionHandler(main, player, e.getAction(), e.getHand());
-            }else{
-                player.sendMessage(Message.SELECT_PLACED_MINIATURE_FIRST);
-            }
+            new AdjusterInteractionHandler(main, player, e.getAction(), e.getHand());
+            e.setCancelled(true);
         }
 
     }