Fix HologramClickEvent being called for invalid clicks

DecentSoftware-eu · Jun 15, 2023 · 9940d60 · 9940d60
1 parent 6b9e7aa
commit 9940d60
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 9 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
@@ -498,17 +498,20 @@ public Hologram clone(@NonNull String name, @NonNull Location location, boolean
      * @param clickType The type of the click.
      * @return True if the click was handled, false otherwise.
      */
-    public boolean onClick(@NonNull Player player, int entityId, @NonNull ClickType clickType) {
-        if (this.hasFlag(EnumFlag.DISABLE_ACTIONS)) {
+    public boolean onClick(final @NonNull Player player, final int entityId, final @NonNull ClickType clickType) {
+        HologramPage page = getPage(player);
+        if (page == null || !page.hasEntity(entityId)) {
             return false;
         }
-        HologramPage page = getPage(player);
-        boolean clickedThisHologram = page != null && page.hasEntity(entityId);
+
         boolean eventNotCancelled = EventFactory.handleHologramClickEvent(player, this, page, clickType, entityId);
-        if (clickedThisHologram && eventNotCancelled) {
-            page.executeActions(player, clickType);
+        if (eventNotCancelled) {
+            if (!hasFlag(EnumFlag.DISABLE_ACTIONS)) {
+                page.executeActions(player, clickType);
+            }
             return true;
         }
+
         return false;
     }
 

diff --git a/src/main/java/eu/decentsoftware/holograms/api/holograms/HologramManager.java b/src/main/java/eu/decentsoftware/holograms/api/holograms/HologramManager.java
@@ -120,7 +120,7 @@ public HologramLine spawnTemporaryHologramLine(@NonNull Location location, Strin
      * @param clickType Click type.
      * @return True if the click was processed, false otherwise.
      */
-    public boolean onClick(@NonNull Player player, int entityId, @NonNull ClickType clickType) {
+    public boolean onClick(final @NonNull Player player, final int entityId, final @NonNull ClickType clickType) {
         final UUID uid = player.getUniqueId();
 
         // Check if the player is on cooldown.

diff --git a/src/main/java/eu/decentsoftware/holograms/api/holograms/HologramPage.java b/src/main/java/eu/decentsoftware/holograms/api/holograms/HologramPage.java
@@ -282,8 +282,15 @@ public int getClickableEntityId(int index) {
         return clickableEntityIds.get(index);
     }
 
-    public boolean hasEntity(int eid) {
-        return clickableEntityIds.contains(eid) || lines.stream().anyMatch(line -> line.getEntityIds()[0] == eid || line.getEntityIds()[1] == eid);
+    public boolean hasEntity(final int eid) {
+        return clickableEntityIds.contains(eid) || lines.stream().anyMatch(line -> {
+            for (int entityId : line.getEntityIds()) {
+                if (entityId == eid) {
+                    return true;
+                }
+            }
+            return false;
+        });
     }
 
     public void addAction(@NonNull ClickType clickType, @NonNull Action action) {