From cd436cb6da7c6bd339ace635e8b85ad2f419947d Mon Sep 17 00:00:00 2001
From: fullwall <fullwall25@gmail.com>
Date: Tue, 2 Feb 2021 22:33:06 +0800
Subject: [PATCH] "/npc select" should respect clickredirects

---
 main/src/main/java/net/citizensnpcs/commands/NPCCommands.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/main/src/main/java/net/citizensnpcs/commands/NPCCommands.java b/main/src/main/java/net/citizensnpcs/commands/NPCCommands.java
index 25ad2a94c..6b6562e6d 100644
--- a/main/src/main/java/net/citizensnpcs/commands/NPCCommands.java
+++ b/main/src/main/java/net/citizensnpcs/commands/NPCCommands.java
@@ -86,6 +86,7 @@ import net.citizensnpcs.npc.Template;
 import net.citizensnpcs.trait.Age;
 import net.citizensnpcs.trait.Anchors;
 import net.citizensnpcs.trait.ArmorStandTrait;
+import net.citizensnpcs.trait.ClickRedirectTrait;
 import net.citizensnpcs.trait.CommandTrait;
 import net.citizensnpcs.trait.CommandTrait.ExecutionMode;
 import net.citizensnpcs.trait.CommandTrait.ItemRequirementGUI;
@@ -1775,6 +1776,9 @@ public class NPCCommands {
                 NPC test = registry.getNPC(possibleNPC);
                 if (test == null)
                     continue;
+                if (test.hasTrait(ClickRedirectTrait.class)) {
+                    test = test.getTraitNullable(ClickRedirectTrait.class).getRedirectNPC();
+                }
                 callback.run(test);
                 break;
             }