diff --git a/.classpath b/.classpath index a93cb5ff..a833b69c 100644 --- a/.classpath +++ b/.classpath @@ -5,7 +5,7 @@ - + diff --git a/com/gamingmesh/jobs/config/LanguageManager.java b/com/gamingmesh/jobs/config/LanguageManager.java index 2db3261e..d5c7475e 100644 --- a/com/gamingmesh/jobs/config/LanguageManager.java +++ b/com/gamingmesh/jobs/config/LanguageManager.java @@ -57,6 +57,8 @@ public class LanguageManager { LocaleReader c = new LocaleReader(config, writer); c.getC().options().copyDefaults(true); + + Jobs.getGCManager().commandArgs.clear(); c.get("economy.error.nomoney", "&cSorry, no money left in national bank!"); diff --git a/com/gamingmesh/jobs/listeners/JobsPaymentListener.java b/com/gamingmesh/jobs/listeners/JobsPaymentListener.java index 0bd547fe..ea44d6f5 100644 --- a/com/gamingmesh/jobs/listeners/JobsPaymentListener.java +++ b/com/gamingmesh/jobs/listeners/JobsPaymentListener.java @@ -35,6 +35,7 @@ import org.bukkit.entity.HumanEntity; import org.bukkit.entity.Item; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; +import org.bukkit.entity.Projectile; import org.bukkit.entity.Sheep; import org.bukkit.entity.Tameable; import org.bukkit.event.EventHandler; @@ -839,10 +840,10 @@ public class JobsPaymentListener implements Listener { Double PetPayMultiplier = 0.0; // Checking if killer is player - if (e.getDamager() instanceof Player) + if (e.getDamager() instanceof Player) { pDamager = (Player) e.getDamager(); - // Checking if killer is tamed animal - else if (e.getDamager() instanceof Tameable) { + // Checking if killer is tamed animal + } else if (e.getDamager() instanceof Tameable) { Tameable t = (Tameable) (e).getDamager(); if (t.isTamed() && t.getOwner() instanceof Player) { pDamager = (Player) t.getOwner(); @@ -851,6 +852,10 @@ public class JobsPaymentListener implements Listener { else PetPayMultiplier = Jobs.getGCManager().PetPay * 100 - 100; } + } else if (e.getDamager() instanceof Projectile) { + Projectile pr = (Projectile) e.getDamager(); + if (pr.getShooter() instanceof Player) + pDamager = (Player) pr.getShooter(); } else return; diff --git a/plugin.yml b/plugin.yml index 0c8d07be..bb03d52a 100644 --- a/plugin.yml +++ b/plugin.yml @@ -1,7 +1,7 @@ name: Jobs description: Jobs Plugin for the BukkitAPI main: com.gamingmesh.jobs.JobsPlugin -version: 3.5.4 +version: 3.5.5 author: phrstbrn depend: [Vault] softdepend: [CoreProtect, MythicMobs, McMMO]