yolinlin/azerothcore-wotlk-pbot
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2025-11-29 17:38:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Players can now re enter zul'aman after raid wipes.

Browse Source
This commit is contained in:
talamortis
2018-03-19 11:54:00 +00:00
parent 8a307c7b18
commit 3cd8da7560
3 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/game/Handlers/PetitionsHandler.cpp
View File

@@ -270,7 +270,7 @@ void WorldSession::HandlePetitionShowSignOpcode(WorldPacket& recvData)
WorldPacket data(SMSG_PETITION_SHOW_SIGNATURES, (8 + 8 + 4 + 1 + signs * 12)); WorldPacket data(SMSG_PETITION_SHOW_SIGNATURES, (8 + 8 + 4 + 1 + signs * 12));
data << petitionguid; // petition guid data << petitionguid; // petition guid
data << _player->GetGUID(); // owner guid data << _player->GetGUID(); // owner guid
data << petitionguid_low; // guild guid (in Oregon always same as GUID_LOPART(petitionguid) data << petitionguid_low; // guild guid
data << signs; // sign's count data << signs; // sign's count
for (uint8 i = 1; i <= signs; ++i) for (uint8 i = 1; i <= signs; ++i)

7
src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
View File

@@ -1,4 +1,4 @@
/* /*
* Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU GPL v2 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-GPL2 * Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU GPL v2 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-GPL2
* Copyright (C) 2008-2016 TrinityCore <http://www.trinitycore.org/> * Copyright (C) 2008-2016 TrinityCore <http://www.trinitycore.org/>
* Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
@@ -89,6 +89,8 @@ class boss_akilzon : public CreatureScript
memset(BirdGUIDs, 0, sizeof(BirdGUIDs)); memset(BirdGUIDs, 0, sizeof(BirdGUIDs));
StormCount = 0; StormCount = 0;
isRaining = false; isRaining = false;
if (instance)
instance->SetData(DATA_AKILZONEVENT, NOT_STARTED); instance->SetData(DATA_AKILZONEVENT, NOT_STARTED);
SetWeather(WEATHER_STATE_FINE, 0.0f); SetWeather(WEATHER_STATE_FINE, 0.0f);
@@ -105,6 +107,8 @@ class boss_akilzon : public CreatureScript
Talk(SAY_AGGRO); Talk(SAY_AGGRO);
//DoZoneInCombat(); //DoZoneInCombat();
if (instance)
instance->SetData(DATA_AKILZONEVENT, IN_PROGRESS); instance->SetData(DATA_AKILZONEVENT, IN_PROGRESS);
} }
@@ -112,6 +116,7 @@ class boss_akilzon : public CreatureScript
{ {
Talk(SAY_DEATH); Talk(SAY_DEATH);
_JustDied(); _JustDied();
if (instance)
instance->SetData(DATA_AKILZONEVENT, DONE); instance->SetData(DATA_AKILZONEVENT, DONE);
} }

8
src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
View File

@@ -1,4 +1,4 @@
/*  /*
* Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU GPL v2 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-GPL2 * Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU GPL v2 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-GPL2
* Copyright (C) 2008-2016 TrinityCore <http://www.trinitycore.org/> * Copyright (C) 2008-2016 TrinityCore <http://www.trinitycore.org/>
* Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
@@ -138,7 +138,10 @@ class boss_nalorakk : public CreatureScript
(*me).GetMotionMaster()->MovePoint(0, NalorakkWay[7][0], NalorakkWay[7][1], NalorakkWay[7][2]); (*me).GetMotionMaster()->MovePoint(0, NalorakkWay[7][0], NalorakkWay[7][1], NalorakkWay[7][2]);
} }
if (instance)
{
instance->SetData(DATA_NALORAKKEVENT, NOT_STARTED); instance->SetData(DATA_NALORAKKEVENT, NOT_STARTED);
}
Surge_Timer = urand(15000, 20000); Surge_Timer = urand(15000, 20000);
BrutalSwipe_Timer = urand(7000, 12000); BrutalSwipe_Timer = urand(7000, 12000);
@@ -291,6 +294,7 @@ class boss_nalorakk : public CreatureScript
void EnterCombat(Unit* /*who*/) void EnterCombat(Unit* /*who*/)
{ {
if (instance)
instance->SetData(DATA_NALORAKKEVENT, IN_PROGRESS); instance->SetData(DATA_NALORAKKEVENT, IN_PROGRESS);
me->MonsterYell(YELL_AGGRO, LANG_UNIVERSAL, NULL); me->MonsterYell(YELL_AGGRO, LANG_UNIVERSAL, NULL);
@@ -301,6 +305,8 @@ class boss_nalorakk : public CreatureScript
void JustDied(Unit* /*killer*/) void JustDied(Unit* /*killer*/)
{ {
ResetMobs(); ResetMobs();
if (instance)
instance->SetData(DATA_NALORAKKEVENT, DONE); instance->SetData(DATA_NALORAKKEVENT, DONE);
me->MonsterYell(YELL_DEATH, LANG_UNIVERSAL, NULL); me->MonsterYell(YELL_DEATH, LANG_UNIVERSAL, NULL);