From 4ba0f76eb94c890407566c1b48177431363c4e2c Mon Sep 17 00:00:00 2001
From: nossr50 <nossr50@gmail.com>
Date: Wed, 3 Jan 2024 01:51:59 -0800
Subject: [PATCH] Bouncing

---
 .../gmail/nossr50/skills/crossbows/Crossbows.java |  5 -----
 .../skills/crossbows/CrossbowsManager.java        | 15 ++++++++++++---
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/gmail/nossr50/skills/crossbows/Crossbows.java b/src/main/java/com/gmail/nossr50/skills/crossbows/Crossbows.java
index 02ea5b24a..35f9aa2aa 100644
--- a/src/main/java/com/gmail/nossr50/skills/crossbows/Crossbows.java
+++ b/src/main/java/com/gmail/nossr50/skills/crossbows/Crossbows.java
@@ -17,11 +17,6 @@ public class Crossbows {
     public static void processCrossbows(ProjectileHitEvent event, Plugin pluginRef) {
         if(event.getEntity() instanceof Arrow originalArrow && event.getHitBlock() != null && event.getHitBlockFace() != null) {
             if (originalArrow.getShooter() instanceof Player) {
-                // Avoid infinite spawning of arrows
-                if (originalArrow.hasMetadata(MetadataConstants.METADATA_KEY_SPAWNED_ARROW)) {
-                    return;
-                }
-
                 McMMOPlayer mmoPlayer = UserManager.getPlayer((Player) originalArrow.getShooter());
                 if (mmoPlayer != null) {
                     mmoPlayer.getCrossbowsManager().handleRicochet(
diff --git a/src/main/java/com/gmail/nossr50/skills/crossbows/CrossbowsManager.java b/src/main/java/com/gmail/nossr50/skills/crossbows/CrossbowsManager.java
index 17918f4c3..28bf16fd3 100644
--- a/src/main/java/com/gmail/nossr50/skills/crossbows/CrossbowsManager.java
+++ b/src/main/java/com/gmail/nossr50/skills/crossbows/CrossbowsManager.java
@@ -4,10 +4,12 @@ import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
 import com.gmail.nossr50.datatypes.skills.SubSkillType;
 import com.gmail.nossr50.skills.SkillManager;
+import com.gmail.nossr50.util.BowType;
 import com.gmail.nossr50.util.MetadataConstants;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.random.ProbabilityUtil;
 import com.gmail.nossr50.util.skills.RankUtils;
+import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.entity.Arrow;
 import org.bukkit.metadata.FixedMetadataValue;
@@ -39,9 +41,13 @@ public class CrossbowsManager extends SkillManager {
 
         if (originalArrow.hasMetadata(MetadataConstants.METADATA_KEY_BOUNCE_COUNT)) {
             bounceCount = originalArrow.getMetadata(MetadataConstants.METADATA_KEY_BOUNCE_COUNT).get(0).asInt();
+            Bukkit.broadcastMessage("Bounce count: " + bounceCount);
             if (bounceCount >= getTrickShotMaxBounceCount()) {
+                Bukkit.broadcastMessage("No more bounces.");
                 return;
             }
+        } else {
+            Bukkit.broadcastMessage("No bounce count metadata");
         }
 
         final ProjectileSource originalArrowShooter = originalArrow.getShooter();
@@ -51,8 +57,12 @@ public class CrossbowsManager extends SkillManager {
 
 
         // check the angle of the arrow against the inverse normal to see if the angle was too shallow
-        if (arrowInBlockVector.angle(inverseNormal) < Math.PI / 4) {
+        // only checks angle on the first bounce
+        if (bounceCount == 0 && arrowInBlockVector.angle(inverseNormal) < Math.PI / 4) {
+            Bukkit.broadcastMessage("No bouncing.");
             return;
+        } else {
+            Bukkit.broadcastMessage("Bouncing.");
         }
 
         // Spawn new arrow with the reflected direction
@@ -64,8 +74,7 @@ public class CrossbowsManager extends SkillManager {
         arrow.setMetadata(MetadataConstants.METADATA_KEY_SPAWNED_ARROW,
                 new FixedMetadataValue(pluginRef, originalArrowShooter));
         arrow.setMetadata(MetadataConstants.METADATA_KEY_BOW_TYPE,
-                new FixedMetadataValue(pluginRef, originalArrow.getMetadata(
-                        MetadataConstants.METADATA_KEY_BOW_TYPE).get(0)));
+                new FixedMetadataValue(pluginRef, BowType.CROSSBOW));
 
         originalArrow.remove();
     }