Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-23 10:26:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Weather: merged commit 6eb9973947

Browse Source
This commit is contained in:
Ovalord
2018-02-14 15:49:48 +01:00
parent 844450d542
commit dc8f263fc8
12 changed files with 106 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/server/scripts/Commands/cs_misc.cpp
View File

@@ -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);

2
src/server/scripts/Kalimdor/LostCityOfTheTolvir/instance_lost_city_of_the_tolvir.cpp
View File

@@ -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;