Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-25 19:31:59 +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/server/game/Spells/Auras/SpellAuraEffects.cpp
This commit is contained in:
Vincent-Michael
2014-06-16 22:17:27 +02:00
parent 85e37db96a 24d834af17
commit 97ccfdb625
11 changed files with 752 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
View File

@@ -854,7 +854,6 @@ class npc_halion_controller : public CreatureScript
{
if (Creature* halion = ObjectAccessor::GetCreature(*me, _instance->GetData64(itr)))
{
RemoveCorporeality(halion, itr == DATA_TWILIGHT_HALION);
halion->CastSpell(halion, GetSpell(_materialCorporealityValue, itr == DATA_TWILIGHT_HALION), true);
if (itr == DATA_TWILIGHT_HALION)
@@ -865,19 +864,6 @@ class npc_halion_controller : public CreatureScript
}
}
void RemoveCorporeality(Creature* who, bool isTwilight = false)
{
for (uint8 i = 0; i < MAX_CORPOREALITY_STATE; i++)
{
uint32 spellID = (isTwilight ? _corporealityReference[i].twilightRealmSpell : _corporealityReference[i].materialRealmSpell);
if (who->HasAura(spellID))
{
who->RemoveAurasDueToSpell(spellID);
break;
}
}
}
uint32 GetSpell(uint8 pctValue, bool isTwilight = false) const
{
CorporealityEntry entry = _corporealityReference[pctValue];