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

Merge pull request #20 from ediTv2/1.6.x

Browse Source 
Fix for Issue #6 (Arrow Entity Damage)
This commit is contained in:
Trent 2014-06-17 02:01:13 -05:00
commit 8e1cd1f004
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -254,7 +254,6 @@ public class FactionsEntityListener implements Listener {
public boolean canDamagerHurtDamagee(EntityDamageByEntityEvent sub, boolean notify) { public boolean canDamagerHurtDamagee(EntityDamageByEntityEvent sub, boolean notify) {
Entity damager = sub.getDamager(); Entity damager = sub.getDamager();
Entity damagee = sub.getEntity(); Entity damagee = sub.getEntity();
ProjectileSource shooter = null;
double damage = sub.getDamage(); double damage = sub.getDamage();
if (!(damagee instanceof Player)) if (!(damagee instanceof Player))
@ -270,10 +269,10 @@ 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) {
shooter = ((Projectile) damager).getShooter(); damager = (Entity) ((Projectile) damager).getShooter();
} }
if (shooter != null && shooter == damagee) // ender pearl usage and other self-inflicted damage if (damager == damagee) // ender pearl usage and other self-inflicted damage
return true; return true;
// Players can not take attack damage in a SafeZone, or possibly peaceful territory // Players can not take attack damage in a SafeZone, or possibly peaceful territory