pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-09-03 17:46:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Crash] Fix IsUnderwaterOnly crash where npc data references can be stale (#2830)

Browse Source 
* [Crash] Fix IsUnderwaterOnly crash where npc data references can be stale

* m_ prefix
This commit is contained in:
Chris Miles
2023-02-06 17:24:38 -06:00
committed by GitHub
parent 34d21d4056
commit c6eb12ac16
2 changed files with 40 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/npc.h
+3 -1
View File
@@ -437,7 +437,7 @@ public:
/* Only allows players that killed corpse to loot */
const bool HasPrivateCorpse() const { return NPCTypedata_ours ? NPCTypedata_ours->private_corpse : NPCTypedata->private_corpse; }
virtual const bool IsUnderwaterOnly() const { return NPCTypedata_ours ? NPCTypedata_ours->underwater : NPCTypedata->underwater; }
virtual const bool IsUnderwaterOnly() const { return m_is_underwater_only; }
const char* GetRawNPCTypeName() const { return NPCTypedata_ours ? NPCTypedata_ours->name : NPCTypedata->name; }
virtual int GetKillExpMod() const { return NPCTypedata_ours ? NPCTypedata_ours->exp_mod : NPCTypedata->exp_mod; }
@@ -674,6 +674,8 @@ protected:
QGlobalCache *qGlobals;
uint32 adventure_template_id;
bool m_is_underwater_only = false;
//mercenary stuff
std::list<MercType> mercTypeList;
std::list<MercData> mercDataList;