forked from Upstream/CitizensCMD
Ignore all cancelled events
This commit is contained in:
parent
cf969e2261
commit
2cfd0beb6f
@ -67,7 +67,7 @@ public class NPCClickListener implements Listener {
|
||||
Bukkit.getMessenger().registerOutgoingPluginChannel(plugin, "BungeeCord");
|
||||
}
|
||||
|
||||
@EventHandler(priority = EventPriority.HIGHEST)
|
||||
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
|
||||
public void onRightClick(NPCRightClickEvent event) {
|
||||
final NPC npc = event.getNPC();
|
||||
final Player player = event.getClicker();
|
||||
@ -150,7 +150,7 @@ public class NPCClickListener implements Listener {
|
||||
|
||||
}
|
||||
|
||||
@EventHandler(priority = EventPriority.HIGHEST)
|
||||
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
|
||||
public void onLeftClick(NPCLeftClickEvent event) {
|
||||
final NPC npc = event.getNPC();
|
||||
final Player player = event.getClicker();
|
||||
@ -228,7 +228,7 @@ public class NPCClickListener implements Listener {
|
||||
}
|
||||
}
|
||||
|
||||
@EventHandler(priority = EventPriority.HIGHEST)
|
||||
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
|
||||
public void onRemoveNPC(NPCRemoveEvent event) {
|
||||
if (!plugin.getDataHandler().hasNPCData(event.getNPC().getId())) {
|
||||
return;
|
||||
|
@ -15,7 +15,7 @@ public class NPCListener implements Listener {
|
||||
this.plugin = plugin;
|
||||
}
|
||||
|
||||
@EventHandler(priority = EventPriority.HIGHEST)
|
||||
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
|
||||
public void on(NPCCloneEvent event) {
|
||||
if (!plugin.getDataHandler().hasNPCData(event.getNPC().getId())) {
|
||||
return;
|
||||
|
@ -42,7 +42,7 @@ public class UpdateEvent implements Listener {
|
||||
this.plugin = plugin;
|
||||
}
|
||||
|
||||
@EventHandler(priority = EventPriority.NORMAL)
|
||||
@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
|
||||
public void onPlayerJoin(PlayerJoinEvent event) {
|
||||
if (!plugin.isUpdateStatus() || !event.getPlayer().hasPermission("citizenscmd.update")) {
|
||||
return;
|
||||
|
Loading…
Reference in New Issue
Block a user