Merge pull request #592 from EQEmu/2002_fixes

Remove delay death from Mercs so they function like normal NPCs at 0 health.
This commit is contained in:
E Spause 2017-03-12 23:17:08 -04:00 committed by GitHub
commit 8d1fe63e77

View File

@ -250,7 +250,7 @@ public:
inline virtual int32 GetStringMod() const { return itembonuses.stringedMod; }
inline virtual int32 GetWindMod() const { return itembonuses.windMod; }
inline virtual int32 GetDelayDeath() const { return aabonuses.DelayDeath + spellbonuses.DelayDeath + itembonuses.DelayDeath + 11; }
inline virtual int32 GetDelayDeath() const { return aabonuses.DelayDeath + spellbonuses.DelayDeath + itembonuses.DelayDeath; }
// "SET" Class Methods
void SetMercData (uint32 templateID );