Rx3/Factions
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle entity attacks without attackers. Fixes #332.

Browse Source
This commit is contained in:
Olof Larsson 2013-08-07 07:52:26 +02:00
parent 62dc8c6046
commit 32e060c2c3
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/massivecraft/factions/listeners/FactionsListenerMain.java
View File

@ -282,7 +282,9 @@ public class FactionsListenerMain implements Listener
{ {
eattacker = ((Projectile)eattacker).getShooter(); eattacker = ((Projectile)eattacker).getShooter();
} }
if (eattacker.equals(edefender)) return true; // (we check null here since there may not be an attacker)
// (lack of attacker situations can be caused by other bukkit plugins)
if (eattacker != null && eattacker.equals(edefender)) return true;
// ... gather defender PS and faction information ... // ... gather defender PS and faction information ...
PS defenderPs = PS.valueOf(defender); PS defenderPs = PS.valueOf(defender);
@ -291,6 +293,12 @@ public class FactionsListenerMain implements Listener
// ... PVP flag may cause a damage block ... // ... PVP flag may cause a damage block ...
if (defenderPsFaction.getFlag(FFlag.PVP) == false) if (defenderPsFaction.getFlag(FFlag.PVP) == false)
{ {
if (eattacker == null)
{
// No attacker?
// Let's behave as if it were a player
return false;
}
if (eattacker instanceof Player) if (eattacker instanceof Player)
{ {
if (notify) if (notify)