From bbb9d94acc47ac809da93fd9cc4555a4e82fc52e Mon Sep 17 00:00:00 2001 From: ccrs Date: Sun, 14 Jul 2019 13:21:49 +0200 Subject: Core/Server: 3785a35 followup --- src/server/game/Server/Packets/SpellPackets.cpp | 6 +++--- src/server/game/Server/Packets/SpellPackets.h | 8 +++++++- 2 files changed, 10 insertions(+), 4 deletions(-) (limited to 'src/server/game/Server') 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> Cooldowns; + std::vector Runes; }; } } -- cgit v1.2.3