From 1a109fa589a31cf0e674e21a91c66b8ae4622132 Mon Sep 17 00:00:00 2001 From: Brettflan Date: Tue, 7 Feb 2012 15:04:19 -0600 Subject: [PATCH] "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 --- .../factions/listeners/FactionsEntityListener.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/com/massivecraft/factions/listeners/FactionsEntityListener.java b/src/com/massivecraft/factions/listeners/FactionsEntityListener.java index b60eaa51..4a37927c 100644 --- a/src/com/massivecraft/factions/listeners/FactionsEntityListener.java +++ b/src/com/massivecraft/factions/listeners/FactionsEntityListener.java @@ -125,10 +125,7 @@ public class FactionsEntityListener implements Listener return true; 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 @@ -173,7 +170,10 @@ public class FactionsEntityListener implements Listener attacker.msg("PVP is disabled in %s.", locFaction.describeTo(attacker)); return false; } - + + if (Conf.worldsIgnorePvP.contains(defenderLoc.getWorld().getName())) + return true; + Faction defendFaction = defender.getFaction(); Faction attackFaction = attacker.getFaction();