Core/MovementHandler: small cleanup

disabled SMSG_THREAT_UPDATE for now (client crash issue)

2 files changed, 6 insertions, 7 deletions

diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 21e313c1bc0..a9c0ea70f72 100755
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -17334,7 +17334,7 @@ void Unit::SendThreatListUpdate()
     {
         uint32 count = getThreatManager().getThreatList().size();
 
-        //sLog->outDebug(LOG_FILTER_UNITS, "WORLD: Send SMSG_THREAT_UPDATE Message");
+        sLog->outDebug(LOG_FILTER_UNITS, "WORLD: Send SMSG_THREAT_UPDATE Message (disabled)");
         WorldPacket data(SMSG_THREAT_UPDATE, 8 + count * 8);
         data.append(GetPackGUID());
         data << uint32(count);
@@ -17344,7 +17344,7 @@ void Unit::SendThreatListUpdate()
             data.appendPackGUID((*itr)->getUnitGuid());
             data << uint32((*itr)->getThreat() * 100);
         }
-        SendMessageToSet(&data, false);
+        //SendMessageToSet(&data, false);
     }
 }
 
diff --git a/src/server/game/Server/Protocol/Handlers/MovementHandler.cpp b/src/server/game/Server/Protocol/Handlers/MovementHandler.cpp
index fe23e85cb3e..9997816f0ec 100755
--- a/src/server/game/Server/Protocol/Handlers/MovementHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/MovementHandler.cpp
@@ -254,7 +254,6 @@ void WorldSession::HandleMovementOpcodes(WorldPacket & recv_data)
     // ignore, waiting processing in WorldSession::HandleMoveWorldportAckOpcode and WorldSession::HandleMoveTeleportAck
     if (plMover && plMover->IsBeingTeleported())
     {
-        recv_data.rfinish();                   // prevent warnings spam
         return;
     }
 
@@ -262,15 +261,15 @@ void WorldSession::HandleMovementOpcodes(WorldPacket & recv_data)
     MovementInfo movementInfo;
     ReadMovementInfo(recv_data, &movementInfo);
 
-    recv_data.rfinish();                   // prevent warnings spam
-
     // prevent tampered movement data
     if (movementInfo.guid != mover->GetGUID())
+    {
+        sLog->outError("HandleMovementOpcodes: guid error");
         return;
-
+    }
     if (!movementInfo.pos.IsPositionValid())
     {
-        recv_data.rfinish();                   // prevent warnings spam
+        sLog->outError("HandleMovementOpcodes: Invalid Position");
         return;
     }