Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-20 17:27:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.3.5-boundaryagain' into 3.3.5-base (PR #16270)

Browse Source 
(cherry picked from commit 1050b68899)
This commit is contained in:
treeston
2016-01-18 18:35:20 +01:00
committed by Shauren
parent 8911962c9e
commit 5fb88c7121
10 changed files with 41 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp
View File

@@ -77,7 +77,7 @@ public:
Talk(SAY_RESPAWN);
}
bool CheckInRoom()
bool CheckInRoom() override
{
if (me->GetDistance2d(me->GetHomePosition().GetPositionX(), me->GetHomePosition().GetPositionY()) > 50)
{

2
src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp
View File

@@ -78,7 +78,7 @@ public:
Talk(SAY_BUFF);
}
bool CheckInRoom()
bool CheckInRoom() override
{
if (me->GetDistance2d(me->GetHomePosition().GetPositionX(), me->GetHomePosition().GetPositionY()) > 50)
{

9
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp
View File

@@ -22,12 +22,11 @@
#include "Player.h"
#include "TemporarySummon.h"
AreaBoundary const* const mainBoundary = new CircleBoundary(Position(563.26f, 139.6f), 75.0);
BossBoundaryData const boundaries = {
{ BOSS_BEASTS, mainBoundary },
{ BOSS_JARAXXUS, mainBoundary },
{ BOSS_CRUSADERS, mainBoundary },
{ BOSS_VALKIRIES, mainBoundary },
{ BOSS_BEASTS, new CircleBoundary(Position(563.26f, 139.6f), 75.0) },
{ BOSS_JARAXXUS, new CircleBoundary(Position(563.26f, 139.6f), 75.0) },
{ BOSS_CRUSADERS, new CircleBoundary(Position(563.26f, 139.6f), 75.0) },
{ BOSS_VALKIRIES, new CircleBoundary(Position(563.26f, 139.6f), 75.0) },
{ BOSS_ANUBARAK, new EllipseBoundary(Position(746.0f, 135.0f), 100.0, 75.0) }
};

9
src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp
View File

@@ -265,7 +265,7 @@ class boss_sindragosa : public CreatureScript
{
if (!instance->CheckRequiredBosses(DATA_SINDRAGOSA, victim->ToPlayer()))
{
EnterEvadeMode();
EnterEvadeMode(EVADE_REASON_SEQUENCE_BREAK);
instance->DoCastSpellOnPlayers(LIGHT_S_HAMMER_TELEPORT);
return;
}
@@ -276,6 +276,13 @@ class boss_sindragosa : public CreatureScript
Talk(SAY_AGGRO);
}
void EnterEvadeMode(EvadeReason why) override
{
if (_isInAirPhase && why == EVADE_REASON_BOUNDARY)
return;
BossAI::EnterEvadeMode(why);
}
void JustReachedHome() override
{
BossAI::JustReachedHome();

2
src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp
View File

@@ -94,6 +94,8 @@ class boss_void_reaver : public CreatureScript
if (!UpdateVictim())
return;
events.Update(diff);
if (me->HasUnitState(UNIT_STATE_CASTING))
return;