swg-source/dsrc
1
0
Fork 0
mirror of https://github.com/SWG-Source/dsrc.git synced 2026-01-17 00:05:07 -05:00
Code Issues Projects Releases Wiki Activity

Refactor and fix /forceCommand

Browse Source
This commit is contained in:
AconiteGodOfSWG
2021-04-14 00:38:47 -04:00
parent ebd13f157f
commit ff707a2ae3
1 changed files with 29 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
sku.0/sys.server/compiled/game/script/gm/cmd.java
View File

@@ -62,34 +62,40 @@ public class cmd extends script.base_script
}
public int cmdForceCommand(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
{
if (!isIdValid(target) || !isPlayer(target) || params == null || params.equalsIgnoreCase(""))
{
sendSystemMessageTestingOnly(self, "[Syntax] /forceCommand -target <command> <params> (with lookat target)");
return SCRIPT_CONTINUE;
}
if (params.contains(gm.KEYWORD_TARGET))
{
params = gm.removeKeyword(params, gm.KEYWORD_TARGET);
}
else
{
sendSystemMessageTestingOnly(self, "[Syntax] /forceCommand -target <command> <params> (with lookat target)");
if(!isGod(self)) {
return SCRIPT_CONTINUE;
}
StringTokenizer st = new StringTokenizer(params);
String cmd = st.nextToken();
obj_id cmdTarget = null;
String cmdParams = "";
while (st.hasMoreTokens())
{
String tmp = st.nextToken();
if (tmp != null && !tmp.equalsIgnoreCase(""))
{
cmdParams += tmp + " ";
if(!st.hasMoreTokens()) {
sendSystemMessageTestingOnly(self, "Syntax: /forceCommand <-target OR <oid>> </command with params>");
sendSystemMessageTestingOnly(self, "Example: /forceCommand 9248492842 /tell aconite hi");
} else {
String focus = st.nextToken();
if(focus.contains("target")) {
target = getLookAtTarget(self);
} else {
if (focus.matches(".*\\d.*")) {
target = obj_id.getObjId(Long.parseLong(focus));
} else {
sendSystemMessageTestingOnly(self, "Syntax: /forceCommand <-target OR objId> <command with params>");
sendSystemMessageTestingOnly(self, "Example: /forceCommand 9248492842 tell aconite hi");
return SCRIPT_CONTINUE;
}
}
if(!isIdValid(target) || !isPlayer(target)) {
sendSystemMessageTestingOnly(self, "forceCommand: Error: Target was not valid. Target must be a player.");
return SCRIPT_CONTINUE;
}
if(!st.hasMoreTokens()) {
sendSystemMessageTestingOnly(self, "Syntax: /forceCommand <-target OR objId> <command with params>");
sendSystemMessageTestingOnly(self, "Example: /forceCommand 9248492842 tell aconite hi");
} else {
String cmd = st.nextToken("").replaceFirst(" ", "/");
sendConsoleCommand(cmd, target);
sendSystemMessageTestingOnly(self, "forceCommand: Successfully sent forceful command "+cmd+" request to "+getPlayerName(target)+ "("+target+").");
}
return SCRIPT_CONTINUE;
}
cmdParams.trim();
sendSystemMessageTestingOnly(self, "/forceCommand: attempting to queue command: '" + cmd + " " + cmdParams + "' for (" + target + ")" + getName(target));
return SCRIPT_CONTINUE;
}
public int cmdMoney(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException