* Fix SMSG_TRANSFER_ABORTED. Don't modify packet structures unless you actually verify them...

--HG--
branch : trunk

2 files changed, 3 insertions, 4 deletions

diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index 73fedb9d7fe..9c1001e28a8 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -20367,7 +20367,7 @@ void Player::SendUpdateToOutOfRangeGroupMembers()
         pet->ResetAuraUpdateMaskForRaid();
 }
 
-void Player::SendTransferAborted(uint32 mapid, uint8 reason, uint8 arg)
+void Player::SendTransferAborted(uint32 mapid, TransferAbortReason reason, uint8 arg)
 {
     WorldPacket data(SMSG_TRANSFER_ABORTED, 4+2);
     data << uint32(mapid);
@@ -20377,8 +20377,7 @@ void Player::SendTransferAborted(uint32 mapid, uint8 reason, uint8 arg)
         case TRANSFER_ABORT_INSUF_EXPAN_LVL:
         case TRANSFER_ABORT_DIFFICULTY:
         case TRANSFER_ABORT_UNIQUE_MESSAGE:
-        case TRANSFER_ABORT_ZONE_IN_COMBAT:
-        case TRANSFER_ABORT_MAX_PLAYERS:
+            // these are the ONLY cases that have an extra argument in the packet!!!
             data << uint8(arg);
             break;
     }
diff --git a/src/game/Player.h b/src/game/Player.h
index e6f97770949..556b2dfe864 100644
--- a/src/game/Player.h
+++ b/src/game/Player.h
@@ -1026,7 +1026,7 @@ class Player : public Unit, public GridObject<Player>
 
         void SendInitialPacketsBeforeAddToMap();
         void SendInitialPacketsAfterAddToMap();
-        void SendTransferAborted(uint32 mapid, uint8 reason, uint8 arg = 0);
+        void SendTransferAborted(uint32 mapid, TransferAbortReason reason, uint8 arg = 0);
         void SendInstanceResetWarning(uint32 mapid, Difficulty difficulty, uint32 time);
 
         Creature* GetNPCIfCanInteractWith(uint64 guid, uint32 npcflagmask);