diff --git a/src/game/Player.cpp b/src/game/Player.cpp index eaca6aa7c..dfb2d32ec 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -10361,6 +10361,10 @@ uint8 Player::CanEquipItem( uint8 slot, uint16 &dest, Item *pItem, bool swap, bo return EQUIP_ERR_NOT_DURING_ARENA_MATCH; } + // prevent equip item in process logout + if (GetSession()->isLogingOut()) + return EQUIP_ERR_YOU_ARE_STUNNED; + if (isInCombat()&& pProto->Class == ITEM_CLASS_WEAPON && m_weaponChangeTimer != 0) return EQUIP_ERR_CANT_DO_RIGHT_NOW; // maybe exist better err @@ -10492,6 +10496,10 @@ uint8 Player::CanUnequipItem( uint16 pos, bool swap ) const return EQUIP_ERR_NOT_DURING_ARENA_MATCH; } + // prevent unequip item in process logout + if (GetSession()->isLogingOut()) + return EQUIP_ERR_YOU_ARE_STUNNED; + if(!swap && pItem->IsBag() && !((Bag*)pItem)->IsEmpty()) return EQUIP_ERR_CAN_ONLY_DO_WITH_EMPTY_BAGS; diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index a54819db8..2632e0251 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "10743" + #define REVISION_NR "10744" #endif // __REVISION_NR_H__