ClickRedirectTrait is respected for playerfilter
This commit is contained in:
parent
6d5f881b91
commit
f3b7ba0e52
|
@ -430,8 +430,12 @@ public class EventListen implements Listener {
|
||||||
|
|
||||||
@EventHandler(ignoreCancelled = true)
|
@EventHandler(ignoreCancelled = true)
|
||||||
public void onNPCSeenByPlayer(NPCSeenByPlayerEvent event) {
|
public void onNPCSeenByPlayer(NPCSeenByPlayerEvent event) {
|
||||||
if (event.getNPC().hasTrait(PlayerFilter.class)) {
|
NPC npc = event.getNPC();
|
||||||
event.setCancelled(event.getNPC().getOrAddTrait(PlayerFilter.class).onSeenByPlayer(event.getPlayer()));
|
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()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue