[Crash] Fix crash with uninitialized item instance, and Bot timeout (#3296)

This commit is contained in:
Aeadoin
2023-04-15 13:12:48 -04:00
committed by GitHub
parent 4320c1429e
commit 7523c972fa
3 changed files with 29 additions and 83 deletions
+22 -22
View File
@@ -304,28 +304,28 @@ namespace EQ
void _PutItem(uint8 index, ItemInstance* inst) { m_contents[index] = inst; }
ItemInstTypes m_use_type {}; // Usage type for item
const ItemData* m_item {}; // Ptr to item data
int16 m_charges {}; // # of charges for chargeable items
uint32 m_price {}; // Bazaar /trader price
uint32 m_color {};
uint32 m_merchantslot {};
int16 m_currentslot {};
bool m_attuned {};
int32 m_merchantcount {}; //number avaliable on the merchant, -1=unlimited
int32 m_SerialNumber {}; // Unique identifier for this instance of an item. Needed for Bazaar.
uint32 m_exp {};
int8 m_evolveLvl {};
bool m_activated {};
ItemData* m_scaledItem {};
::EvolveInfo* m_evolveInfo {};
bool m_scaling {};
uint32 m_ornamenticon {};
uint32 m_ornamentidfile {};
uint32 m_new_id_file {};
uint32 m_ornament_hero_model {};
uint32 m_recast_timestamp {};
int m_task_delivered_count {};
ItemInstTypes m_use_type {ItemInstNormal}; // Usage type for item
const ItemData* m_item {nullptr}; // Ptr to item data
int16 m_charges {0}; // # of charges for chargeable items
uint32 m_price {0}; // Bazaar /trader price
uint32 m_color {0};
uint32 m_merchantslot {0};
int16 m_currentslot {0};
bool m_attuned {false};
int32 m_merchantcount {1}; //number avaliable on the merchant, -1=unlimited
int32 m_SerialNumber {0}; // Unique identifier for this instance of an item. Needed for Bazaar.
uint32 m_exp {0};
int8 m_evolveLvl {0};
bool m_activated {false};
ItemData* m_scaledItem {nullptr};
::EvolveInfo* m_evolveInfo {nullptr};
bool m_scaling {false};
uint32 m_ornamenticon {0};
uint32 m_ornamentidfile {0};
uint32 m_new_id_file {0};
uint32 m_ornament_hero_model {0};
uint32 m_recast_timestamp {0};
int m_task_delivered_count {0};
// Items inside of this item (augs or contents) {};
std::map<uint8, ItemInstance*> m_contents {}; // Zero-based index: min=0, max=9