From bbb9d94acc47ac809da93fd9cc4555a4e82fc52e Mon Sep 17 00:00:00 2001
From: ccrs <ccrs@users.noreply.github.com>
Date: Sun, 14 Jul 2019 13:21:49 +0200
Subject: Core/Server: 3785a35 followup

---
 src/server/game/Entities/Player/Player.cpp      | 4 ++--
 src/server/game/Server/Packets/SpellPackets.cpp | 6 +++---
 src/server/game/Server/Packets/SpellPackets.h   | 8 +++++++-
 3 files changed, 12 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 6854a2b45e3..147798a8c42 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -24607,8 +24607,8 @@ void Player::ResyncRunes() const
     for (uint32 itr = 0; itr < MAX_RUNES; ++itr)
     {
         uint8 type = GetCurrentRune(itr);
-        uint32 value = uint32(255) - ((GetRuneCooldown(itr) * uint32(255)) / uint32(RUNE_BASE_COOLDOWN)); // cooldown time (0-255)
-        packet.Cooldowns.emplace_back(type, value);
+        uint32 cooldown = uint32(255) - ((GetRuneCooldown(itr) * uint32(255)) / uint32(RUNE_BASE_COOLDOWN)); // cooldown time (0-255)
+        packet.Runes.emplace_back(type, cooldown);
     }
     SendDirectMessage(packet.Write());
 }
diff --git a/src/server/game/Server/Packets/SpellPackets.cpp b/src/server/game/Server/Packets/SpellPackets.cpp
index e117f5e98e5..09bc1825bca 100644
--- a/src/server/game/Server/Packets/SpellPackets.cpp
+++ b/src/server/game/Server/Packets/SpellPackets.cpp
@@ -162,10 +162,10 @@ WorldPacket const* WorldPackets::Spells::SpellStart::Write()
 WorldPacket const* WorldPackets::Spells::ResyncRunes::Write()
 {
     _worldPacket << Count;
-    for (auto itr = Cooldowns.begin(); itr != Cooldowns.end(); ++itr)
+    for (WorldPackets::Spells::ResyncRune const& rune : Runes)
     {
-        _worldPacket << itr->first;
-        _worldPacket << itr->second;
+        _worldPacket << rune.RuneType;
+        _worldPacket << rune.Cooldown;
     }
     return &_worldPacket;
 }
diff --git a/src/server/game/Server/Packets/SpellPackets.h b/src/server/game/Server/Packets/SpellPackets.h
index 816b2e1c528..ae319eb0a09 100644
--- a/src/server/game/Server/Packets/SpellPackets.h
+++ b/src/server/game/Server/Packets/SpellPackets.h
@@ -114,6 +114,12 @@ namespace WorldPackets
                 SpellCastData Cast;
         };
 
+        struct ResyncRune
+        {
+            uint8 RuneType = 0;
+            uint8 Cooldown = 0;
+        };
+
         class ResyncRunes final : public ServerPacket
         {
         public:
@@ -122,7 +128,7 @@ namespace WorldPackets
             WorldPacket const* Write() override;
 
             uint32 Count = 0;
-            std::vector<std::pair<uint8, uint8>> Cooldowns;
+            std::vector<ResyncRune> Runes;
         };
     }
 }
-- 
cgit v1.2.3