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

Conflicts:
	src/tools/map_extractor/System.cpp
This commit is contained in:
Vincent-Michael committed 2013-09-03 21:03:09 +02:00
commit 6514e21b7c
8 files changed
+421 -5

No files matched your search

@@ -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;
}