Disable chunk ownership messages in the Wilderness. Fixes #520

This commit is contained in:
cnr 2015-09-01 13:44:01 -04:00
parent 9de87fc2a2
commit 6181f08da3

View File

@ -178,7 +178,7 @@ public class FactionsPlayerListener implements Listener {
if (Conf.ownedAreasEnabled && Conf.ownedMessageOnBorder && myFaction == factionTo && !ownersTo.isEmpty()) { if (Conf.ownedAreasEnabled && Conf.ownedMessageOnBorder && myFaction == factionTo && !ownersTo.isEmpty()) {
me.sendMessage(TL.GENERIC_OWNERS.format(ownersTo)); me.sendMessage(TL.GENERIC_OWNERS.format(ownersTo));
} }
} else if (Conf.ownedAreasEnabled && Conf.ownedMessageInsideTerritory && factionFrom == factionTo && myFaction == factionTo) { } else if (Conf.ownedAreasEnabled && Conf.ownedMessageInsideTerritory && myFaction == factionTo && !myFaction.isNone()) {
String ownersFrom = myFaction.getOwnerListString(from); String ownersFrom = myFaction.getOwnerListString(from);
if (Conf.ownedMessageByChunk || !ownersFrom.equals(ownersTo)) { if (Conf.ownedMessageByChunk || !ownersFrom.equals(ownersTo)) {
if (!ownersTo.isEmpty()) { if (!ownersTo.isEmpty()) {