Upstream/Factions
1
0
Fork 0
mirror of https://github.com/MassiveCraft/Factions.git synced 2024-07-01 00:45:03 +02:00
Code Issues Projects Releases Wiki Activity

New conf.json option "claimsCanBeUnconnectedIfOwnedByOtherFaction" (default true) which, will allow claims to bypass the "claimsMustBeConnected" option if the attempted claim is vulnerable land controlled by another faction

Browse Source
This commit is contained in:
Brettflan 2011-07-20 14:45:18 -05:00
parent 5686c4db9d
commit 16053d0008
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/massivecraft/factions/Conf.java
View File

@ -73,6 +73,7 @@ public class Conf {
public static int noPVPDamageToOthersForXSecondsAfterLogin = 3;
public static boolean claimsMustBeConnected = false;
public static boolean claimsCanBeUnconnectedIfOwnedByOtherFaction = true;
public static double considerFactionsReallyOfflineAfterXMinutes = 0;

12
src/com/massivecraft/factions/FPlayer.java
View File

@ -503,8 +503,16 @@ public class FPlayer {
return false;
}
if (Conf.claimsMustBeConnected && myFaction.getLandRoundedInWorld(flocation.getWorldName()) > 0 && !Board.isConnectedLocation(flocation, myFaction)) {
sendMessage("You can only claim additional land which is connected to your first claim!");
if (
Conf.claimsMustBeConnected
&& myFaction.getLandRoundedInWorld(flocation.getWorldName()) > 0
&& !Board.isConnectedLocation(flocation, myFaction)
&& (!Conf.claimsCanBeUnconnectedIfOwnedByOtherFaction || !otherFaction.isNormal())
) {
if (Conf.claimsCanBeUnconnectedIfOwnedByOtherFaction)
sendMessage("You can only claim additional land which is connected to your first claim or controlled by another faction!");
else
sendMessage("You can only claim additional land which is connected to your first claim!");
return false;
}