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

Fix misleading error in CmdKick

Browse Source 
The error was shown to a player when s/he tried to kick someone who
didn't belong to a faction, and incorrectly asserted that something had
"went wrong".
This commit is contained in:
eueln 2015-01-10 11:32:56 -06:00
parent 561ab22924
commit 2955370c9e
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,9 +58,8 @@ public class CmdKick extends FCommand {
Faction toKickFaction = toKick.getFaction(); Faction toKickFaction = toKick.getFaction();
// The PlayerEntityCollection only holds online players, this was a specific issue that kept happening. if (toKickFaction.isNone()) {
if (toKickFaction.getTag().equalsIgnoreCase(TL.WILDERNESS.toString())) { sender.sendMessage(TL.COMMAND_KICK_NONE.toString());
sender.sendMessage(TL.COMMAND_KICK_OFFLINE.toString());
return; return;
} }

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

@ -227,7 +227,7 @@ public enum TL {
COMMAND_KICK_CANDIDATES("Players you can kick: "), COMMAND_KICK_CANDIDATES("Players you can kick: "),
COMMAND_KICK_CLICKTOKICK("Click to kick "), COMMAND_KICK_CLICKTOKICK("Click to kick "),
COMMAND_KICK_SELF("<b>You cannot kick yourself."), COMMAND_KICK_SELF("<b>You cannot kick yourself."),
COMMAND_KICK_OFFLINE("Something went wrong with getting the offline player's faction."), COMMAND_KICK_NONE("That player is not in a faction."),
COMMAND_KICK_NOTMEMBER("%s<b> is not a member of %s"), COMMAND_KICK_NOTMEMBER("%s<b> is not a member of %s"),
COMMAND_KICK_INSUFFICIENTRANK("<b>Your rank is too low to kick this player."), COMMAND_KICK_INSUFFICIENTRANK("<b>Your rank is too low to kick this player."),
COMMAND_KICK_NEGATIVEPOWER("<b>You cannot kick that member until their power is positive."), COMMAND_KICK_NEGATIVEPOWER("<b>You cannot kick that member until their power is positive."),

2
src/main/resources/lang/en_US.yml
View File

@ -208,7 +208,7 @@ COMMAND:
CANDIDATES: 'Players you can kick: ' CANDIDATES: 'Players you can kick: '
CLICKTOKICK: 'Click to kick ' CLICKTOKICK: 'Click to kick '
SELF: <b>You cannot kick yourself. SELF: <b>You cannot kick yourself.
OFFLINE: Something went wrong with getting the offline player's faction. NONE: That player is not in a faction.
NOTMEMBER: '%s<b> is not a member of %s' NOTMEMBER: '%s<b> is not a member of %s'
INSUFFICIENTRANK: <b>Your rank is too low to kick this player. INSUFFICIENTRANK: <b>Your rank is too low to kick this player.
NEGATIVEPOWER: <b>You cannot kick that member until their power is positive. NEGATIVEPOWER: <b>You cannot kick that member until their power is positive.

2
src/main/resources/lang/ja_JP.yml
View File

@ -207,7 +207,7 @@ COMMAND:
CANDIDATES: 'Players you can kick: ' CANDIDATES: 'Players you can kick: '
CLICKTOKICK: 'Click to kick ' CLICKTOKICK: 'Click to kick '
SELF: <b>You cannot kick yourself. SELF: <b>You cannot kick yourself.
OFFLINE: Something went wrong with getting the offline player's faction. NONE: That player is not in a faction.
NOTMEMBER: '%s<b> is not a member of %s' NOTMEMBER: '%s<b> is not a member of %s'
INSUFFICIENTRANK: <b>Your rank is too low to kick this player. INSUFFICIENTRANK: <b>Your rank is too low to kick this player.
NEGATIVEPOWER: <b>You cannot kick that member until their power is positive. NEGATIVEPOWER: <b>You cannot kick that member until their power is positive.