Core: ported headers cleanup from master branch

1 files changed, 5 insertions, 4 deletions

diff --git a/src/server/game/Weather/WeatherMgr.cpp b/src/server/game/Weather/WeatherMgr.cpp
index 6a7e60a2bc0..95728b7e8ae 100644
--- a/src/server/game/Weather/WeatherMgr.cpp
+++ b/src/server/game/Weather/WeatherMgr.cpp
@@ -21,10 +21,11 @@
 */
 
 #include "WeatherMgr.h"
-#include "Weather.h"
+#include "DatabaseEnv.h"
 #include "Log.h"
 #include "ObjectMgr.h"
 #include "Player.h"
+#include "Weather.h"
 #include "WorldSession.h"
 
 namespace WeatherMgr
@@ -41,7 +42,7 @@ namespace
     WeatherData const* GetWeatherData(uint32 zone_id)
     {
         WeatherZoneMap::const_iterator itr = mWeatherZoneMap.find(zone_id);
-        return (itr != mWeatherZoneMap.end()) ? &itr->second : NULL;
+        return (itr != mWeatherZoneMap.end()) ? &itr->second : nullptr;
     }
 }
 
@@ -69,7 +70,7 @@ Weather* AddWeather(uint32 zone_id)
 
     // zone does not have weather, ignore
     if (!weatherChances)
-        return NULL;
+        return nullptr;
 
     Weather* w = new Weather(zone_id, weatherChances);
     m_weathers[w->GetZone()].reset(w);
@@ -146,7 +147,7 @@ void SendFineWeatherUpdateToPlayer(Player* player)
     data << (uint32)WEATHER_STATE_FINE;
     data << (float)0.0f;
     data << uint8(0);
-    player->GetSession()->SendPacket(&data);
+    player->SendDirectMessage(&data);
 }
 
 void Update(uint32 diff)