ClickRedirectTrait is respected for playerfilter

CitizensDev · Jun 20, 2023 · f3b7ba0 · f3b7ba0
1 parent 6d5f881
commit f3b7ba0
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/main/src/main/java/net/citizensnpcs/EventListen.java b/main/src/main/java/net/citizensnpcs/EventListen.java
@@ -430,8 +430,12 @@ public void onNPCRemove(NPCRemoveEvent event) {
 
     @EventHandler(ignoreCancelled = true)
     public void onNPCSeenByPlayer(NPCSeenByPlayerEvent event) {
-        if (event.getNPC().hasTrait(PlayerFilter.class)) {
-            event.setCancelled(event.getNPC().getOrAddTrait(PlayerFilter.class).onSeenByPlayer(event.getPlayer()));
+        NPC npc = event.getNPC();
+        if (npc.hasTrait(ClickRedirectTrait.class)) {
+            npc = npc.getOrAddTrait(ClickRedirectTrait.class).getRedirectNPC();
+        }
+        if (npc.hasTrait(PlayerFilter.class)) {
+            event.setCancelled(npc.getOrAddTrait(PlayerFilter.class).onSeenByPlayer(event.getPlayer()));
         }
     }