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

Fix interact TL issue. Resolves #374

Browse Source 
http://puu.sh/hLqXh/7aef61a7a0.png
This commit is contained in:
Nick Porillo 2015-05-13 01:04:53 -04:00
parent 514499aeea
commit 6d17855586
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -407,7 +407,7 @@ public class FactionsPlayerListener implements Listener {
// You may use any block unless it is another faction's territory... // You may use any block unless it is another faction's territory...
if (rel.isNeutral() || (rel.isEnemy() && Conf.territoryEnemyProtectMaterials) || (rel.isAlly() && Conf.territoryAllyProtectMaterials) || (rel.isTruce() && Conf.territoryTruceProtectMaterials)) { if (rel.isNeutral() || (rel.isEnemy() && Conf.territoryEnemyProtectMaterials) || (rel.isAlly() && Conf.territoryAllyProtectMaterials) || (rel.isTruce() && Conf.territoryTruceProtectMaterials)) {
if (!justCheck) { if (!justCheck) {
me.msg(TL.PLAYER_USE_TERRITORY, (material == Material.SOIL ? "trample" : "use"), TextUtil.getMaterialName(material), otherFaction.getTag(myFaction)); me.msg(TL.PLAYER_USE_TERRITORY, (material == Material.SOIL ? "trample " : "use ") + TextUtil.getMaterialName(material), otherFaction.getTag(myFaction));
} }
return false; return false;

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

@ -653,7 +653,7 @@ public enum TL {
PLAYER_USE_WILDERNESS("<b>You can't use <h>%s<b> in the wilderness."), PLAYER_USE_WILDERNESS("<b>You can't use <h>%s<b> in the wilderness."),
PLAYER_USE_SAFEZONE("<b>You can't use <h>%s<b> in a safe zone."), PLAYER_USE_SAFEZONE("<b>You can't use <h>%s<b> in a safe zone."),
PLAYER_USE_WARZONE("<b>You can't use <h>%s<b> in a war zone."), PLAYER_USE_WARZONE("<b>You can't use <h>%s<b> in a war zone."),
PLAYER_USE_TERRITORY("<b>You can't use <h>%s<b> in the territory of <h>%s<b>."), PLAYER_USE_TERRITORY("<b>You can't <h>%s<b> in the territory of <h>%s<b>."),
PLAYER_USE_OWNED("<b>You can't use <h>%s<b> in this territory, it is owned by: %s<b>."), PLAYER_USE_OWNED("<b>You can't use <h>%s<b> in this territory, it is owned by: %s<b>."),
PLAYER_COMMAND_WARZONE("<b>You can't use the command '%s' in warzone."), PLAYER_COMMAND_WARZONE("<b>You can't use the command '%s' in warzone."),
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."),