Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-10-03 18:07:26 +02:00
Code Issues Projects Releases Wiki Activity

Respect cancelled on EntityDamageEvent

Browse Source
This commit is contained in:
fullwall 2016-01-19 10:03:30 +08:00
parent 23294552eb
commit 847652046e
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -184,7 +184,7 @@ public class EventListen implements Listener {
}
}
@EventHandler
@EventHandler(ignoreCancelled = true)
public void onEntityDamage(EntityDamageEvent event) {
NPC npc = npcRegistry.getNPC(event.getEntity());
if (npc == null) {
@ -207,7 +207,6 @@ public class EventListen implements Listener {
return;
Player damager = (Player) damageEvent.getDamager();
// Call left-click event
NPCLeftClickEvent leftClickEvent = new NPCLeftClickEvent(npc, damager);
Bukkit.getPluginManager().callEvent(leftClickEvent);
} else if (event instanceof EntityDamageByBlockEvent) {