Merge branch 'master' into custom-plugin-config-ext

MUnique · May 6, 2024 · 060a39d · 060a39d
2 parents ecbf822 + 4b5ffb9
commit 060a39d
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/GameLogic/PlayerActions/Items/MoveItemAction.cs b/src/GameLogic/PlayerActions/Items/MoveItemAction.cs
@@ -238,9 +238,12 @@ private async ValueTask<Movement> CanMoveAsync(Player player, Item item, byte to
                 static bool IsOneHandedOrShield(ItemDefinition definition) =>
                     (definition.ItemSlot!.ItemSlots.Contains(RightHandSlot) && definition.ItemSlot.ItemSlots.Contains(LeftHandSlot)) || definition.Group == 6;
 
+                var rightHandItemDefinition = storage.GetItem(RightHandSlot)?.Definition!;
+
                 if ((toSlot == LeftHandSlot
                     && itemDefinition.Width >= 2
-                    && storage.GetItem(RightHandSlot)?.Definition!.Group == 6)
+                    && rightHandItemDefinition != null
+                    && !rightHandItemDefinition.IsAmmunition)
                     || (toSlot == RightHandSlot
                     && IsOneHandedOrShield(itemDefinition)
                     && storage.GetItem(LeftHandSlot)?.Definition!.Width >= 2))