diff options
| author | Shauren <shauren.trinity@gmail.com> | 2014-07-27 20:59:22 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2014-07-27 20:59:22 +0200 |
| commit | 2cba07d6a1e319fec6d763daa69af3e29ba837c4 (patch) | |
| tree | 990d4a22193c066fa9aa20a7c33b4330e9a60086 /src/server/scripts | |
| parent | 55eafa247d91e24bd59a369daa05b05d20334791 (diff) | |
| parent | e502e01f5d16964e67685c956e204ae41b756d26 (diff) | |
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4
Conflicts:
README.md
src/server/game/Entities/Object/Object.cpp
src/server/game/Entities/Object/Updates/UpdateData.h
src/server/game/Server/WorldPacket.h
src/server/game/Server/WorldSession.cpp
src/server/game/Server/WorldSession.h
src/server/game/Server/WorldSocket.cpp
src/server/game/Server/WorldSocket.h
src/server/shared/Packets/ByteBuffer.h
Diffstat (limited to 'src/server/scripts')
| -rw-r--r-- | src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp | 24 | ||||
| -rw-r--r-- | src/server/scripts/Kalimdor/HallsOfOrigination/halls_of_origination.h | 2 |
2 files changed, 3 insertions, 23 deletions
diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp index e444d6793e6..81f81fda4c4 100644 --- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp +++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp @@ -112,26 +112,6 @@ public: (*itr)->DespawnOrUnsummon(); } - void SendWeather(WeatherState weather, float grade) const - { - WorldPacket data(SMSG_WEATHER, 9); - data << uint32(weather); - data << float(grade); - data << uint8(0); - SendPacketToPlayers(&data); - } - - // Send packet to all players in Tomb of the Earthrager - void SendPacketToPlayers(WorldPacket const* data) const - { - Map::PlayerList const& players = me->GetMap()->GetPlayers(); - if (!players.isEmpty()) - for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) - if (Player* player = itr->GetSource()) - if (player->GetAreaId() == AREA_TOMB_OF_THE_EARTHRAGER) - player->GetSession()->SendPacket(data); - } - void Reset() override { _summonDeaths = 0; @@ -153,7 +133,7 @@ public: me->AttackStop(); DoCast(me, SPELL_SANDSTORM); - SendWeather(WEATHER_STATE_LIGHT_SANDSTORM, 1.0f); + me->GetMap()->SetZoneWeather(AREA_TOMB_OF_THE_EARTHRAGER, WEATHER_STATE_LIGHT_SANDSTORM, 1.0f); events.ScheduleEvent(EVENT_PTAH_EXPLODE, 6000, 0, PHASE_DISPERSE); events.ScheduleEvent(EVENT_QUICKSAND, 10000, 0, PHASE_DISPERSE); @@ -185,7 +165,7 @@ public: ++_summonDeaths; if (_summonDeaths == 11) // All summons died { - SendWeather(WEATHER_STATE_FOG, 0.0f); + me->GetMap()->SetZoneWeather(AREA_TOMB_OF_THE_EARTHRAGER, WEATHER_STATE_FOG, 0.0f); me->RemoveAurasDueToSpell(SPELL_PTAH_EXPLOSION); events.SetPhase(PHASE_NORMAL); events.ScheduleEvent(EVENT_RAGING_SMASH, urand(7000, 12000), 0, PHASE_NORMAL); diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/halls_of_origination.h b/src/server/scripts/Kalimdor/HallsOfOrigination/halls_of_origination.h index b4022baaadc..9c05ed49c05 100644 --- a/src/server/scripts/Kalimdor/HallsOfOrigination/halls_of_origination.h +++ b/src/server/scripts/Kalimdor/HallsOfOrigination/halls_of_origination.h @@ -100,7 +100,7 @@ enum GameObjects enum Misc { - AREA_TOMB_OF_THE_EARTHRAGER = 5610, + AREA_TOMB_OF_THE_EARTHRAGER = 4945, ACHIEV_VAULT_OF_LIGHTS_EVENT = 24212, // Faster Than The Speed Of Light SPELL_VAULT_OF_LIGHTS_CREDIT = 94067, // Not in DBC }; |