diff --git a/README.md b/README.md index d5d902d0..d35ba159 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/src/com/massivecraft/factions/Conf.java b/src/com/massivecraft/factions/Conf.java index 17bf6b1f..23e54dd4 100644 --- a/src/com/massivecraft/factions/Conf.java +++ b/src/com/massivecraft/factions/Conf.java @@ -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; diff --git a/src/com/massivecraft/factions/listeners/FactionsEntityListener.java b/src/com/massivecraft/factions/listeners/FactionsEntityListener.java index 8ee6bd51..190276a8 100644 --- a/src/com/massivecraft/factions/listeners/FactionsEntityListener.java +++ b/src/com/massivecraft/factions/listeners/FactionsEntityListener.java @@ -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;