Gui permission semantic changes under certain conditions

Rosewood-Development · Jul 16, 2019 · 795da31 · 795da31
1 parent 063de34
commit 795da31
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/src/com/esophose/playerparticles/command/DefaultCommandModule.java b/src/com/esophose/playerparticles/command/DefaultCommandModule.java
@@ -39,7 +39,7 @@ public String getArguments() {
     }
 
     public boolean requiresEffects() {
-        return true;
+        return false;
     }
 
     public boolean canConsoleExecute() {

diff --git a/src/com/esophose/playerparticles/command/GUICommandModule.java b/src/com/esophose/playerparticles/command/GUICommandModule.java
@@ -27,14 +27,12 @@ public void onCommandExecute(PPlayer pplayer, String[] args) {
             }
             return;
         }
-
-        if (PSetting.GUI_PRESETS_ONLY.getBoolean() && ParticleGroupPresetManager.getPresetGroupsForPlayer(pplayer.getPlayer()).isEmpty()) {
-            return;
-        } else if (PermissionManager.getEffectNamesUserHasPermissionFor(pplayer.getPlayer()).isEmpty()) {
+
+        if (!PSetting.GUI_PRESETS_ONLY.getBoolean() && PermissionManager.getEffectNamesUserHasPermissionFor(pplayer.getPlayer()).isEmpty()) {
             if (byDefault) {
-                LangManager.sendMessage(pplayer, Lang.COMMAND_ERROR_UNKNOWN);
-            } else {
                 LangManager.sendMessage(pplayer, Lang.COMMAND_ERROR_NO_EFFECTS);
+            } else {
+                LangManager.sendMessage(pplayer, Lang.COMMAND_ERROR_UNKNOWN);
             }
             return;
         }
@@ -59,7 +57,7 @@ public String getArguments() {
     }
 
     public boolean requiresEffects() {
-        return true;
+        return false;
     }
 
     public boolean canConsoleExecute() {