From 2c64eadafabd98d53b53733cde8916436d0de9e4 Mon Sep 17 00:00:00 2001
From: nossr50 <nossr50@gmail.com>
Date: Wed, 29 Jul 2020 10:42:38 -0700
Subject: [PATCH] command tweaks for xbow

---
 .../nossr50/commands/skills/CrossbowsCommand.java    |  2 +-
 .../nossr50/skills/crossbows/CrossbowManager.java    | 12 ++++++------
 src/main/resources/locale/locale_en_US.properties    |  3 ++-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/gmail/nossr50/commands/skills/CrossbowsCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/CrossbowsCommand.java
index 809f18855..ba88a113f 100644
--- a/src/main/java/com/gmail/nossr50/commands/skills/CrossbowsCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/skills/CrossbowsCommand.java
@@ -34,7 +34,7 @@ public class CrossbowsCommand extends SkillCommand {
 
         if(canUseSubskill(player, SubSkillType.CROSSBOWS_SUPER_SHOTGUN)) {
             String additionalArrowCount = String.valueOf(crossbowManager.getSuperShotgunAdditionalArrowCount());
-            messages.add(getStatMessage(SubSkillType.CROSSBOWS_CROSSBOWS_LIMIT_BREAK, additionalArrowCount));
+            messages.add(getStatMessage(SubSkillType.CROSSBOWS_SUPER_SHOTGUN, additionalArrowCount));
         }
 
         return messages;
diff --git a/src/main/java/com/gmail/nossr50/skills/crossbows/CrossbowManager.java b/src/main/java/com/gmail/nossr50/skills/crossbows/CrossbowManager.java
index 85ec03e45..65fbe18b2 100644
--- a/src/main/java/com/gmail/nossr50/skills/crossbows/CrossbowManager.java
+++ b/src/main/java/com/gmail/nossr50/skills/crossbows/CrossbowManager.java
@@ -51,20 +51,20 @@ public class CrossbowManager extends SkillManager {
      * @param projectileLaunchEvent target event
      */
     public void processProjectileLaunchEvent(ProjectileLaunchEvent projectileLaunchEvent) {
-        mcMMOPlayer.getPlayer().sendMessage("Pew pew!");
-
         //Testing
         if(Permissions.isSubSkillEnabled(mcMMOPlayer.getPlayer(), SubSkillType.CROSSBOWS_SUPER_SHOTGUN)) {
-            coneOfDeathProcessing(projectileLaunchEvent);
+            if(RankUtils.hasUnlockedSubskill(mcMMOPlayer.getPlayer(), SubSkillType.CROSSBOWS_SUPER_SHOTGUN)) {
+                superShotgunProcessing(projectileLaunchEvent);
+            }
         }
     }
 
 
-    private void coneOfDeathProcessing(ProjectileLaunchEvent projectileLaunchEvent) {
-        spawnConeArrows(projectileLaunchEvent.getEntity());
+    private void superShotgunProcessing(ProjectileLaunchEvent projectileLaunchEvent) {
+        spawnSuperShotgunArrows(projectileLaunchEvent.getEntity());
     }
 
-    private void spawnConeArrows(@NotNull Projectile originProjectile) {
+    private void spawnSuperShotgunArrows(@NotNull Projectile originProjectile) {
         World world = originProjectile.getWorld();
 
         Vector originVector = originProjectile.getVelocity().clone();
diff --git a/src/main/resources/locale/locale_en_US.properties b/src/main/resources/locale/locale_en_US.properties
index 681d2eea3..871e55a95 100644
--- a/src/main/resources/locale/locale_en_US.properties
+++ b/src/main/resources/locale/locale_en_US.properties
@@ -565,8 +565,9 @@ Tridents.SkillName=TRIDENTS
 Crossbows.SubSkill.CrossbowsLimitBreak.Name=Crossbows Limit Break
 Crossbows.SubSkill.CrossbowsLimitBreak.Description=Breaking your limits. Increased damage against tough opponents. Intended for PVP, up to server settings for whether or not it will boost damage in PVE.
 Crossbows.SubSkill.CrossbowsLimitBreak.Stat=Limit Break Max DMG
+Crossbows.SubSkill.SuperShotgun.Name=Super Shotgun
 Crossbows.SubSkill.SuperShotgun.Description=Shoot a spread of weaker arrows that ignore invulnerability frames
-Crossbows.SubSkill.SuperShotgun.Stat=+{0} Extra Arrows
+Crossbows.SubSkill.SuperShotgun.Stat=Shotgun Extra Arrows
 Crossbows.Listener=Crossbows:
 Crossbows.SkillName=CROSSBOWS