mirror of
https://github.com/TotalFreedomMC/TF-EssentialsX.git
synced 2024-10-07 01:04:21 +00:00
Fix gamemode other perm check
This commit is contained in:
parent
147a2fc227
commit
9b88107897
|
@ -41,18 +41,25 @@ public class Commandgamemode extends EssentialsCommand
|
||||||
gamemodeOtherPlayers(server, user, gameMode, args[1]);
|
gamemodeOtherPlayers(server, user, gameMode, args[1]);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
try {
|
try
|
||||||
|
{
|
||||||
gameMode = matchGameMode(args[0].toLowerCase(Locale.ENGLISH));
|
gameMode = matchGameMode(args[0].toLowerCase(Locale.ENGLISH));
|
||||||
}
|
}
|
||||||
catch (NotEnoughArgumentsException e) {
|
catch (NotEnoughArgumentsException e)
|
||||||
gameMode = matchGameMode(commandLabel);
|
{
|
||||||
gamemodeOtherPlayers(server, user, gameMode, args[0]);
|
if (user.isAuthorized("essentials.gamemode.others"))
|
||||||
return;
|
{
|
||||||
|
gameMode = matchGameMode(commandLabel);
|
||||||
|
gamemodeOtherPlayers(server, user, gameMode, args[0]);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
throw new NotEnoughArgumentsException();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (gameMode == null) {
|
if (gameMode == null)
|
||||||
|
{
|
||||||
gameMode = user.getGameMode() == GameMode.SURVIVAL ? GameMode.CREATIVE : user.getGameMode() == GameMode.CREATIVE ? GameMode.ADVENTURE : GameMode.SURVIVAL;
|
gameMode = user.getGameMode() == GameMode.SURVIVAL ? GameMode.CREATIVE : user.getGameMode() == GameMode.CREATIVE ? GameMode.ADVENTURE : GameMode.SURVIVAL;
|
||||||
}
|
}
|
||||||
user.setGameMode(gameMode);
|
user.setGameMode(gameMode);
|
||||||
|
@ -104,11 +111,12 @@ public class Commandgamemode extends EssentialsCommand
|
||||||
mode = GameMode.ADVENTURE;
|
mode = GameMode.ADVENTURE;
|
||||||
}
|
}
|
||||||
else if (modeString.equalsIgnoreCase("gmt") || modeString.equalsIgnoreCase("egmt")
|
else if (modeString.equalsIgnoreCase("gmt") || modeString.equalsIgnoreCase("egmt")
|
||||||
|| modeString.contains("toggle") || modeString.contains("cycle") || modeString.equalsIgnoreCase("t"))
|
|| modeString.contains("toggle") || modeString.contains("cycle") || modeString.equalsIgnoreCase("t"))
|
||||||
{
|
{
|
||||||
mode = null;
|
mode = null;
|
||||||
}
|
}
|
||||||
else {
|
else
|
||||||
|
{
|
||||||
throw new NotEnoughArgumentsException();
|
throw new NotEnoughArgumentsException();
|
||||||
}
|
}
|
||||||
return mode;
|
return mode;
|
||||||
|
|
Loading…
Reference in a new issue