From efd58033ea12f3380c2ff78ca1f7f0b6db368754 Mon Sep 17 00:00:00 2001 From: megamage Date: Thu, 30 Apr 2009 09:58:34 -0500 Subject: *Use canattack to check if canattack in pethandler and combathandler --HG-- branch : trunk --- src/game/CombatHandler.cpp | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'src/game/CombatHandler.cpp') diff --git a/src/game/CombatHandler.cpp b/src/game/CombatHandler.cpp index fb212870822..f9fb4fd7ee0 100644 --- a/src/game/CombatHandler.cpp +++ b/src/game/CombatHandler.cpp @@ -50,7 +50,7 @@ void WorldSession::HandleAttackSwingOpcode( WorldPacket & recv_data ) return; } - if(_player->IsFriendlyTo(pEnemy) || pEnemy->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE)) + if(!_player->canAttack(pEnemy)) { sLog.outError( "WORLD: Enemy %s %u is friendly",(IS_PLAYER_GUID(guid) ? "player" : "creature"),GUID_LOPART(guid)); @@ -59,14 +59,6 @@ void WorldSession::HandleAttackSwingOpcode( WorldPacket & recv_data ) return; } - if(!pEnemy->isAlive()) - { - // client can generate swing to known dead target if autoswitch between autoshot and autohit is enabled in client options - // stop attack state at client - SendAttackStop(pEnemy); - return; - } - _player->Attack(pEnemy,true); } -- cgit v1.2.3