Merge branch 'master' of github.com:MassiveCraft/Factions
This commit is contained in:
commit
72bf1492c3
@ -28,7 +28,7 @@ You may also read the documentation ingame as the plugin ships with an ingame he
|
||||
|
||||
* `/f help 1`
|
||||
* `/f help 2`
|
||||
* `/f help 1`
|
||||
* `/f help 3`
|
||||
|
||||
Note that you may optionally skip the slash and just write
|
||||
|
||||
|
@ -75,6 +75,8 @@ public class Conf {
|
||||
|
||||
public static boolean disablePVPBetweenNeutralFactions = false;
|
||||
public static boolean disablePVPForFactionlessPlayers = false;
|
||||
public static boolean enablePVPAgainstFactionlessInAttackersLand = false;
|
||||
|
||||
public static int noPVPDamageToOthersForXSecondsAfterLogin = 3;
|
||||
|
||||
public static boolean peacefulTerritoryDisablePVP = true;
|
||||
|
@ -206,6 +206,10 @@ public class FactionsEntityListener extends EntityListener {
|
||||
attacker.sendMessage("You can't hurt other players until you join a faction.");
|
||||
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) {
|
||||
attacker.sendMessage("You can't hurt players who are not currently in a faction.");
|
||||
return false;
|
||||
|
Loading…
Reference in New Issue
Block a user