back to the lab again

Changelog.txt

@@ -2,6 +2,7 @@ Version 2.2.036
     Fixed a bug where Chimaera Wing could cause an exception when used
     Fixed bug where Mob Spawners could drop in Blast Mining (thanks TomBock)
     Fixed Spectral Arrows not granting XP for Archery or Crossbows (thanks broccolai)
+    Fixed bug where Trickshot arrows would lose their potion or custom effects
     Added locale strings for /mcmmo help command (thanks Griffeng)
 
 Version 2.2.035

pom.xml

@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.gmail.nossr50.mcMMO</groupId>
     <artifactId>mcMMO</artifactId>
-    <version>2.2.036-SNAPSHOT</version>
+    <version>2.2.037-SNAPSHOT</version>
     <name>mcMMO</name>
     <url>https://github.com/mcMMO-Dev/mcMMO</url>
     <scm>

src/main/java/com/gmail/nossr50/skills/crossbows/CrossbowsManager.java

@@ -74,6 +74,16 @@ public class CrossbowsManager extends SkillManager {
         spawnedArrow.setPickupStatus(originalArrow.getPickupStatus());
         spawnedArrow.setKnockbackStrength(originalArrow.getKnockbackStrength());
 
+        if (originalArrow.getBasePotionType() != null) {
+            spawnedArrow.setBasePotionType(originalArrow.getBasePotionType());
+        }
+
+        if (originalArrow.hasCustomEffects()) {
+            for (var effect : originalArrow.getCustomEffects()) {
+                spawnedArrow.addCustomEffect(effect, true);
+            }
+        }
+
         // copy metadata from old arrow
         ProjectileUtils.copyArrowMetadata(pluginRef, originalArrow, spawnedArrow);
         originalArrow.remove();