From b2ad4b43e407c4fc7c24b3dd8b38f13754ac3cb6 Mon Sep 17 00:00:00 2001 From: sp1ky Date: Fri, 12 Aug 2011 16:08:11 +0100 Subject: [PATCH 1/2] Allow PVP vs. Factionless in attacker's faction territory --- src/com/massivecraft/factions/Conf.java | 2 ++ .../factions/listeners/FactionsEntityListener.java | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/src/com/massivecraft/factions/Conf.java b/src/com/massivecraft/factions/Conf.java index 3e686efe..47fd27ab 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; From 08f314fef05f605e6f9c101eef92a0a1616c4235 Mon Sep 17 00:00:00 2001 From: greatman Date: Sun, 21 Aug 2011 03:59:31 -0300 Subject: [PATCH 2/2] Small typo in Readme (/f help 1 was there 2 times) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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