Merge pull request #894 from TonytheMacaroni/main

Check correct hand for `playeranimate` trigger
TheComputerGeek2 · May 16, 2024 · ba6c50b · ba6c50b
2 parents 7347d38 + c3d2a94
commit ba6c50b
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/core/src/main/java/com/nisovin/magicspells/spells/passive/PlayerAnimationListener.java b/core/src/main/java/com/nisovin/magicspells/spells/passive/PlayerAnimationListener.java
@@ -8,6 +8,7 @@
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.EquipmentSlot;
 import org.bukkit.event.player.PlayerAnimationEvent;
 
 import com.nisovin.magicspells.util.Name;
@@ -48,7 +49,11 @@ public void onAnimate(PlayerAnimationEvent event) {
 		if (!canTrigger(caster)) return;
 
 		if (!items.isEmpty()) {
-			ItemStack item = caster.getInventory().getItemInMainHand();
+			ItemStack item = caster.getInventory().getItem(switch (event.getAnimationType()) {
+				case ARM_SWING -> EquipmentSlot.HAND;
+				case OFF_ARM_SWING -> EquipmentSlot.OFF_HAND;
+			});
+
 			MagicItemData itemData = MagicItems.getMagicItemDataFromItemStack(item);
 			if (itemData == null || !contains(itemData)) return;
 		}