diff options
| author | megamage <none@none> | 2009-03-09 18:09:00 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-03-09 18:09:00 -0600 |
| commit | 0684515b90f70f9b89cd1060c6604afe87a4b187 (patch) | |
| tree | 347c3ac599a3f830b438d5634cc582f916ef5dcd /src | |
| parent | 5f7a2b43553fdb872d396686d3c985fe82a5573f (diff) | |
[7431] Fix the gnome racial spell Author: Lightguard
--HG--
branch : trunk
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/SpellEffects.cpp | 33 | ||||
| -rw-r--r-- | src/shared/revision_nr.h | 2 |
2 files changed, 10 insertions, 25 deletions
diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index 5eeeb7ff9a9..8e289a77112 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -2168,28 +2168,6 @@ void Spell::EffectTeleportUnits(uint32 i) // If not exist data for dest location - return if(!m_targets.HasDest()) { -<<<<<<< HEAD:src/game/SpellEffects.cpp - sLog.outError( "Spell::EffectTeleportUnits - does not have destination for spell ID %u\n", m_spellInfo->Id ); - return; - } - // Init dest coordinates - int32 mapid = m_targets.m_mapId; - if(mapid < 0) mapid = (int32)unitTarget->GetMapId(); - float x = m_targets.m_destX; - float y = m_targets.m_destY; - float z = m_targets.m_destZ; - float orientation = m_targets.getUnitTarget() ? m_targets.getUnitTarget()->GetOrientation() : unitTarget->GetOrientation(); - sLog.outDebug("Spell::EffectTeleportUnits - teleport unit to %u %f %f %f\n", mapid, x, y, z); - // Teleport - if(unitTarget->GetTypeId() == TYPEID_PLAYER) - ((Player*)unitTarget)->TeleportTo(mapid, x, y, z, orientation, TELE_TO_NOT_LEAVE_COMBAT | TELE_TO_NOT_UNSUMMON_PET | (unitTarget==m_caster ? TELE_TO_SPELL : 0)); - else - { - MapManager::Instance().GetMap(mapid, m_caster)->CreatureRelocation((Creature*)unitTarget, x, y, z, orientation); - WorldPacket data; - unitTarget->BuildTeleportAckMsg(&data, x, y, z, orientation); - unitTarget->SendMessageToSet(&data, false); -======= case TARGET_INNKEEPER_COORDINATES: { // Only players can teleport to innkeeper @@ -4884,7 +4862,7 @@ void Spell::EffectScriptEffect(uint32 effIndex) unitTarget->CastSpell(unitTarget, 25863, false); else unitTarget->CastSpell(unitTarget, 26655, false); - break; + return; } // Piccolo of the Flaming Fire case 17512: @@ -4892,7 +4870,14 @@ void Spell::EffectScriptEffect(uint32 effIndex) if(!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER) return; unitTarget->HandleEmoteCommand(EMOTE_STATE_DANCE); - break; + return; + } + // Escape artist + case 20589: + { + m_caster->RemoveSpellsCausingAura(SPELL_AURA_MOD_ROOT); + m_caster->RemoveSpellsCausingAura(SPELL_AURA_MOD_DECREASE_SPEED); + return; } // Escape artist case 20589: diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index c10f61e60e7..3c7f5d4a653 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 "7428" + #define REVISION_NR "7431" #endif // __REVISION_NR_H__ |