TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-02-11 11:49:12 +00:00
Code Issues Projects Releases Wiki Activity

Use User#isAuthorized() instead of Player#hasPermission().

Browse source
This commit is contained in:
Ali Moghnieh 2016-07-22 15:33:26 +01:00
parent 6cbb8c846b
commit 83b944eb4b
No known key found for this signature in database
GPG key ID: F09D3A1BAF2E6D70
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
View file

@ -385,7 +385,8 @@ public class EssentialsPlayerListener implements Listener {
return; return;
} }
if (ess.getSettings().getSocialSpyCommands().contains(cmd) || ess.getSettings().getSocialSpyCommands().contains("*")) { if (ess.getSettings().getSocialSpyCommands().contains(cmd) || ess.getSettings().getSocialSpyCommands().contains("*")) {
if (!player.hasPermission("essentials.chat.spy.exempt")) { User user = ess.getUser(player);
if (!user.isAuthorized("essentials.chat.spy.exempt")) {
for (User spyer : ess.getOnlineUsers()) { for (User spyer : ess.getOnlineUsers()) {
if (spyer.isSocialSpyEnabled() && !player.equals(spyer.getBase())) { if (spyer.isSocialSpyEnabled() && !player.equals(spyer.getBase())) {
spyer.sendMessage(player.getDisplayName() + " : " + event.getMessage()); spyer.sendMessage(player.getDisplayName() + " : " + event.getMessage());

10
Essentials/src/com/earth2me/essentials/commands/Commandgamemode.java
View file

@ -58,7 +58,7 @@ public class Commandgamemode extends EssentialsCommand {
gameMode = user.getBase().getGameMode() == GameMode.SURVIVAL ? GameMode.CREATIVE : user.getBase().getGameMode() == GameMode.CREATIVE ? GameMode.ADVENTURE : GameMode.SURVIVAL; gameMode = user.getBase().getGameMode() == GameMode.SURVIVAL ? GameMode.CREATIVE : user.getBase().getGameMode() == GameMode.CREATIVE ? GameMode.ADVENTURE : GameMode.SURVIVAL;
} }
if (!canChangeToMode(user.getBase(), gameMode)) { if (!canChangeToMode(user, gameMode)) {
user.sendMessage(tl("cantGamemode", gameMode.name())); user.sendMessage(tl("cantGamemode", gameMode.name()));
return; return;
} }
@ -72,7 +72,7 @@ public class Commandgamemode extends EssentialsCommand {
throw new NotEnoughArgumentsException(tl("gameModeInvalid")); throw new NotEnoughArgumentsException(tl("gameModeInvalid"));
} }
if (sender.isPlayer() && !canChangeToMode(sender.getPlayer(), gameMode)) { if (sender.isPlayer() && !canChangeToMode(ess.getUser(sender.getPlayer()), gameMode)) {
sender.sendMessage(tl("cantGamemode", gameMode.name())); sender.sendMessage(tl("cantGamemode", gameMode.name()));
return; return;
} }
@ -95,8 +95,8 @@ public class Commandgamemode extends EssentialsCommand {
} }
// essentials.gamemode will let them change to any but essentials.gamemode.survival would only let them change to survival. // essentials.gamemode will let them change to any but essentials.gamemode.survival would only let them change to survival.
private boolean canChangeToMode(Player player, GameMode to) { private boolean canChangeToMode(User user, GameMode to) {
return player.hasPermission("essentials.gamemode.all") || player.hasPermission("essentials.gamemode." + to.name().toLowerCase()); return user.isAuthorized("essentials.gamemode.all") || user.isAuthorized("essentials.gamemode." + to.name().toLowerCase());
} }
private GameMode matchGameMode(String modeString) throws NotEnoughArgumentsException { private GameMode matchGameMode(String modeString) throws NotEnoughArgumentsException {
@ -116,4 +116,4 @@ public class Commandgamemode extends EssentialsCommand {
} }
return mode; return mode;
} }
} }

2
Essentials/src/com/earth2me/essentials/commands/Commandsudo.java
View file

@ -28,7 +28,7 @@ public class Commandsudo extends EssentialsLoopCommand {
} }
final String command = getFinalArg(arguments, 0); final String command = getFinalArg(arguments, 0);
boolean multiple = sender.getSender().hasPermission("essentials.sudo.multiple"); boolean multiple = !sender.isPlayer() ? true : ess.getUser(sender.getPlayer()).isAuthorized("essentials.sudo.multiple");
sender.sendMessage(tl("sudoRun", args[0], command, "")); sender.sendMessage(tl("sudoRun", args[0], command, ""));
loopOnlinePlayers(server, sender, multiple, multiple, args[0], new String[]{command}); loopOnlinePlayers(server, sender, multiple, multiple, args[0], new String[]{command});