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

Use new constructor

Browse Source
This commit is contained in:
fullwall 2012-05-12 15:18:04 +08:00
parent f8cec0710f
commit f3f8fceb6c
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

@ -90,9 +90,8 @@ public class EventListen implements Listener {
EntityDamageByEntityEvent e = (EntityDamageByEntityEvent) event; EntityDamageByEntityEvent e = (EntityDamageByEntityEvent) event;
NPC npc = npcManager.getNPC(event.getEntity()); NPC npc = npcManager.getNPC(event.getEntity());
NPCDamageEvent damageEvent = new NPCDamageEvent(npc, e.getDamager()); NPCDamageEvent damageEvent = new NPCDamageEvent(npc, e);
Bukkit.getPluginManager().callEvent(event); Bukkit.getPluginManager().callEvent(event);
event.setCancelled(damageEvent.isCancelled());
if (!damageEvent.isCancelled() || !(e.getDamager() instanceof Player)) if (!damageEvent.isCancelled() || !(e.getDamager() instanceof Player))
return; return;