diff options
| -rw-r--r-- | sql/updates/world/2015_10_17_02_world.sql | 15 | ||||
| -rw-r--r-- | src/server/game/Spells/SpellHistory.cpp | 4 |
2 files changed, 19 insertions, 0 deletions
diff --git a/sql/updates/world/2015_10_17_02_world.sql b/sql/updates/world/2015_10_17_02_world.sql new file mode 100644 index 00000000000..1960d33f7d9 --- /dev/null +++ b/sql/updates/world/2015_10_17_02_world.sql @@ -0,0 +1,15 @@ +-- +UPDATE `creature` SET `position_x`=5832.238, `position_y`=564.013611, `position_z`=651.771301, `Orientation`=2.596493 WHERE `guid`=105661; +UPDATE `creature_addon` SET `auras`=60191 WHERE `guid` IN (105661, 103039); +DELETE FROM `creature_addon` WHERE `guid` IN (115295, 48251,48252,48253); +INSERT INTO `creature_addon` (`guid`, `bytes1`, `bytes2`, `auras`) VALUES +(115295,65536,1,60191), +(48251,65536,1,60190), +(48252,65536,1,60190), +(48253,65536,1,60190); + +DELETE FROM `creature` WHERE `guid` IN (48251,48252,48253); +INSERT INTO `creature` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `Orientation`, `spawntimesecs`) VALUES +(48251, 31851, 571, 1, 1, 5832.240, 564.0139, 651.77099, 2.596490,300), +(48252, 32335, 571, 1, 1, 5833.799, 567.3480, 651.92498, 2.460910,300), +(48253, 32206, 571, 1, 1, 5836.709, 570.0759, 652.10797, 2.146750,300); diff --git a/src/server/game/Spells/SpellHistory.cpp b/src/server/game/Spells/SpellHistory.cpp index 0ae5fe97b13..3c157f0b17b 100644 --- a/src/server/game/Spells/SpellHistory.cpp +++ b/src/server/game/Spells/SpellHistory.cpp @@ -677,6 +677,10 @@ void SpellHistory::RestoreCooldownStateAfterDuel() { Clock::time_point now = Clock::now(); uint32 cooldownDuration = itr->second.CooldownEnd > now ? std::chrono::duration_cast<std::chrono::milliseconds>(itr->second.CooldownEnd - now).count() : 0; + + if (cooldownDuration == 0) + continue; + cooldowns[itr->first] = cooldownDuration; } |