Changeset 144

Timestamp:

11/19/08 13:40:17 (17 years ago)

Author:

yumileroy

Message:

[svn] Disable combat_reach spams.
Fix holy nova. Patch provided by Disassembler.

Original author: megamage
Date: 2008-11-01 18:52:59-05:00

Location:

trunk

Files:

• sql/updates/152_world.sql (added)
• src/game/ObjectMgr.cpp (modified) (1 diff)
• src/game/SpellEffects.cpp (modified) (1 diff)

trunk/src/game/ObjectMgr.cpp

@@ -969 +969 @@
         if(mInfo->combat_reach < 0.5f)
         {
-            sLog.outErrorDb("Creature model (Entry: %u) has invalid combat reach (%f), setting it to 0.5", mInfo->modelid, mInfo->combat_reach);
+            //sLog.outErrorDb("Creature model (Entry: %u) has invalid combat reach (%f), setting it to 0.5", mInfo->modelid, mInfo->combat_reach);
             const_cast<CreatureModelInfo*>(mInfo)->combat_reach = 0.5f;
         }

trunk/src/game/SpellEffects.cpp

@@ -5480 +5480 @@
         return;
 
-    if( m_spellInfo->rangeIndex== 1)                        //self range
-    {
-        uint32 mapid = m_caster->GetMapId();
-        float dis = GetSpellRadius(sSpellRadiusStore.LookupEntry(m_spellInfo->EffectRadiusIndex[i]));
-
-        // before caster
-        float fx,fy,fz;
-        unitTarget->GetClosePoint(fx,fy,fz,unitTarget->GetObjectSize(),dis);
-        float ox,oy,oz;
-        unitTarget->GetPosition(ox,oy,oz);
-
-        float fx2,fy2,fz2;                                  // getObjectHitPos overwrite last args in any result case
-        if(VMAP::VMapFactory::createOrGetVMapManager()->getObjectHitPos(mapid, ox,oy,oz+0.5, fx,fy,oz+0.5,fx2,fy2,fz2, -0.5))
-        {
-            fx = fx2;
-            fy = fy2;
-            fz = fz2;
-            unitTarget->UpdateGroundPositionZ(fx,fy,fz);
-        }
-
-        if(unitTarget->GetTypeId() == TYPEID_PLAYER)
-            ((Player*)unitTarget)->TeleportTo(mapid, fx, fy, fz, unitTarget->GetOrientation(), TELE_TO_NOT_LEAVE_COMBAT | TELE_TO_NOT_UNSUMMON_PET | (unitTarget==m_caster ? TELE_TO_SPELL : 0));
-        else
-            MapManager::Instance().GetMap(mapid, unitTarget)->CreatureRelocation((Creature*)unitTarget, fx, fy, fz, unitTarget->GetOrientation());
-    }
+    if(!m_targets.HasDest())
+        return;
+
+    uint32 mapid = unitTarget->GetMapId();
+    float ox,oy,oz;
+    unitTarget->GetPosition(ox,oy,oz);
+
+    float fx,fy,fz;                                  // getObjectHitPos overwrite last args in any result case
+    if(VMAP::VMapFactory::createOrGetVMapManager()->getObjectHitPos(mapid, ox,oy,oz+0.5, m_targets.m_destX,m_targets.m_destY,oz+0.5,fx,fy,fz, -0.5))
+        unitTarget->UpdateGroundPositionZ(fx,fy,fz);
+
+    if(unitTarget->GetTypeId() == TYPEID_PLAYER)
+        ((Player*)unitTarget)->TeleportTo(mapid, fx, fy, fz, unitTarget->GetOrientation(), TELE_TO_NOT_LEAVE_COMBAT | TELE_TO_NOT_UNSUMMON_PET | (unitTarget==m_caster ? TELE_TO_SPELL : 0));
+    else
+        MapManager::Instance().GetMap(mapid, unitTarget)->CreatureRelocation((Creature*)unitTarget, fx, fy, fz, unitTarget->GetOrientation());
 }