Upstream/Jobs
1
0
Fork 0
mirror of https://github.com/Zrips/Jobs.git synced 2024-11-29 14:05:25 +01:00
Code Issues Projects Releases Wiki Activity

Include projectile into entity death event check

Browse Source
This commit is contained in:
Zrips 2016-06-29 17:57:17 +03:00
parent 34c9c60145
commit c7c1b6113a
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.classpath
View File

@ -5,7 +5,7 @@
<classpathentry kind="lib" path="C:/Users/Arte/Desktop/Jobs/lib/Vault1.5.3.jar"/> <classpathentry kind="lib" path="C:/Users/Arte/Desktop/Jobs/lib/Vault1.5.3.jar"/>
<classpathentry kind="lib" path="C:/Users/Arte/Desktop/Jobs/lib/mcMMO#127.jar"/> <classpathentry kind="lib" path="C:/Users/Arte/Desktop/Jobs/lib/mcMMO#127.jar"/>
<classpathentry kind="lib" path="C:/Users/Arte/Desktop/Jobs/lib/CoreProtect_2.12.0.jar"/> <classpathentry kind="lib" path="C:/Users/Arte/Desktop/Jobs/lib/CoreProtect_2.12.0.jar"/>
<classpathentry kind="lib" path="C:/Users/Arte/Desktop/Jobs/lib/spigot-1.10.jar"/> <classpathentry kind="lib" path="C:/Users/Arte/Desktop/Jobs/lib/spigot-1.10.2.jar"/>
<classpathentry kind="lib" path="C:/Users/Arte/Desktop/Jobs/lib/MythicMobs-2.1.8.jar"/> <classpathentry kind="lib" path="C:/Users/Arte/Desktop/Jobs/lib/MythicMobs-2.1.8.jar"/>
<classpathentry kind="output" path=""/> <classpathentry kind="output" path=""/>
</classpath> </classpath>

2
com/gamingmesh/jobs/config/LanguageManager.java
View File

@ -57,6 +57,8 @@ public class LanguageManager {
LocaleReader c = new LocaleReader(config, writer); LocaleReader c = new LocaleReader(config, writer);
c.getC().options().copyDefaults(true); c.getC().options().copyDefaults(true);
Jobs.getGCManager().commandArgs.clear(); Jobs.getGCManager().commandArgs.clear();
c.get("economy.error.nomoney", "&cSorry, no money left in national bank!"); c.get("economy.error.nomoney", "&cSorry, no money left in national bank!");

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

@ -35,6 +35,7 @@ import org.bukkit.entity.HumanEntity;
import org.bukkit.entity.Item; import org.bukkit.entity.Item;
import org.bukkit.entity.LivingEntity; import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.entity.Projectile;
import org.bukkit.entity.Sheep; import org.bukkit.entity.Sheep;
import org.bukkit.entity.Tameable; import org.bukkit.entity.Tameable;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
@ -839,10 +840,10 @@ public class JobsPaymentListener implements Listener {
Double PetPayMultiplier = 0.0; Double PetPayMultiplier = 0.0;
// Checking if killer is player // Checking if killer is player
if (e.getDamager() instanceof Player) if (e.getDamager() instanceof Player) {
pDamager = (Player) e.getDamager(); pDamager = (Player) e.getDamager();
// Checking if killer is tamed animal // Checking if killer is tamed animal
else if (e.getDamager() instanceof Tameable) { } else if (e.getDamager() instanceof Tameable) {
Tameable t = (Tameable) (e).getDamager(); Tameable t = (Tameable) (e).getDamager();
if (t.isTamed() && t.getOwner() instanceof Player) { if (t.isTamed() && t.getOwner() instanceof Player) {
pDamager = (Player) t.getOwner(); pDamager = (Player) t.getOwner();
@ -851,6 +852,10 @@ public class JobsPaymentListener implements Listener {
else else
PetPayMultiplier = Jobs.getGCManager().PetPay * 100 - 100; 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 } else
return; return;

2
plugin.yml
View File

@ -1,7 +1,7 @@
name: Jobs name: Jobs
description: Jobs Plugin for the BukkitAPI description: Jobs Plugin for the BukkitAPI
main: com.gamingmesh.jobs.JobsPlugin main: com.gamingmesh.jobs.JobsPlugin
version: 3.5.4 version: 3.5.5
author: phrstbrn author: phrstbrn
depend: [Vault] depend: [Vault]
softdepend: [CoreProtect, MythicMobs, McMMO] softdepend: [CoreProtect, MythicMobs, McMMO]