Rx3/Factions
1
0
Fork 0
Code Issues Pull Requests Packages 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:19 -06:00
parent 0a6991a997
commit 1a109fa589
1 changed files with 5 additions and 5 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

@ -125,10 +125,7 @@ public class FactionsEntityListener implements Listener
return true; return true;
Location defenderLoc = defender.getPlayer().getLocation(); Location defenderLoc = defender.getPlayer().getLocation();
if (Conf.worldsIgnorePvP.contains(defenderLoc.getWorld().getName()))
return true;
Faction defLocFaction = Board.getFactionAt(new FLocation(defenderLoc)); Faction defLocFaction = Board.getFactionAt(new FLocation(defenderLoc));
// 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
@ -173,7 +170,10 @@ public class FactionsEntityListener implements Listener
attacker.msg("<i>PVP is disabled in %s.", locFaction.describeTo(attacker)); attacker.msg("<i>PVP is disabled in %s.", locFaction.describeTo(attacker));
return false; return false;
} }
if (Conf.worldsIgnorePvP.contains(defenderLoc.getWorld().getName()))
return true;
Faction defendFaction = defender.getFaction(); Faction defendFaction = defender.getFaction();
Faction attackFaction = attacker.getFaction(); Faction attackFaction = attacker.getFaction();