Allow PVP vs. Factionless in attacker's faction territory
This commit is contained in:
		@@ -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;
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user