Commit e6e7a46 1 parent e917f8e commit e6e7a46 Copy full SHA for e6e7a46
File tree 1 file changed +7
-8
lines changed
Intersect.Server.Core/Entities
1 file changed +7
-8
lines changed Original file line number Diff line number Diff line change @@ -236,6 +236,13 @@ out var slotIndicesToRemoveFrom
236
236
Debug . Assert ( slotToRemoveFrom != default ) ;
237
237
var quantityToRemoveFromSlot = Math . Min ( remainingQuantityToRemove , slotToRemoveFrom . Quantity ) ;
238
238
slotToRemoveFrom . Quantity -= quantityToRemoveFromSlot ;
239
+
240
+ // If the item is equipped equipment, we need to unequip it before taking it out of the inventory.
241
+ if ( itemDescriptor . ItemType == ItemType . Equipment && slotIndexToRemoveFrom > - 1 )
242
+ {
243
+ mPlayer . EquipmentProcessItemLoss ( slotIndexToRemoveFrom ) ;
244
+ }
245
+
239
246
if ( slotToRemoveFrom . Quantity < 1 )
240
247
{
241
248
slotToRemoveFrom . Set ( Item . None ) ;
@@ -264,14 +271,6 @@ out var slotIndicesToRemoveFrom
264
271
Log . Error ( $ "{ mPlayer . Id } did not have { remainingQuantity } x { itemDescriptor . Id } taken") ;
265
272
}
266
273
267
- if ( itemDescriptor . ItemType == ItemType . Equipment )
268
- {
269
- if ( inventorySlotIndex > - 1 )
270
- {
271
- mPlayer . EquipmentProcessItemLoss ( inventorySlotIndex ) ;
272
- }
273
- }
274
-
275
274
if ( sendUpdate )
276
275
{
277
276
foreach ( var slotIndexToUpdate in slotIndicesToRemoveFrom )
You can’t perform that action at this time.
0 commit comments