Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-09-24 21:32:52 +02:00
Code Issues Projects Releases Wiki Activity

Use new method

Browse Source
This commit is contained in:
fullwall 2023-03-01 23:05:25 +08:00
parent ef9220b5fd
commit c22916bb70
5 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -452,9 +452,14 @@ public class EventListen implements Listener {
} }
if (npc.hasTrait(CommandTrait.class)) { if (npc.hasTrait(CommandTrait.class)) {
npc.getTraitNullable(CommandTrait.class).dispatch(player, CommandTrait.Hand.RIGHT); npc.getTraitNullable(CommandTrait.class).dispatch(player, CommandTrait.Hand.RIGHT);
rightClickEvent.setDelayedCancellation(true);
} }
if (npc.hasTrait(ShopTrait.class)) { if (npc.hasTrait(ShopTrait.class)) {
npc.getTraitNullable(ShopTrait.class).onRightClick(player); npc.getTraitNullable(ShopTrait.class).onRightClick(player);
rightClickEvent.setDelayedCancellation(true);
}
if (rightClickEvent.isDelayedCancellation()) {
event.setCancelled(true);
} }
} }

1
main/src/main/java/net/citizensnpcs/npc/NPCSelector.java
View File

@ -106,6 +106,7 @@ public class NPCSelector implements Listener, net.citizensnpcs.api.npc.NPCSelect
player.removeMetadata("selected", plugin); player.removeMetadata("selected", plugin);
select(player, npc); select(player, npc);
Messaging.sendWithNPC(player, Setting.SELECTION_MESSAGE.asString(), npc); Messaging.sendWithNPC(player, Setting.SELECTION_MESSAGE.asString(), npc);
event.setDelayedCancellation(true);
} }
} }
} }

1
main/src/main/java/net/citizensnpcs/trait/Controllable.java
View File

@ -188,6 +188,7 @@ public class Controllable extends Trait implements Toggleable, CommandConfigurab
if (!enabled || !npc.isSpawned() || !event.getNPC().equals(npc)) if (!enabled || !npc.isSpawned() || !event.getNPC().equals(npc))
return; return;
controller.rightClickEntity(event); controller.rightClickEntity(event);
event.setDelayedCancellation(true);
} }
@Override @Override

1
main/src/main/java/net/citizensnpcs/trait/PausePathfindingTrait.java
View File

@ -28,6 +28,7 @@ public class PausePathfindingTrait extends Trait {
if (!rightclick || event.getNPC() != npc) if (!rightclick || event.getNPC() != npc)
return; return;
pause(); pause();
event.setDelayedCancellation(true);
} }
private void pause() { private void pause() {

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

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