Click detection for holograms with no actions

DecentSoftware-eu · Nov 24, 2022 · f5d8708 · f5d8708
1 parent 65372f5
commit f5d8708
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 15 deletions.
diff --git a/src/main/java/eu/decentsoftware/holograms/api/holograms/Hologram.java b/src/main/java/eu/decentsoftware/holograms/api/holograms/Hologram.java
@@ -569,7 +569,7 @@ public void hideAll() {
 
     public void showClickableEntities(@NonNull Player player) {
         HologramPage page = getPage(player);
-        if (page == null || !page.isClickable()) {
+        if (page == null) {
             return;
         }
 
@@ -593,7 +593,11 @@ public void showClickableEntitiesAll() {
 
     public void hideClickableEntities(@NonNull Player player) {
         HologramPage page = getPage(player);
-        if (page == null || !page.isClickable()) return;
+        if (page == null) {
+            return;
+        }
+
+        // Despawn clickable entities
         NMS nms = NMS.getInstance();
         page.getClickableEntityIds().forEach(id -> nms.hideFakeEntities(player, id));
     }

diff --git a/src/main/java/eu/decentsoftware/holograms/plugin/commands/PageSubCommand.java b/src/main/java/eu/decentsoftware/holograms/plugin/commands/PageSubCommand.java
@@ -440,10 +440,6 @@ public CommandHandler getCommandHandler() {
                 page.clearActions(clickType);
                 hologram.save();
                 Lang.ACTION_CLEARED.send(sender);
-                if (!page.isClickable()) {
-                    hologram.hideAll();
-                    hologram.showAll();
-                }
                 return true;
             };
         }
@@ -475,7 +471,6 @@ public CommandHandler getCommandHandler() {
                     Lang.PAGE_DOES_NOT_EXIST.send(sender);
                     return true;
                 }
-                boolean wasClickable = page.isClickable();
                 ClickType clickType = ClickType.fromString(args[2]);
                 if (clickType == null) {
                     Lang.CLICK_TYPE_DOES_NOT_EXIST.send(sender, args[2]);
@@ -490,10 +485,6 @@ public CommandHandler getCommandHandler() {
                 page.addAction(clickType, action);
                 hologram.save();
                 Lang.ACTION_ADDED.send(sender);
-                if (!wasClickable) {
-                    hologram.hideAll();
-                    hologram.showAll();
-                }
                 return true;
             };
         }
@@ -536,10 +527,6 @@ public CommandHandler getCommandHandler() {
                 page.removeAction(clickType, index - 1);
                 hologram.save();
                 Lang.ACTION_REMOVED.send(sender);
-                if (!page.isClickable()) {
-                    hologram.hideAll();
-                    hologram.showAll();
-                }
                 return true;
             };
         }