Upstream/Jobs
1
0
Fork 0
mirror of https://github.com/Zrips/Jobs.git synced 2024-12-28 12:00:23 +01:00
Code Issues Projects Releases Wiki Activity

Lets use EntityDamageByEntityEvent to get killer

Browse Source
This commit is contained in:
Zrips 2024-10-16 15:33:20 +03:00
parent 5d823a1d81
commit 1d3b15ab87
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/gamingmesh/jobs/listeners/JobsPaymentListener.java
View File

@ -1305,9 +1305,10 @@ public final class JobsPaymentListener implements Listener {
if (!(event.getEntity().getLastDamageCause() instanceof EntityDamageByEntityEvent)) { if (!(event.getEntity().getLastDamageCause() instanceof EntityDamageByEntityEvent)) {
killer = entityLastDamager.getIfPresent(event.getEntity().getUniqueId()); killer = entityLastDamager.getIfPresent(event.getEntity().getUniqueId());
} else if (event.getEntity().getLastDamageCause().getCause() == EntityDamageEvent.DamageCause.PROJECTILE) { } else if (event.getEntity().getLastDamageCause() instanceof EntityDamageByEntityEvent) {
if (event.getEntity().getLastDamageCause().getDamageSource() != null) EntityDamageByEntityEvent entityEvent = (EntityDamageByEntityEvent) event.getEntity().getLastDamageCause();
killer = event.getEntity().getLastDamageCause().getDamageSource().getCausingEntity(); if (entityEvent.getDamager() != null)
killer = entityEvent.getDamager();
} else { } else {
killer = ((EntityDamageByEntityEvent) event.getEntity().getLastDamageCause()).getDamager(); killer = ((EntityDamageByEntityEvent) event.getEntity().getLastDamageCause()).getDamager();
} }