AtlasMediaGroup/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/TotalFreedomMod.git synced 2025-07-01 20:46:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix wildcard and add back some beloved commands

Browse Source
This commit is contained in:
Telesphoreo
2020-10-29 21:24:06 -05:00
parent e1e046b16b
commit e3a6f5127f
3 changed files with 94 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/me/totalfreedom/totalfreedommod/command/Command_wildcard.java
View File

@ -14,12 +14,11 @@ import org.bukkit.entity.Player;
@CommandParameters(description = "Run any command on all users, username placeholder = ?.", usage = "/<command> [fluff] ? [fluff] ?")
public class Command_wildcard extends FreedomCommand
{
public static final List<String> BLOCKED_COMMANDS = Arrays.asList(
"wildcard",
"gtfo",
"doom",
"saconfig",
"slconfig",
"smite"
);
@ -52,15 +51,15 @@ public class Command_wildcard extends FreedomCommand
aliases = Arrays.asList(fCmd.getAliases().split(","));
}
for (String blockedCommand : BLOCKED_COMMANDS)
for (String arg : args)
{
if (blockedCommand.equals(args[0].toLowerCase()) || aliases.contains(blockedCommand))
String strCommand = StringUtils.strip(arg, "/");
if (BLOCKED_COMMANDS.contains(strCommand.toLowerCase()) || aliases.contains(strCommand.toLowerCase()))
{
msg("Did you really think that was going to work?", ChatColor.RED);
return true;
}
}
String baseCommand = StringUtils.join(args, " ");
if (plugin.cb.isCommandBlocked(baseCommand, sender))
@ -75,7 +74,6 @@ public class Command_wildcard extends FreedomCommand
msg("Running Command: " + runCommand);
server.dispatchCommand(sender, runCommand);
}
return true;
}
}