Upstream/Factions
1
0
Fork 0
mirror of https://github.com/MassiveCraft/Factions.git synced 2024-12-26 18:48:13 +01:00
Code Issues Projects Releases Wiki Activity

"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

Browse Source
This commit is contained in:
Brettflan 2012-02-07 15:04:20 -06:00
parent 225471e530
commit 3ed879ca18
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -235,10 +235,6 @@ 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
@ -281,7 +277,11 @@ public class FactionsEntityListener implements Listener
attacker.msg("<i>You can't hurt other players while you are in "+(locFaction.isSafeZone() ? "a SafeZone." : "peaceful territory."));
return false;
}
else if (locFaction.isWarZone() && Conf.warZoneFriendlyFire)
if (locFaction.isWarZone() && Conf.warZoneFriendlyFire)
return true;
if (Conf.worldsIgnorePvP.contains(defenderLoc.getWorld().getName()))
return true;
Faction defendFaction = defender.getFaction();