Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-02-01 14:46:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into 4.3.4

Browse Source
This commit is contained in:
Nay
2012-08-13 13:09:54 +01:00
parent 9dcae03a04 d1ed95faa5
commit 12e0f93eef
4 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp
View File

@@ -104,6 +104,7 @@ public:
if (me->GetEntry() == MOB_HORSEMEN[i])
id = Horsemen(i);
caster = (id == HORSEMEN_LADY || id == HORSEMEN_SIR);
encounterActionReset = false;
}
Horsemen id;

3
src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp
View File

@@ -58,6 +58,9 @@ public:
Anomalus = 0;
Keristrasza = 0;
AnomalusContainmentSphere = 0;
OrmoroksContainmentSphere = 0;
TelestrasContainmentSphere = 0;
}
void OnCreatureCreate(Creature* creature)

5
src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
View File

@@ -172,6 +172,7 @@ public:
boss_skadiAI(Creature* creature) : ScriptedAI(creature), Summons(me)
{
instance = creature->GetInstanceScript();
m_uiGraufGUID = 0;
}
InstanceScript* instance;
@@ -207,7 +208,7 @@ public:
Summons.DespawnAll();
me->SetSpeed(MOVE_FLIGHT, 3.0f);
if ((Unit::GetCreature((*me), m_uiGraufGUID) == NULL) && !me->IsMounted())
if ((Unit::GetCreature(*me, m_uiGraufGUID) == NULL) && !me->IsMounted())
me->SummonCreature(CREATURE_GRAUF, Location[0].GetPositionX(), Location[0].GetPositionY(), Location[0].GetPositionZ(), 3.0f);
if (instance)
{
@@ -221,7 +222,7 @@ public:
me->SetCanFly(false);
me->Dismount();
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_NON_ATTACKABLE);
if (Unit::GetCreature((*me), m_uiGraufGUID) == NULL)
if (!Unit::GetCreature(*me, m_uiGraufGUID))
me->SummonCreature(CREATURE_GRAUF, Location[0].GetPositionX(), Location[0].GetPositionY(), Location[0].GetPositionZ(), 3.0f);
}

3
src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp
View File

@@ -121,6 +121,9 @@ public:
m_uiActiveOrder[i] = m_uiActiveOrder[r];
m_uiActiveOrder[r] = temp;
}
m_uiActivedCreatureGUID = 0;
m_uiOrbGUID = 0;
}
bool m_bIsWalking;