Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-06-22 20:44:56 +02:00
Code Issues Projects Releases Wiki Activity

Cancel right click event if NPC has talked to someone

Browse Source
This commit is contained in:
fullwall 2020-04-20 21:44:50 +08:00
parent 0531fe859e
commit 06d8e92ff2
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
main/src/main/java/net/citizensnpcs/EventListen.java
View File

@ -458,6 +458,9 @@ public class EventListen implements Listener {
Player player = event.getPlayer();
NPCRightClickEvent rightClickEvent = new NPCRightClickEvent(npc, player);
Bukkit.getPluginManager().callEvent(rightClickEvent);
if (rightClickEvent.isCancelled()) {
event.setCancelled(true);
}
if (npc.hasTrait(CommandTrait.class)) {
npc.getTrait(CommandTrait.class).dispatch(player, CommandTrait.Hand.RIGHT);
}

1
main/src/main/java/net/citizensnpcs/trait/text/Text.java
View File

@ -140,6 +140,7 @@ public class Text extends Trait implements Runnable, Toggleable, Listener, Conve
String localPattern = itemInHandPattern.equals("default") ? Setting.TALK_ITEM.asString() : itemInHandPattern;
if (Util.matchesItemInHand(event.getClicker(), localPattern) && !shouldTalkClose()) {
sendText(event.getClicker());
event.setCancelled(true);
}
}