*Backed out changeset 3be01fb200a5

--HG--
branch : trunk

1 files changed, 15 insertions, 0 deletions

diff --git a/src/game/CombatHandler.cpp b/src/game/CombatHandler.cpp
index 80ca6ba3532..095986303f8 100644
--- a/src/game/CombatHandler.cpp
+++ b/src/game/CombatHandler.cpp
@@ -17,6 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
+
 #include "Common.h"
 #include "Log.h"
 #include "WorldPacket.h"
@@ -24,47 +25,61 @@
 #include "ObjectAccessor.h"
 #include "CreatureAI.h"
 #include "ObjectDefines.h"
+
 void WorldSession::HandleAttackSwingOpcode( WorldPacket & recv_data )
 {
     uint64 guid;
     recv_data >> guid;
+
     DEBUG_LOG( "WORLD: Recvd CMSG_ATTACKSWING Message guidlow:%u guidhigh:%u", GUID_LOPART(guid), GUID_HIPART(guid) );
+
     Unit *pEnemy = ObjectAccessor::GetUnit(*_player, guid);
+
     if(!pEnemy)
     {
         if(!IS_UNIT_GUID(guid))
             sLog.outError("WORLD: Object %u (TypeID: %u) isn't player, pet or creature",GUID_LOPART(guid),GuidHigh2TypeId(GUID_HIPART(guid)));
         else
             sLog.outError( "WORLD: Enemy %s %u not found",GetLogNameForGuid(guid),GUID_LOPART(guid));
+
         // stop attack state at client
         SendAttackStop(NULL);
         return;
     }
+
     if(!_player->canAttack(pEnemy))
     {
         sLog.outError( "WORLD: Enemy %s %u is friendly",(IS_PLAYER_GUID(guid) ? "player" : "creature"),GUID_LOPART(guid));
+
         // stop attack state at client
         SendAttackStop(pEnemy);
         return;
     }
+
     _player->Attack(pEnemy,true);
 }
+
 void WorldSession::HandleAttackStopOpcode( WorldPacket & /*recv_data*/ )
 {
     GetPlayer()->AttackStop();
 }
+
 void WorldSession::HandleSetSheathedOpcode( WorldPacket & recv_data )
 {
     uint32 sheathed;
     recv_data >> sheathed;
+
     //sLog.outDebug( "WORLD: Recvd CMSG_SETSHEATHED Message guidlow:%u value1:%u", GetPlayer()->GetGUIDLow(), sheathed );
+
     if(sheathed >= MAX_SHEATH_STATE)
     {
         sLog.outError("Unknown sheath state %u ??",sheathed);
         return;
     }
+
     GetPlayer()->SetSheath(SheathState(sheathed));
 }
+
 void WorldSession::SendAttackStop(Unit const* enemy)
 {
     WorldPacket data( SMSG_ATTACKSTOP, (4+20) );            // we guess size