diff --git a/Game/Dungeon/DungeonHandler.cs b/Game/Dungeon/DungeonHandler.cs index 62a7b6a..1892c1a 100644 --- a/Game/Dungeon/DungeonHandler.cs +++ b/Game/Dungeon/DungeonHandler.cs @@ -1024,13 +1024,12 @@ public sealed partial class DungeonHandler : IClientMessageHandler using var scope = _scopeFactory.CreateScope(); var db = scope.ServiceProvider.GetRequiredService(); - // Get equipped weapon - var weaponItemId = session.Character.EquippedWeapon; - if (!weaponItemId.HasValue) return; - + // Get equipped weapon using new equipment system var weaponItem = await db.DungeonCharacterItems .Include(i => i.ItemDefinition) - .FirstOrDefaultAsync(i => i.Id == weaponItemId.Value, ct); + .FirstOrDefaultAsync(i => i.CharacterId == session.CharacterId + && i.IsEquipped + && i.EquipSlot == DungeonEquipmentSlot.MainHand, ct); if (weaponItem?.ItemDefinition == null) return; var weapon = weaponItem.ItemDefinition;