Core: ported headers cleanup from master branch

1 files changed, 6 insertions, 5 deletions

diff --git a/src/server/game/Handlers/CombatHandler.cpp b/src/server/game/Handlers/CombatHandler.cpp
index 894f6233c6b..07cadd837fa 100644
--- a/src/server/game/Handlers/CombatHandler.cpp
+++ b/src/server/game/Handlers/CombatHandler.cpp
@@ -16,14 +16,15 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "WorldSession.h"
 #include "Common.h"
+#include "CreatureAI.h"
+#include "DBCStructure.h"
 #include "Log.h"
-#include "WorldPacket.h"
-#include "WorldSession.h"
 #include "ObjectAccessor.h"
-#include "CreatureAI.h"
-#include "Vehicle.h"
 #include "Player.h"
+#include "Vehicle.h"
+#include "WorldPacket.h"
 
 void WorldSession::HandleAttackSwingOpcode(WorldPacket& recvData)
 {
@@ -37,7 +38,7 @@ void WorldSession::HandleAttackSwingOpcode(WorldPacket& recvData)
     if (!pEnemy)
     {
         // stop attack state at client
-        SendAttackStop(NULL);
+        SendAttackStop(nullptr);
         return;
     }