permission fix

iGoodie · Jan 21, 2020 · e4250fe · e4250fe
1 parent 5b81a88
commit e4250fe
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 3 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -5,7 +5,7 @@ org.gradle.daemon=false
 
 mod_id=twitchspawn
 mod_group=net.programmer.igoodie
-mod_version=0.4.17
+mod_version=0.4.18
 
 minecraft_version=1.12.2
 forge_version=14.23.3.2655

diff --git a/src/main/java/net/programmer/igoodie/twitchspawn/command/module/ModuleExecute.java b/src/main/java/net/programmer/igoodie/twitchspawn/command/module/ModuleExecute.java
@@ -2,6 +2,9 @@
 
 import net.minecraft.command.CommandException;
 import net.minecraft.command.ICommandSender;
+import net.minecraft.util.text.TextComponentTranslation;
+import net.programmer.igoodie.twitchspawn.TwitchSpawn;
+import net.programmer.igoodie.twitchspawn.configuration.ConfigManager;
 import net.programmer.igoodie.twitchspawn.tslanguage.EventArguments;
 import net.programmer.igoodie.twitchspawn.tslanguage.action.TSLAction;
 import net.programmer.igoodie.twitchspawn.tslanguage.parser.TSLParser;
@@ -26,7 +29,13 @@ public String getUsage() {
 
     @Override
     public void execute(ICommandSender commandSender, String[] moduleArgs) throws CommandException {
-        try {
+        String senderNickname = commandSender.getName();
+        if (!ConfigManager.CREDENTIALS.hasPermission(senderNickname)) {
+            commandSender.sendMessage(new TextComponentTranslation("commands.twitchspawn.execute.no_perm"));
+            TwitchSpawn.LOGGER.info("{} tried to execute an action, but no permission", senderNickname);
+            return;
+        }
+        try { 
             TSLAction tslAction = parseAction(moduleArgs);
             EventArguments eventArguments = EventArguments.createRandom(commandSender.getName());
             tslAction.process(eventArguments);

diff --git a/src/main/java/net/programmer/igoodie/twitchspawn/command/module/ModuleTest.java b/src/main/java/net/programmer/igoodie/twitchspawn/command/module/ModuleTest.java
@@ -53,7 +53,12 @@ public List<String> getTabCompletions(String[] moduleArgs) {
     @Override
     public void execute(ICommandSender commandSender, String[] moduleArgs) throws CommandException {
         String streamerNickname = getArgument(moduleArgs, 0);
-
+        String senderNickname = commandSender.getName();
+        if (!ConfigManager.CREDENTIALS.hasPermission(senderNickname)) {
+            commandSender.sendMessage(new TextComponentTranslation("commands.twitchspawn.test.no_perm"));
+            TwitchSpawn.LOGGER.info("{} tried to test a ruleset, but no permission", senderNickname);
+            return;
+        }
         if (streamerNickname == null)
             throw new WrongUsageException(getUsage());
 

diff --git a/src/main/resources/assets/twitchspawn/lang/en_us.lang b/src/main/resources/assets/twitchspawn/lang/en_us.lang
@@ -32,5 +32,8 @@ commands.twitchspawn.simulate.no_perm=§4>> You do not have permission to simula
 
 commands.twitchspawn.test.not_found=§4>> No ruleset associated with %1$s
 commands.twitchspawn.test.success=§a>> Successfully queued rules for %1$s
+commands.twitchspawn.test.no_perm=§4>> You do not have permission to test rulesets.
+
+commands.twitchspawn.execute.no_perm=§4>> You do not have permission to execute actions.
 
 errors.twitchspawn.loading=Cannot load TwitchSpawn