Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-11-28 05:35:45 +01:00
Code Issues Projects Releases Wiki Activity

Don't use ignoreCancelled on entitytarget/damage

Browse Source
This commit is contained in:
fullwall 2012-08-31 22:19:04 +08:00
parent 54a2527534
commit 1b3d81f019
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,7 +79,7 @@ public class EventListen implements Listener {
/* /*
* Entity events * Entity events
*/ */
@EventHandler(ignoreCancelled = true) @EventHandler
public void onEntityDamage(EntityDamageEvent event) { public void onEntityDamage(EntityDamageEvent event) {
if (!npcRegistry.isNPC(event.getEntity())) if (!npcRegistry.isNPC(event.getEntity()))
return; return;
@ -113,7 +113,7 @@ public class EventListen implements Listener {
npc.despawn(); npc.despawn();
} }
@EventHandler(ignoreCancelled = true) @EventHandler
public void onEntityTarget(EntityTargetEvent event) { public void onEntityTarget(EntityTargetEvent event) {
if (!npcRegistry.isNPC(event.getEntity()) || !(event.getTarget() instanceof Player)) if (!npcRegistry.isNPC(event.getEntity()) || !(event.getTarget() instanceof Player))
return; return;