diff options
Diffstat (limited to 'src/server/game/Spells')
| -rw-r--r-- | src/server/game/Spells/Auras/SpellAuraEffects.cpp | 13 | ||||
| -rw-r--r-- | src/server/game/Spells/SpellEffects.cpp | 4 |
2 files changed, 9 insertions, 8 deletions
diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp index bc6d3677094..8ad99d8d0b5 100644 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -78,7 +78,7 @@ pAuraEffectHandler AuraEffectHandler[TOTAL_AURAS]= &AuraEffect::HandleModStealth, // 16 SPELL_AURA_MOD_STEALTH &AuraEffect::HandleModStealthDetect, // 17 SPELL_AURA_MOD_DETECT &AuraEffect::HandleModInvisibility, // 18 SPELL_AURA_MOD_INVISIBILITY - &AuraEffect::HandleModInvisibilityDetect, // 19 SPELL_AURA_MOD_INVISIBILITY_DETECTION + &AuraEffect::HandleModInvisibilityDetect, // 19 SPELL_AURA_MOD_INVISIBILITY_DETECT &AuraEffect::HandleNoImmediateEffect, // 20 SPELL_AURA_OBS_MOD_HEALTH implemented in AuraEffect::PeriodicTick &AuraEffect::HandleNoImmediateEffect, // 21 SPELL_AURA_OBS_MOD_POWER implemented in AuraEffect::PeriodicTick &AuraEffect::HandleAuraModResistance, // 22 SPELL_AURA_MOD_RESISTANCE @@ -1084,7 +1084,6 @@ void AuraEffect::HandleShapeshiftBoosts(Unit* target, bool apply) const { uint32 spellId = 0; uint32 spellId2 = 0; - //uint32 spellId3 = 0; uint32 HotWSpellId = 0; switch (GetMiscValue()) @@ -1222,7 +1221,8 @@ void AuraEffect::HandleShapeshiftBoosts(Unit* target, bool apply) const // Heart of the Wild if (HotWSpellId) - { // hacky, but the only way as spell family is not SPELLFAMILY_DRUID + { + // hacky, but the only way as spell family is not SPELLFAMILY_DRUID Unit::AuraEffectList const& mModTotalStatPct = target->GetAuraEffectsByType(SPELL_AURA_MOD_TOTAL_STAT_PERCENTAGE); for (AuraEffect const* aurEff : mModTotalStatPct) { @@ -1237,6 +1237,7 @@ void AuraEffect::HandleShapeshiftBoosts(Unit* target, bool apply) const } } } + switch (GetMiscValue()) { case FORM_CAT: @@ -1910,7 +1911,7 @@ void AuraEffect::HandleAuraModShapeshift(AuraApplication const* aurApp, uint8 mo SpellShapeshiftFormEntry const* shapeInfo = sSpellShapeshiftFormStore.LookupEntry(form); ASSERT(shapeInfo); // Learn spells for shapeshift form - no need to send action bars or add spells to spellbook - for (uint8 i = 0; i<MAX_SHAPESHIFT_SPELLS; ++i) + for (uint8 i = 0; i < MAX_SHAPESHIFT_SPELLS; ++i) { if (!shapeInfo->PresetSpellID[i]) continue; @@ -2305,12 +2306,12 @@ void AuraEffect::HandleAuraModDisarm(AuraApplication const* aurApp, uint8 mode, Unit* target = aurApp->GetTarget(); - //Prevent handling aura twice + // Prevent handling aura twice AuraType type = GetAuraType(); if (apply ? target->GetAuraEffectsByType(type).size() > 1 : target->HasAuraType(type)) return; - void(*flagChangeFunc)(Unit * u) = nullptr; + void(*flagChangeFunc)(Unit* u) = nullptr; uint32 slot; WeaponAttackType attType; diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index e31db03f80e..9fc4471259d 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -4720,7 +4720,7 @@ void Spell::EffectTransmitted() Map* cMap = unitCaster->GetMap(); // if gameobject is summoning object, it should be spawned right on caster's position - if (goinfo->type == GAMEOBJECT_TYPE_SUMMONING_RITUAL) + if (goinfo->type == GAMEOBJECT_TYPE_RITUAL) unitCaster->GetPosition(fx, fy, fz); GameObject* pGameObj = new GameObject; @@ -4755,7 +4755,7 @@ void Spell::EffectTransmitted() duration = std::min(duration, duration - lastSec*IN_MILLISECONDS + FISHING_BOBBER_READY_TIME*IN_MILLISECONDS); break; } - case GAMEOBJECT_TYPE_SUMMONING_RITUAL: + case GAMEOBJECT_TYPE_RITUAL: { if (unitCaster->GetTypeId() == TYPEID_PLAYER) { |