"worldsIgnorePvP" setting no longer ignores PvP damage in SafeZones and PvP damage done by players who just logged in, no matter the world it happens in

This commit is contained in:
Brettflan 2012-02-07 15:04:19 -06:00
parent 0a6991a997
commit 1a109fa589

View File

@ -126,9 +126,6 @@ public class FactionsEntityListener implements Listener
Location defenderLoc = defender.getPlayer().getLocation();
if (Conf.worldsIgnorePvP.contains(defenderLoc.getWorld().getName()))
return true;
Faction defLocFaction = Board.getFactionAt(new FLocation(defenderLoc));
// for damage caused by projectiles, getDamager() returns the projectile... what we need to know is the source
@ -174,6 +171,9 @@ public class FactionsEntityListener implements Listener
return false;
}
if (Conf.worldsIgnorePvP.contains(defenderLoc.getWorld().getName()))
return true;
Faction defendFaction = defender.getFaction();
Faction attackFaction = attacker.getFaction();