From 9303d441b1d567d83d27af7b2f12abd24e22afb1 Mon Sep 17 00:00:00 2001
From: nossr50 <nossr50@gmail.com>
Date: Fri, 5 Feb 2021 16:35:12 -0800
Subject: [PATCH] Change condition on power level command

---
 .../nossr50/commands/skills/PowerLevelCommand.java | 14 ++++++++++++--
 .../nossr50/commands/skills/SkillCommand.java      | 10 +++++-----
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/gmail/nossr50/commands/skills/PowerLevelCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/PowerLevelCommand.java
index d15dd364a..67e725cdc 100644
--- a/src/main/java/com/gmail/nossr50/commands/skills/PowerLevelCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/skills/PowerLevelCommand.java
@@ -7,6 +7,7 @@ import co.aikar.commands.annotation.CommandPermission;
 import co.aikar.commands.annotation.Conditions;
 import co.aikar.commands.annotation.Default;
 import com.gmail.nossr50.commands.CommandManager;
+import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.util.player.UserManager;
@@ -23,13 +24,22 @@ public class PowerLevelCommand extends BaseCommand {
     }
 
     @Default
-    @Conditions(CommandManager.ADMIN_CONDITION)
+    @Conditions(CommandManager.POWER_LEVEL_CONDITION)
     public void processCommand(String[] args) {
         BukkitCommandIssuer bukkitCommandIssuer = (BukkitCommandIssuer) getCurrentCommandIssuer();
         Player player = bukkitCommandIssuer.getPlayer();
         McMMOPlayer mmoPlayer = UserManager.getPlayer(player); //Should never be null at this point because its caught in an ACF validation
+        int powerLevel = mmoPlayer.getPowerLevel();
 
         //TODO: impl
-        mmoPlayer.getPlayer().sendMessage("Your power level is: "+mmoPlayer.getPowerLevel()); //This is not gonna stay, just to show that the command executes in debug
+        mmoPlayer.getPlayer().sendMessage("Your power level is: "+powerLevel); //This is not gonna stay, just to show that the command executes in debug
+
+        //Send the players a few blank lines to make finding the top of the skill command easier
+        if (AdvancedConfig.getInstance().doesSkillCommandSendBlankLines()) {
+            for (int i = 0; i < 2; i++) {
+                player.sendMessage("");
+            }
+        }
+
     }
 }
diff --git a/src/main/java/com/gmail/nossr50/commands/skills/SkillCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/SkillCommand.java
index e550913fa..00a4b52e5 100644
--- a/src/main/java/com/gmail/nossr50/commands/skills/SkillCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/skills/SkillCommand.java
@@ -74,10 +74,11 @@ public abstract class SkillCommand implements TabExecutor {
             float skillValue = mcMMOPlayer.getSkillLevel(skill);
 
             //Send the players a few blank lines to make finding the top of the skill command easier
-            if (AdvancedConfig.getInstance().doesSkillCommandSendBlankLines())
+            if (AdvancedConfig.getInstance().doesSkillCommandSendBlankLines()) {
                 for (int i = 0; i < 2; i++) {
                     player.sendMessage("");
                 }
+            }
 
             permissionsCheck(player);
             dataCalculations(player, skillValue);
@@ -136,10 +137,9 @@ public abstract class SkillCommand implements TabExecutor {
     }
 
     private void sendSkillCommandHeader(Player player, McMMOPlayer mcMMOPlayer, int skillValue) {
-        ChatColor hd1 = ChatColor.DARK_AQUA;
-        ChatColor c1 = ChatColor.GOLD;
-        ChatColor c2 = ChatColor.RED;
-
+//        ChatColor hd1 = ChatColor.DARK_AQUA;
+//        ChatColor c1 = ChatColor.GOLD;
+//        ChatColor c2 = ChatColor.RED;
 
         player.sendMessage(LocaleLoader.getString("Skills.Overhaul.Header", skillName));