[bws6] Fix TARGET_CASTER_COORDINATES after some bugs and fix Urom/Var…

…os Shields.
bwsrv · Aug 4, 2011 · 2b7cdb2 · 2b7cdb2
1 parent c8f9b0a
commit 2b7cdb2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git 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
@@ -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)