From e0a23a6b1d7544af176c5dbd8fbba06a823fc3f4 Mon Sep 17 00:00:00 2001 From: VladimirMangos Date: Wed, 15 Apr 2009 11:46:24 +0400 Subject: [PATCH] [7673] Fixed pet spell cooldown values send in Player::PetSpellInitialize to client. --- src/game/Player.cpp | 14 ++++---------- src/shared/revision_nr.h | 2 +- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/src/game/Player.cpp b/src/game/Player.cpp index 994783e8..684cdac6 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -16258,28 +16258,22 @@ void Player::PetSpellInitialize() for(CreatureSpellCooldowns::const_iterator itr = pet->m_CreatureSpellCooldowns.begin(); itr != pet->m_CreatureSpellCooldowns.end(); ++itr) { - time_t cooldown = 0; - - if(itr->second > curTime) - cooldown = (itr->second - curTime) * IN_MILISECONDS; + time_t cooldown = (itr->second > curTime) ? (itr->second - curTime) * IN_MILISECONDS : 0; data << uint16(itr->first); // spellid data << uint16(0); // spell category? - data << uint32(itr->second); // cooldown + data << uint32(cooldown); // cooldown data << uint32(0); // category cooldown } for(CreatureSpellCooldowns::const_iterator itr = pet->m_CreatureCategoryCooldowns.begin(); itr != pet->m_CreatureCategoryCooldowns.end(); ++itr) { - time_t cooldown = 0; - - if(itr->second > curTime) - cooldown = (itr->second - curTime) * IN_MILISECONDS; + time_t cooldown = (itr->second > curTime) ? (itr->second - curTime) * IN_MILISECONDS : 0; data << uint16(itr->first); // spellid data << uint16(0); // spell category? data << uint32(0); // cooldown - data << uint32(itr->second); // category cooldown + data << uint32(cooldown); // category cooldown } GetSession()->SendPacket(&data); diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 0893222e..b260e12c 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "7672" + #define REVISION_NR "7673" #endif // __REVISION_NR_H__ -- 2.11.4.GIT