Server/PacketIO: Only send SMSG_EMOTE when we are dancing.

ProjectSkyfire · Nov 18, 2023 · 593a353 · 593a353
1 parent 04e3e12
commit 593a353
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
@@ -1467,7 +1467,12 @@ void Unit::DealMeleeDamage(CalcDamageInfo* damageInfo, bool durabilityLoss)
 
 void Unit::HandleEmoteCommand(uint32 anim_id)
 {
-    if (GetUInt32Value(UNIT_FIELD_NPC_EMOTESTATE) == 483)
+    if (anim_id == 10)
+    {
+        SetUInt32Value(UNIT_FIELD_NPC_EMOTESTATE, anim_id);
+        return;
+    }
+    else if (GetUInt32Value(UNIT_FIELD_NPC_EMOTESTATE) == 483)
     {
         SetUInt32Value(UNIT_FIELD_NPC_EMOTESTATE, 0x0);
         return;

diff --git a/src/server/game/Handlers/MovementHandler.cpp b/src/server/game/Handlers/MovementHandler.cpp
@@ -381,10 +381,13 @@ void WorldSession::HandleMovementOpcodes(WorldPacket& recvPacket)
 
     mover->UpdatePosition(movementInfo.pos);
 
-    WorldPacket data2(SMSG_EMOTE, 4 + 8);
-    data2 << uint32(0x00);
-    data2 << uint64(mover->GetGUID());
-    mover->SendMessageToSet(&data2, true);
+    if (mover->GetUInt32Value(UNIT_FIELD_NPC_EMOTESTATE) == 10)
+    {
+        WorldPacket data2(SMSG_EMOTE, 4 + 8);
+        data2 << uint32(0x00);
+        data2 << uint64(mover->GetGUID());
+        mover->SendMessageToSet(&data2, true);
+    }
 
     WorldPacket data(SMSG_PLAYER_MOVE, recvPacket.size());
     mover->WriteMovementInfo(data);