Merge pull request #30 from sp1ky/master
Allow Factions to defend their territory from Factionless PVP protected players
This commit is contained in:
commit
ba1d3cee42
@ -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;
|
||||||
|
@ -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;
|
||||||
|
Loading…
Reference in New Issue
Block a user