From adbb8da0259063c7d8f15ba36e5b727f286a6cd7 Mon Sep 17 00:00:00 2001
From: ForesterDev <11771800+ForesterDev@users.noreply.github.com>
Date: Thu, 25 Jul 2019 12:32:31 +0400
Subject: Core/PacketIO: updated totem packets (#23634)

(cherry picked from commit 5c813f6f028aa36c374d7039fd1186802bc8e8af)

# Conflicts:
#	src/server/game/Entities/Totem/Totem.cpp
#	src/server/game/Handlers/SpellHandler.cpp
#	src/server/game/Server/Protocol/Opcodes.cpp
#	src/server/game/Server/WorldSession.h
---
 src/server/game/Handlers/SpellHandler.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'src/server/game/Handlers/SpellHandler.cpp')

diff --git a/src/server/game/Handlers/SpellHandler.cpp b/src/server/game/Handlers/SpellHandler.cpp
index 9baa16cba72..540d09e806d 100644
--- a/src/server/game/Handlers/SpellHandler.cpp
+++ b/src/server/game/Handlers/SpellHandler.cpp
@@ -34,6 +34,7 @@
 #include "SpellAuraEffects.h"
 #include "SpellMgr.h"
 #include "Totem.h"
+#include "TotemPackets.h"
 #include "World.h"
 #include "WorldPacket.h"
 
@@ -556,17 +557,15 @@ void WorldSession::HandleCancelChanneling(WorldPacket& recvData)
     mover->InterruptSpell(CURRENT_CHANNELED_SPELL);
 }
 
-void WorldSession::HandleTotemDestroyed(WorldPacket& recvPacket)
+void WorldSession::HandleTotemDestroyed(WorldPackets::Totem::TotemDestroyed& totemDestroyed)
 {
     // ignore for remote control state
     if (_player->GetUnitBeingMoved() != _player)
         return;
 
-    uint8 slotId;
+    uint8 slotId = totemDestroyed.Slot;
+    slotId += SUMMON_SLOT_TOTEM_FIRE;
 
-    recvPacket >> slotId;
-
-    ++slotId;
     if (slotId >= MAX_TOTEM_SLOT)
         return;
 
-- 
cgit v1.2.3