From ad7c42da78340350c243cbd4540662af7be07e5f Mon Sep 17 00:00:00 2001
From: Auxilor <will@willfp.com>
Date: Sat, 7 Nov 2020 14:06:33 +0000
Subject: [PATCH] Added Charge

---
 .../ecoenchants/enchantments/ecoenchants/spell/Charge.java    | 3 ++-
 .../ecoenchants/enchantments/ecoenchants/spell/Dynamite.java  | 4 ++++
 Plugin/src/main/resources/enchants/spell/charge.yml           | 3 ++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/spell/Charge.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/spell/Charge.java
index d1c175de..bc1376ad 100644
--- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/spell/Charge.java
+++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/spell/Charge.java
@@ -14,8 +14,9 @@ public class Charge extends Spell {
     @Override
     public void onRightClick(Player player, int level, PlayerInteractEvent event) {
         Vector velocity = player.getEyeLocation().getDirection().clone();
+        velocity.normalize();
         velocity.multiply(level * this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "velocity-per-level"));
-        velocity.setY(0.2);
+        velocity.setY(player.getEyeLocation().getDirection().clone().getY() + 0.2);
         player.setVelocity(velocity);
     }
 }
diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/spell/Dynamite.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/spell/Dynamite.java
index b5594d43..a6ab8231 100644
--- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/spell/Dynamite.java
+++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/spell/Dynamite.java
@@ -9,6 +9,7 @@ import com.willfp.ecoenchants.nms.BlockBreak;
 import org.bukkit.Particle;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
+import org.bukkit.event.block.Action;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.metadata.FixedMetadataValue;
 
@@ -24,6 +25,9 @@ public class Dynamite extends Spell {
     public void onRightClick(Player player, int level, PlayerInteractEvent event) {
         Block block = event.getClickedBlock();
 
+        if(!event.getAction().equals(Action.RIGHT_CLICK_BLOCK))
+            return;
+
         if(block == null) return;
 
         if (block.hasMetadata("from-drill") || block.hasMetadata("from-lumberjack") || block.hasMetadata("from-blastmining") || block.hasMetadata("from-vein")) {
diff --git a/Plugin/src/main/resources/enchants/spell/charge.yml b/Plugin/src/main/resources/enchants/spell/charge.yml
index 75ff45d8..32b69e10 100644
--- a/Plugin/src/main/resources/enchants/spell/charge.yml
+++ b/Plugin/src/main/resources/enchants/spell/charge.yml
@@ -21,4 +21,5 @@ general-config:
 
 config:
   activation-sound: ENTITY_FIREWORK_ROCKET_LAUNCH
-  cooldown: 20 # In seconds
\ No newline at end of file
+  cooldown: 20 # In seconds
+  velocity-per-level: 1.5
\ No newline at end of file