Rx3/Factions
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:MassiveCraft/Factions

Browse Source
This commit is contained in:
Brettflan 2011-08-22 23:49:08 -05:00
commit 72bf1492c3
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -28,7 +28,7 @@ You may also read the documentation ingame as the plugin ships with an ingame he
* `/f help 1` * `/f help 1`
* `/f help 2` * `/f help 2`
* `/f help 1` * `/f help 3`
Note that you may optionally skip the slash and just write Note that you may optionally skip the slash and just write

2
src/com/massivecraft/factions/Conf.java
View File

@ -75,6 +75,8 @@ public class Conf {
public static boolean disablePVPBetweenNeutralFactions = false; public static boolean disablePVPBetweenNeutralFactions = false;
public static boolean disablePVPForFactionlessPlayers = false; public static boolean disablePVPForFactionlessPlayers = false;
public static boolean enablePVPAgainstFactionlessInAttackersLand = false;
public static int noPVPDamageToOthersForXSecondsAfterLogin = 3; public static int noPVPDamageToOthersForXSecondsAfterLogin = 3;
public static boolean peacefulTerritoryDisablePVP = true; public static boolean peacefulTerritoryDisablePVP = true;

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

@ -206,6 +206,10 @@ public class FactionsEntityListener extends EntityListener {
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) {
// Allow PVP vs. Factionless in attacker's faction territory
return true;
}
else if (!defender.hasFaction() && Conf.disablePVPForFactionlessPlayers) { else if (!defender.hasFaction() && Conf.disablePVPForFactionlessPlayers) {
attacker.sendMessage("You can't hurt players who are not currently in a faction."); attacker.sendMessage("You can't hurt players who are not currently in a faction.");
return false; return false;