Core/Weather: merged commit 6eb997394722fcd4b5248646b5abfa185a7ec58f

src/server/scripts/Commands/cs_misc.cpp

@@ -1412,10 +1412,7 @@ public:
         Player* player = handler->GetSession()->GetPlayer();
         uint32 zoneid = player->GetZoneId();
 
-        Weather* weather = WeatherMgr::FindWeather(zoneid);
-
-        if (!weather)
-            weather = WeatherMgr::AddWeather(zoneid);
+        Weather* weather = player->GetMap()->GetOrGenerateZoneDefaultWeather(zoneid);
         if (!weather)
         {
             handler->SendSysMessage(LANG_NO_WEATHER);

src/server/scripts/Kalimdor/LostCityOfTheTolvir/instance_lost_city_of_the_tolvir.cpp

@@ -136,6 +136,8 @@ class instance_lost_city_of_the_tolvir : public InstanceMapScript
                         if (state == IN_PROGRESS && !CheckSiamatsPlatform())
                             if (Creature* siamat = GetCreature(DATA_SIAMAT))
                                 siamat->AI()->EnterEvadeMode();
+                        if (state == DONE)
+                            instance->SetZoneWeather(ZONE_ID_LOST_CITY, WEATHER_STATE_FOG, 1.0f);
                         break;
                     default:
                         break;