diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index c7b949ec9..6762c51db 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -7964,7 +7964,6 @@ void Spell::EffectScriptEffect(SpellEffectEntry const* effect) } // These are not restored case POWER_FOCUS: - case POWER_HAPPINESS: case POWER_RUNE: case POWER_HEALTH: break; @@ -9945,7 +9944,7 @@ void Spell::EffectCancelAura(SpellEffectEntry const* effect) unitTarget->RemoveAurasDueToSpell(spellId); } -void Spell::EffectKnockBackFromPosition(SpellEffectIndex eff_idx) +void Spell::EffectKnockBackFromPosition(SpellEffectEntry const* effect) { if (!unitTarget) return; @@ -9957,7 +9956,7 @@ void Spell::EffectKnockBackFromPosition(SpellEffectIndex eff_idx) m_caster->GetPosition(x, y, z); float angle = unitTarget->GetAngle(x,y) + M_PI_F; - float horizontalSpeed = m_spellInfo->EffectMiscValue[eff_idx] * 0.1f; + float horizontalSpeed = effect->EffectMiscValue * 0.1f; float verticalSpeed = damage * 0.1f; unitTarget->KnockBackWithAngle(angle, horizontalSpeed, verticalSpeed); } diff --git a/src/game/SpellHandler.cpp b/src/game/SpellHandler.cpp index 244c9966b..0ab28d649 100644 --- a/src/game/SpellHandler.cpp +++ b/src/game/SpellHandler.cpp @@ -353,7 +353,7 @@ void WorldSession::HandleCastSpellOpcode(WorldPacket& recvPacket) } DEBUG_LOG("WORLD: got cast spell packet, spellId - %u, cast_count: %u, cast_flags %u, data length = " SIZEFMTD, - spellId, cast_count, unk_flags, recvPacket.size()); + spellId, cast_count, cast_flags, recvPacket.size()); SpellEntry const* spellInfo = sSpellStore.LookupEntry(spellId); diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 6743ba7d2..33de05992 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "12133" + #define REVISION_NR "12134" #endif // __REVISION_NR_H__