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

Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Browse Source 
Conflicts:
	src/tools/map_extractor/System.cpp
This commit is contained in:
Vincent-Michael
2013-09-03 21:03:09 +02:00
parent 611d51af98 5b95301de5
commit 6514e21b7c
8 changed files with 421 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp
View File

@@ -1407,9 +1407,7 @@ public:
{
uiDespawnTimer = 28000;
if (instance)
{
me->AddAura(SPELL_TWILIGHT_SHIFT_ENTER, me);
}
DoCast(me, SPELL_TWILIGHT_TORMENT_VESP_ACO);
}
@@ -1504,9 +1502,7 @@ public:
void Reset() OVERRIDE
{
if (instance)
{
me->AddAura(SPELL_TWILIGHT_SHIFT_ENTER, me);
}
m_uiFadeArmorTimer = 1000;
m_uiHatchEggTimer = 20000;
}