SpigotMC/Saber-Factions
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add options to block commands in wilderness and ally territory. Adds #514

Browse Source
This commit is contained in:
drtshock 2015-09-08 11:39:21 -05:00
parent 1fa2abcc88
commit 088c6e11b1
5 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/massivecraft/factions/Conf.java
View File

@ -148,7 +148,9 @@ public class Conf {
// commands which will be prevented when in claimed territory of another faction // commands which will be prevented when in claimed territory of another faction
public static Set<String> territoryNeutralDenyCommands = new LinkedHashSet<String>(); public static Set<String> territoryNeutralDenyCommands = new LinkedHashSet<String>();
public static Set<String> territoryEnemyDenyCommands = new LinkedHashSet<String>(); public static Set<String> territoryEnemyDenyCommands = new LinkedHashSet<String>();
public static Set<String> territoryAllyDenyCommands = new LinkedHashSet<String>();
public static Set<String> warzoneDenyCommands = new LinkedHashSet<String>(); public static Set<String> warzoneDenyCommands = new LinkedHashSet<String>();
public static Set<String> wildernessDenyCommands = new LinkedHashSet<String>();
public static boolean territoryDenyBuild = true; public static boolean territoryDenyBuild = true;
public static boolean territoryDenyBuildWhenOffline = true; public static boolean territoryDenyBuildWhenOffline = true;

3
src/main/java/com/massivecraft/factions/Faction.java
View File

@ -107,8 +107,11 @@ public interface Faction extends EconomyParticipator {
public boolean isNormal(); public boolean isNormal();
@Deprecated
public boolean isNone(); public boolean isNone();
public boolean isWilderness();
public boolean isSafeZone(); public boolean isSafeZone();
public boolean isWarZone(); public boolean isWarZone();

13
src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java
View File

@ -498,12 +498,15 @@ public class FactionsPlayerListener implements Listener {
return true; return true;
} }
if (!me.isInOthersTerritory()) { Faction at = Board.getInstance().getFactionAt(new FLocation(player.getLocation()));
return false; if (at.isWilderness() && !Conf.wildernessDenyCommands.isEmpty() && !me.isAdminBypassing() && isCommandInList(fullCmd, shortCmd, Conf.wildernessDenyCommands.iterator())) {
me.msg(TL.PLAYER_COMMAND_WILDERNESS, fullCmd);
return true;
} }
Relation rel = me.getRelationToLocation(); Relation rel = at.getRelationTo(me);
if (rel.isAtLeast(Relation.ALLY)) { if (rel.isAlly() && !Conf.territoryAllyDenyCommands.isEmpty() && !me.isAdminBypassing() && isCommandInList(fullCmd, shortCmd, Conf.territoryAllyDenyCommands.iterator())) {
me.msg(TL.PLAYER_COMMAND_ALLY, fullCmd);
return false; return false;
} }
@ -517,7 +520,7 @@ public class FactionsPlayerListener implements Listener {
return true; return true;
} }
if (Board.getInstance().getFactionAt(new FLocation(me)).isWarZone() && !Conf.warzoneDenyCommands.isEmpty() && !me.isAdminBypassing() && isCommandInList(fullCmd, shortCmd, Conf.warzoneDenyCommands.iterator())) { if (at.isWarZone() && !Conf.warzoneDenyCommands.isEmpty() && !me.isAdminBypassing() && isCommandInList(fullCmd, shortCmd, Conf.warzoneDenyCommands.iterator())) {
me.msg(TL.PLAYER_COMMAND_WARZONE, fullCmd); me.msg(TL.PLAYER_COMMAND_WARZONE, fullCmd);
return true; return true;
} }

4
src/main/java/com/massivecraft/factions/zcore/persist/MemoryFaction.java
View File

@ -359,6 +359,10 @@ public abstract class MemoryFaction implements Faction, EconomyParticipator {
return this.getId().equals("0"); return this.getId().equals("0");
} }
public boolean isWilderness() {
return this.getId().equals("0");
}
public boolean isSafeZone() { public boolean isSafeZone() {
return this.getId().equals("-1"); return this.getId().equals("-1");
} }

2
src/main/java/com/massivecraft/factions/zcore/util/TL.java
View File

@ -659,6 +659,8 @@ public enum TL {
PLAYER_COMMAND_NEUTRAL("<b>You can't use the command '%s' in neutral territory."), PLAYER_COMMAND_NEUTRAL("<b>You can't use the command '%s' in neutral territory."),
PLAYER_COMMAND_ENEMY("<b>You can't use the command '%s' in enemy territory."), PLAYER_COMMAND_ENEMY("<b>You can't use the command '%s' in enemy territory."),
PLAYER_COMMAND_PERMANENT("<b>You can't use the command '%s' because you are in a permanent faction."), PLAYER_COMMAND_PERMANENT("<b>You can't use the command '%s' because you are in a permanent faction."),
PLAYER_COMMAND_ALLY("<b>You can't use the command '%s' in ally territory."),
PLAYER_COMMAND_WILDERNESS("<b>You can't use the command '%s' in the wilderness."),
PLAYER_POWER_NOLOSS_PEACEFUL("<i>You didn't lose any power since you are in a peaceful faction."), PLAYER_POWER_NOLOSS_PEACEFUL("<i>You didn't lose any power since you are in a peaceful faction."),
PLAYER_POWER_NOLOSS_WORLD("<i>You didn't lose any power due to the world you died in."), PLAYER_POWER_NOLOSS_WORLD("<i>You didn't lose any power due to the world you died in."),