Upstream/Factions
1
0
Fork 0
mirror of https://github.com/MassiveCraft/Factions.git synced 2024-11-24 03:05:52 +01:00
Code Issues Projects Releases Wiki Activity

Fix for players being able to hurt members of their own faction while in their own land if the "enablePVPAgainstFactionlessInAttackersLand" option is enabled

Browse Source
This commit is contained in:
Brettflan 2011-09-16 01:45:23 -05:00
parent 443e083f23
commit 538b387f2f
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -204,21 +204,23 @@ public class FactionsEntityListener extends EntityListener {
return true; return true;
} }
if (!attacker.hasFaction() && Conf.disablePVPForFactionlessPlayers) { Faction defendFaction = defender.getFaction();
Faction attackFaction = attacker.getFaction();
if (attackFaction.isNone() && Conf.disablePVPForFactionlessPlayers) {
attacker.sendMessage("You can't hurt other players until you join a faction."); attacker.sendMessage("You can't hurt other players until you join a faction.");
return false; return false;
} }
else if (defLocFaction == attacker.getFaction() && Conf.enablePVPAgainstFactionlessInAttackersLand) { else if (defendFaction.isNone()) {
// Allow PVP vs. Factionless in attacker's faction territory if (defLocFaction == attackFaction && Conf.enablePVPAgainstFactionlessInAttackersLand) {
return true; // Allow PVP vs. Factionless in attacker's faction territory
return true;
}
else if (Conf.disablePVPForFactionlessPlayers) {
attacker.sendMessage("You can't hurt players who are not currently in a faction.");
return false;
}
} }
else if (!defender.hasFaction() && Conf.disablePVPForFactionlessPlayers) {
attacker.sendMessage("You can't hurt players who are not currently in a faction.");
return false;
}
Faction defendFaction = defender.getFaction();
Faction attackFaction = attacker.getFaction();
if (defendFaction.isPeaceful()) { if (defendFaction.isPeaceful()) {
attacker.sendMessage("You can't hurt players who are in a peaceful faction."); attacker.sendMessage("You can't hurt players who are in a peaceful faction.");