From 2b7cdb24413b7e4dbc8b4d366541bde35ff8c8ad Mon Sep 17 00:00:00 2001 From: mosst Date: Thu, 4 Aug 2011 12:03:18 +0300 Subject: [PATCH] [bws6] Fix TARGET_CASTER_COORDINATES after some bugs and fix Urom/Varos Shields. --- src/game/Spell.cpp | 9 ++++++--- src/game/SpellAuras.cpp | 3 +++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp index 5086ab0be..231ca91e2 100644 --- a/src/game/Spell.cpp +++ b/src/game/Spell.cpp @@ -2473,9 +2473,12 @@ void Spell::SetTargetMap(SpellEffectIndex effIndex, uint32 targetMode, UnitList& break; case TARGET_CASTER_COORDINATES: { - // Check original caster is GO - set its coordinates as dst cast - if (WorldObject *caster = GetCastingObject()) - m_targets.setDestination(caster->GetPositionX(), caster->GetPositionY(), caster->GetPositionZ()); + if (WorldObject *caster = GetCastingObject()) //Becouse with SetDest Spell Animation under caster, need on target! + { + m_targets.m_destX = caster->GetPositionX(); + m_targets.m_destY = caster->GetPositionY(); + m_targets.m_destZ = caster->GetPositionZ(); + } break; } case TARGET_ALL_HOSTILE_UNITS_AROUND_CASTER: diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp index 576f80f65..3fcd53c42 100644 --- a/src/game/SpellAuras.cpp +++ b/src/game/SpellAuras.cpp @@ -3181,6 +3181,9 @@ void Aura::HandleAuraDummy(bool apply, bool Real) case 50053: // Varos Shield target->ApplyModFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE, apply); target->ApplyModFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PASSIVE, apply); + + if (!apply) + target->InterruptNonMeleeSpells(false); //Effect 2 has channel effect return; case 54852: // Drakkari Colossus Stun (Hmmm... I'm lookup all stun effect spell, but not find needed!) if (apply)