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

Different message for own faction and for other factions when faction not found.

Browse Source 
Still weird for faction-less players to do /f show <other faction-less player>
This commit is contained in:
Tibo442 2014-12-30 12:03:09 +01:00 committed by eueln
parent c4c5bd9df9
commit 2209090783
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/massivecraft/factions/cmd/CmdShow.java
View File

@ -37,13 +37,14 @@ public class CmdShow extends FCommand {
Faction faction = myFaction; Faction faction = myFaction;
if (this.argIsSet(0)) { if (this.argIsSet(0)) {
faction = this.argAsFaction(0); faction = this.argAsFaction(0);
if (faction == null) { if (faction == null || faction.isNone()) {
msg(TL.COMMAND_SHOW_NOFACTION_OTHER);
return; return;
} }
} }
if (faction.isNone()) { if (faction.isNone()) {
msg(TL.COMMAND_SHOW_NOFACTION); msg(TL.COMMAND_SHOW_NOFACTION_SELF);
return; return;
} }

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

@ -343,7 +343,8 @@ public enum TL {
COMMAND_SETHOME_SET("%s<i> set the home for your faction. You can now use:"), COMMAND_SETHOME_SET("%s<i> set the home for your faction. You can now use:"),
COMMAND_SETHOME_SETOTHER("<b>You have set the home for the %s<i> faction."), COMMAND_SETHOME_SETOTHER("<b>You have set the home for the %s<i> faction."),
COMMAND_SHOW_NOFACTION("You are not in a faction"), COMMAND_SHOW_NOFACTION_SELF("You are not in a faction"),
COMMAND_SHOW_NOFACTION_OTHER("That's not a faction"),
COMMAND_SHOW_TOSHOW("to show faction information"), COMMAND_SHOW_TOSHOW("to show faction information"),
COMMAND_SHOW_FORSHOW("for showing faction information"), COMMAND_SHOW_FORSHOW("for showing faction information"),
COMMAND_SHOW_DESCRIPTION("<a>Description: <i>%s"), COMMAND_SHOW_DESCRIPTION("<a>Description: <i>%s"),