From 4dd71863c18912c3993c88e3f7ef9868aa39d672 Mon Sep 17 00:00:00 2001 From: ulumulu1510 Date: Fri, 26 Feb 2016 19:29:15 +0100 Subject: [PATCH] 1h - Disallow peacefull to fight wilderness. --- src/com/massivecraft/factions/engine/EngineMain.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/massivecraft/factions/engine/EngineMain.java b/src/com/massivecraft/factions/engine/EngineMain.java index 08a04f77..9e83c8fc 100644 --- a/src/com/massivecraft/factions/engine/EngineMain.java +++ b/src/com/massivecraft/factions/engine/EngineMain.java @@ -942,7 +942,7 @@ public class EngineMain extends Engine Rel relation = defendFaction.getRelationTo(attackFaction); // Check the relation - if (mdefender.hasFaction() && relation.isFriend() && defenderPsFaction.getFlag(MFlag.getFlagFriendlyire()) == false) + if (relation.isFriend() && defenderPsFaction.getFlag(MFlag.getFlagFriendlyire()) == false) { ret = falseUnlessDisallowedPvpEventCancelled(attacker, defender, event); if (!ret && notify) uattacker.msg("You can't hurt %s.", relation.getDescPlayerMany());