minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-12 09:35:26 +02:00
Code Issues Releases Wiki Activity

Switch sudo to command dispatch, this will allow vanilla commands to be executed.

Browse Source
This commit is contained in:
KHobbits
2014-07-12 15:24:38 +01:00
parent 727c3b8eb6
commit d67cca7f51
3 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Essentials/src/com/earth2me/essentials/commands/Commandsudo.java
View File

@@ -4,10 +4,8 @@ import com.earth2me.essentials.CommandSource;
import static com.earth2me.essentials.I18n.tl; import static com.earth2me.essentials.I18n.tl;
import com.earth2me.essentials.User; import com.earth2me.essentials.User;
import java.util.Locale; import java.util.Locale;
import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.bukkit.Server; import org.bukkit.Server;
import org.bukkit.command.PluginCommand;
public class Commandsudo extends EssentialsCommand public class Commandsudo extends EssentialsCommand
@@ -36,11 +34,10 @@ public class Commandsudo extends EssentialsCommand
user.getBase().chat(getFinalArg(args, 1).substring(2)); user.getBase().chat(getFinalArg(args, 1).substring(2));
return; return;
} }
final String command = args[1]; final String[] arguments = new String[args.length - 1];
final String[] arguments = new String[args.length - 2];
if (arguments.length > 0) if (arguments.length > 0)
{ {
System.arraycopy(args, 2, arguments, 0, args.length - 2); System.arraycopy(args, 1, arguments, 0, args.length - 1);
} }
if (user.isAuthorized("essentials.sudo.exempt") && sender.isPlayer()) if (user.isAuthorized("essentials.sudo.exempt") && sender.isPlayer())
@@ -48,25 +45,28 @@ public class Commandsudo extends EssentialsCommand
throw new Exception(tl("sudoExempt")); throw new Exception(tl("sudoExempt"));
} }
sender.sendMessage(tl("sudoRun", user.getDisplayName(), command, getFinalArg(arguments, 0))); final String command = getFinalArg(arguments, 0);
final PluginCommand execCommand = ess.getServer().getPluginCommand(command); sender.sendMessage(tl("sudoRun", user.getDisplayName(), command, ""));
if (execCommand != null)
if (command != null && command.length() > 0)
{ {
class SudoCommandTask implements Runnable class SudoCommandTask implements Runnable
{ {
@Override @Override
public void run() public void run()
{ {
LOGGER.log(Level.INFO, String.format("[Sudo] %s issued server command: /%s %s", user.getName(), command, getFinalArg(arguments, 0))); try
execCommand.execute(user.getBase(), command, arguments); {
ess.getServer().dispatchCommand(user.getBase(), command);
} }
} catch (Exception e)
ess.scheduleSyncDelayedTask(new SudoCommandTask());
}
else
{ {
sender.sendMessage(tl("errorCallingCommand", command)); sender.sendMessage(tl("errorCallingCommand", command));
} }
} }
} }
ess.scheduleSyncDelayedTask(new SudoCommandTask());
}
}
}

3
Essentials/src/messages.properties
View File

@@ -404,7 +404,7 @@ soloMob=\u00a74That mob likes to be alone.
spawnSet=\u00a76Spawn location set for group\u00a7c {0}\u00a76. spawnSet=\u00a76Spawn location set for group\u00a7c {0}\u00a76.
spawned=spawned spawned=spawned
sudoExempt=\u00a74You cannot sudo this user. sudoExempt=\u00a74You cannot sudo this user.
sudoRun=\u00a76Forcing\u00a7c {0} \u00a76to run\:\u00a7r /{1} {2} sudoRun=\u00a76Forcing\u00a7c {0} \u00a76to run\:\u00a7r /{1}
suicideMessage=\u00a76Goodbye cruel world... suicideMessage=\u00a76Goodbye cruel world...
suicideSuccess=\u00a76Player \u00a7c{0} \u00a76took their own life. suicideSuccess=\u00a76Player \u00a7c{0} \u00a76took their own life.
survival=survival survival=survival
@@ -548,7 +548,6 @@ mailTooLong=\u00a74Mail message too long. Try to keep it below 1000 characters.
mailDelay=Too many mails have been sent within the last minute. Maximum\: {0} mailDelay=Too many mails have been sent within the last minute. Maximum\: {0}
seenAccounts=\u00a76Player has also been known as\:\u00a7c {0} seenAccounts=\u00a76Player has also been known as\:\u00a7c {0}
unableToSpawnItem=\u00a74Cannot spawn \u00a7c{0}\u00a74, this is not a spawnable item. unableToSpawnItem=\u00a74Cannot spawn \u00a7c{0}\u00a74, this is not a spawnable item.
itemsConverted=\u00a76Converted all items into blocks. itemsConverted=\u00a76Converted all items into blocks.
itemsNotConverted=\u00a74You have no items that can be converted into blocks. itemsNotConverted=\u00a74You have no items that can be converted into blocks.
mailSentTo=\u00a7c{0}\u00a76 has been sent the following mail: mailSentTo=\u00a7c{0}\u00a76 has been sent the following mail:

3
Essentials/src/messages_en.properties
View File

@@ -404,7 +404,7 @@ soloMob=\u00a74That mob likes to be alone.
spawnSet=\u00a76Spawn location set for group\u00a7c {0}\u00a76. spawnSet=\u00a76Spawn location set for group\u00a7c {0}\u00a76.
spawned=spawned spawned=spawned
sudoExempt=\u00a74You cannot sudo this user. sudoExempt=\u00a74You cannot sudo this user.
sudoRun=\u00a76Forcing\u00a7c {0} \u00a76to run\:\u00a7r /{1} {2} sudoRun=\u00a76Forcing\u00a7c {0} \u00a76to run\:\u00a7r /{1}
suicideMessage=\u00a76Goodbye cruel world... suicideMessage=\u00a76Goodbye cruel world...
suicideSuccess=\u00a76Player \u00a7c{0} \u00a76took their own life. suicideSuccess=\u00a76Player \u00a7c{0} \u00a76took their own life.
survival=survival survival=survival
@@ -548,7 +548,6 @@ mailTooLong=\u00a74Mail message too long. Try to keep it below 1000 characters.
mailDelay=Too many mails have been sent within the last minute. Maximum\: {0} mailDelay=Too many mails have been sent within the last minute. Maximum\: {0}
seenAccounts=\u00a76Player has also been known as\:\u00a7c {0} seenAccounts=\u00a76Player has also been known as\:\u00a7c {0}
unableToSpawnItem=\u00a74Cannot spawn \u00a7c{0}\u00a74, this is not a spawnable item. unableToSpawnItem=\u00a74Cannot spawn \u00a7c{0}\u00a74, this is not a spawnable item.
itemsConverted=\u00a76Converted all items into blocks. itemsConverted=\u00a76Converted all items into blocks.
itemsNotConverted=\u00a74You have no items that can be converted into blocks. itemsNotConverted=\u00a74You have no items that can be converted into blocks.
mailSentTo=\u00a7c{0}\u00a76 has been sent the following mail: mailSentTo=\u00a7c{0}\u00a76 has been sent the following mail: