SpigotMC/Saber-Factions
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Check projectile shooter's type before casting. Fixes #158

Browse Source
This commit is contained in:
eueln 2014-12-07 13:20:48 -06:00
parent 5e676bdd50
commit e9b0a4d67c
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/massivecraft/factions/listeners/FactionsEntityListener.java
View File

@ -260,7 +260,13 @@ public class FactionsEntityListener implements Listener {
// for damage caused by projectiles, getDamager() returns the projectile... what we need to know is the source // for damage caused by projectiles, getDamager() returns the projectile... what we need to know is the source
if (damager instanceof Projectile) { if (damager instanceof Projectile) {
damager = (Entity) ((Projectile) damager).getShooter(); Projectile projectile = (Projectile) damager;
if (!(projectile.getShooter() instanceof Entity)) {
return true;
}
damager = (Entity) projectile.getShooter();
} }
if (damager == damagee) // ender pearl usage and other self-inflicted damage if (damager == damagee) // ender pearl usage and other self-inflicted damage