[9009] More fixes in pet action bar buttons swap.

Signed-off-by: VladimirMangos <vladimir@getmangos.com>
mangos · Dec 16, 2009 · e77a9f5 · e77a9f5
1 parent 9e240e8
commit e77a9f5
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 12 deletions.
diff --git a/src/game/PetHandler.cpp b/src/game/PetHandler.cpp
@@ -352,22 +352,28 @@ void WorldSession::HandlePetSetAction( WorldPacket & recv_data )
         }
     }
 
-    // check swap
+    // check swap (at command->spell swap client remove spell first in another packet, so check only command move correctness)
     if (move_command)
     {
         uint8 act_state_0 = UNIT_ACTION_BUTTON_TYPE(data[0]);
-        uint32 spell_id_0 = UNIT_ACTION_BUTTON_ACTION(data[0]);
-        UnitActionBarEntry const* actionEntry_1 = charmInfo->GetActionBarEntry(position[1]);
-        if (!actionEntry_1 || spell_id_0 != actionEntry_1->GetAction() ||
-            act_state_0 != actionEntry_1->GetType())
-            return;
+        if(act_state_0 == ACT_COMMAND || act_state_0 == ACT_REACTION)
+        {
+            uint32 spell_id_0 = UNIT_ACTION_BUTTON_ACTION(data[0]);
+            UnitActionBarEntry const* actionEntry_1 = charmInfo->GetActionBarEntry(position[1]);
+            if (!actionEntry_1 || spell_id_0 != actionEntry_1->GetAction() ||
+                act_state_0 != actionEntry_1->GetType())
+                return;
+        }
 
         uint8 act_state_1 = UNIT_ACTION_BUTTON_TYPE(data[1]);
-        uint32 spell_id_1 = UNIT_ACTION_BUTTON_ACTION(data[1]);
-        UnitActionBarEntry const* actionEntry_0 = charmInfo->GetActionBarEntry(position[0]);
-        if (!actionEntry_0 || spell_id_1 != actionEntry_0->GetAction() ||
-            act_state_1 != actionEntry_0->GetType())
-            return;
+        if(act_state_1 == ACT_COMMAND || act_state_1 == ACT_REACTION)
+        {
+            uint32 spell_id_1 = UNIT_ACTION_BUTTON_ACTION(data[1]);
+            UnitActionBarEntry const* actionEntry_0 = charmInfo->GetActionBarEntry(position[0]);
+            if (!actionEntry_0 || spell_id_1 != actionEntry_0->GetAction() ||
+                act_state_1 != actionEntry_0->GetType())
+                return;
+        }
     }
 
     for(uint8 i = 0; i < count; ++i)

diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "9008"
+ #define REVISION_NR "9009"
 #endif // __REVISION_NR_H__