Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2025-02-17 04:41:31 +01:00
Code Issues Projects Releases Wiki Activity

"/npc select" should respect clickredirects

Browse Source
This commit is contained in:
fullwall 2021-02-02 22:33:06 +08:00
parent e03d65aeb4
commit cd436cb6da
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
main/src/main/java/net/citizensnpcs/commands/NPCCommands.java
View File

@ -86,6 +86,7 @@ import net.citizensnpcs.npc.Template;
import net.citizensnpcs.trait.Age; import net.citizensnpcs.trait.Age;
import net.citizensnpcs.trait.Anchors; import net.citizensnpcs.trait.Anchors;
import net.citizensnpcs.trait.ArmorStandTrait; import net.citizensnpcs.trait.ArmorStandTrait;
import net.citizensnpcs.trait.ClickRedirectTrait;
import net.citizensnpcs.trait.CommandTrait; import net.citizensnpcs.trait.CommandTrait;
import net.citizensnpcs.trait.CommandTrait.ExecutionMode; import net.citizensnpcs.trait.CommandTrait.ExecutionMode;
import net.citizensnpcs.trait.CommandTrait.ItemRequirementGUI; import net.citizensnpcs.trait.CommandTrait.ItemRequirementGUI;
@ -1775,6 +1776,9 @@ public class NPCCommands {
NPC test = registry.getNPC(possibleNPC); NPC test = registry.getNPC(possibleNPC);
if (test == null) if (test == null)
continue; continue;
if (test.hasTrait(ClickRedirectTrait.class)) {
test = test.getTraitNullable(ClickRedirectTrait.class).getRedirectNPC();
}
callback.run(test); callback.run(test);
break; break;
} }