Upstream/Jobs
1
0
Fork 0
mirror of https://github.com/Zrips/Jobs.git synced 2025-01-03 23:08:07 +01:00
Code Issues Projects Releases Wiki Activity

get entity from damage event, not from death

Browse Source
This commit is contained in:
Zrips 2016-06-27 14:59:04 +03:00
parent b0a699433a
commit e9c30dba79
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
com/gamingmesh/jobs/listeners/JobsPaymentListener.java
View File

@ -793,16 +793,21 @@ public class JobsPaymentListener implements Listener {
//disabling plugin in world //disabling plugin in world
if (event.getEntity() != null && !Jobs.getGCManager().canPerformActionInWorld(event.getEntity().getWorld())) if (event.getEntity() != null && !Jobs.getGCManager().canPerformActionInWorld(event.getEntity().getWorld()))
return; return;
// Entity that died must be living
LivingEntity lVictim = event.getEntity();
if (!(event.getEntity().getLastDamageCause() instanceof EntityDamageByEntityEvent)) if (!(event.getEntity().getLastDamageCause() instanceof EntityDamageByEntityEvent))
return; return;
EntityDamageByEntityEvent e = (EntityDamageByEntityEvent) event.getEntity().getLastDamageCause(); EntityDamageByEntityEvent e = (EntityDamageByEntityEvent) event.getEntity().getLastDamageCause();
// Entity that died must be living
if (!(e.getEntity() instanceof LivingEntity))
return;
LivingEntity lVictim = (LivingEntity) e.getEntity();
//extra check for Citizens 2 sentry kills //extra check for Citizens 2 sentry kills
if (e.getDamager() instanceof Player) if (e.getDamager() instanceof Player)
if (lVictim.getKiller().hasMetadata("NPC")) if (e.getDamager().hasMetadata("NPC"))
return; return;
if (Jobs.getGCManager().MythicMobsEnabled && Jobs.getMythicManager().MMAPI != null) { if (Jobs.getGCManager().MythicMobsEnabled && Jobs.getMythicManager().MMAPI != null) {