diff --git a/zone/attack.cpp b/zone/attack.cpp index a694351cb..62d9f8de9 100644 --- a/zone/attack.cpp +++ b/zone/attack.cpp @@ -4811,7 +4811,7 @@ void Mob::SetAttackTimer() void Client::SetAttackTimer() { - float PermaHaste = GetPermaHaste() * 100.0f; + float PermaHaste = GetPermaHaste(); //default value for attack timer in case they have //an invalid weapon equipped: @@ -4907,7 +4907,7 @@ void Client::SetAttackTimer() void NPC::SetAttackTimer() { - float PermaHaste = GetPermaHaste() * 100.0f; + float PermaHaste = GetPermaHaste(); //default value for attack timer in case they have //an invalid weapon equipped: diff --git a/zone/mob.h b/zone/mob.h index b1c40c72f..1f1d257f9 100644 --- a/zone/mob.h +++ b/zone/mob.h @@ -684,7 +684,7 @@ public: inline bool GetInvul(void) { return invulnerable; } inline void SetExtraHaste(int Haste) { ExtraHaste = Haste; } virtual int GetHaste(); - inline float GetPermaHaste() { return GetHaste() ? 1.0f / (1.0f + static_cast(GetHaste()) / 100.0f) : 1.0f; } + inline float GetPermaHaste() { return GetHaste() ? 100.0f / (1.0f + static_cast(GetHaste()) / 100.0f) : 100.0f; } uint8 GetWeaponDamageBonus(const Item_Struct* Weapon); uint16 GetDamageTable(SkillUseTypes skillinuse);