From 3fa72218a421fe7429f48cb66d287c8eab7a1921 Mon Sep 17 00:00:00 2001 From: E Spause Date: Sun, 12 Mar 2017 23:08:59 -0400 Subject: [PATCH] Remove delay death from Mercs so they function like normal NPCs at 0 health. --- zone/merc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zone/merc.h b/zone/merc.h index e3eb6c029..18256faf8 100644 --- a/zone/merc.h +++ b/zone/merc.h @@ -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 );