diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/MiscHandler.cpp | 3 | ||||
| -rw-r--r-- | src/game/SharedDefines.h | 2 | ||||
| -rw-r--r-- | src/game/SocialMgr.cpp | 25 | ||||
| -rw-r--r-- | src/game/SocialMgr.h | 4 | ||||
| -rw-r--r-- | src/game/Spell.cpp | 185 | ||||
| -rw-r--r-- | src/game/Spell.h | 14 | ||||
| -rw-r--r-- | src/game/SpellAuras.cpp | 28 | ||||
| -rw-r--r-- | src/game/SpellAuras.h | 13 | ||||
| -rw-r--r-- | src/game/Unit.cpp | 6 |
9 files changed, 159 insertions, 121 deletions
diff --git a/src/game/MiscHandler.cpp b/src/game/MiscHandler.cpp index 474199213af..9d08539497a 100644 --- a/src/game/MiscHandler.cpp +++ b/src/game/MiscHandler.cpp @@ -772,7 +772,8 @@ void WorldSession::HandleAddIgnoreOpcode( WorldPacket & recv_data ) { ignoreResult = FRIEND_IGNORE_ADDED; - _player->GetSocial()->AddToSocialList(GUID_LOPART(IgnoreGuid), true); + if(!_player->GetSocial()->AddToSocialList(GUID_LOPART(IgnoreGuid), true)) + ignoreResult = FRIEND_IGNORE_FULL; } else if(ignoreResult==FRIEND_IGNORE_ALREADY) { diff --git a/src/game/SharedDefines.h b/src/game/SharedDefines.h index 26cd729f887..756e03ecb0c 100644 --- a/src/game/SharedDefines.h +++ b/src/game/SharedDefines.h @@ -599,7 +599,7 @@ enum SpellEffects SPELL_EFFECT_SUMMON_TOTEM_SLOT4 = 90, SPELL_EFFECT_THREAT_ALL = 91, SPELL_EFFECT_ENCHANT_HELD_ITEM = 92, - SPELL_EFFECT_SUMMON_PHANTASM = 93, + SPELL_EFFECT_SUMMON_PHANTASM = 93, //unused SPELL_EFFECT_SELF_RESURRECT = 94, SPELL_EFFECT_SKINNING = 95, SPELL_EFFECT_CHARGE = 96, diff --git a/src/game/SocialMgr.cpp b/src/game/SocialMgr.cpp index 9005c2820eb..83995b875ca 100644 --- a/src/game/SocialMgr.cpp +++ b/src/game/SocialMgr.cpp @@ -41,11 +41,30 @@ PlayerSocial::~PlayerSocial() m_playerSocialMap.clear(); } +uint32 PlayerSocial::GetNumberOfSocialsWithFlag(SocialFlag flag) +{ + uint32 counter = 0; + for(PlayerSocialMap::iterator itr = m_playerSocialMap.begin(); itr != m_playerSocialMap.end(); ++itr) + { + if(itr->second.Flags & flag) + counter++; + } + return counter; +} + bool PlayerSocial::AddToSocialList(uint32 friend_guid, bool ignore) { - // client limit - if(m_playerSocialMap.size() >= 50) - return false; + // check client limits + if(ignore) + { + if(GetNumberOfSocialsWithFlag(SOCIAL_FLAG_IGNORED) >= SOCIALMGR_IGNORE_LIMIT) + return false; + } + else + { + if(GetNumberOfSocialsWithFlag(SOCIAL_FLAG_FRIEND) >= SOCIALMGR_FRIEND_LIMIT) + return false; + } uint32 flag = SOCIAL_FLAG_FRIEND; if(ignore) diff --git a/src/game/SocialMgr.h b/src/game/SocialMgr.h index 5566c63ddf2..c5df12864c8 100644 --- a/src/game/SocialMgr.h +++ b/src/game/SocialMgr.h @@ -111,6 +111,9 @@ enum FriendsResult FRIEND_UNKNOWN = 0x1A // Unknown friend response from server }; +#define SOCIALMGR_FRIEND_LIMIT 50 +#define SOCIALMGR_IGNORE_LIMIT 25 + class PlayerSocial { friend class SocialMgr; @@ -128,6 +131,7 @@ class PlayerSocial bool HasIgnore(uint32 ignore_guid); uint32 GetPlayerGUID() { return m_playerGUID; } void SetPlayerGUID(uint32 guid) { m_playerGUID = guid; } + uint32 GetNumberOfSocialsWithFlag(SocialFlag flag); private: PlayerSocialMap m_playerSocialMap; uint32 m_playerGUID; diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp index 512c5533885..f81454e0cc0 100644 --- a/src/game/Spell.cpp +++ b/src/game/Spell.cpp @@ -75,6 +75,7 @@ SpellCastTargets::SpellCastTargets() m_itemTargetEntry = 0; m_srcX = m_srcY = m_srcZ = m_destX = m_destY = m_destZ = 0; + m_hasDest = false; m_strTarget = ""; m_targetMask = 0; } @@ -88,20 +89,32 @@ void SpellCastTargets::setUnitTarget(Unit *target) if (!target) return; - m_destX = target->GetPositionX(); - m_destY = target->GetPositionY(); - m_destZ = target->GetPositionZ(); m_unitTarget = target; m_unitTargetGUID = target->GetGUID(); m_targetMask |= TARGET_FLAG_UNIT; } -void SpellCastTargets::setDestination(float x, float y, float z) +void SpellCastTargets::setDestination(float x, float y, float z, bool send) { m_destX = x; m_destY = y; m_destZ = z; - m_targetMask |= TARGET_FLAG_DEST_LOCATION; + m_hasDest = true; + if(send) + m_targetMask |= TARGET_FLAG_DEST_LOCATION; +} + +void SpellCastTargets::setDestination(Unit *target, bool send) +{ + if(!target) + return; + + m_destX = target->GetPositionX(); + m_destY = target->GetPositionY(); + m_destZ = target->GetPositionZ(); + m_hasDest = true; + if(send) + m_targetMask |= TARGET_FLAG_DEST_LOCATION; } void SpellCastTargets::setGOTarget(GameObject *target) @@ -159,9 +172,9 @@ bool SpellCastTargets::read ( WorldPacket * data, Unit *caster ) if(m_targetMask == TARGET_FLAG_SELF) { - m_destX = caster->GetPositionX(); - m_destY = caster->GetPositionY(); - m_destZ = caster->GetPositionZ(); + //m_destX = caster->GetPositionX(); + //m_destY = caster->GetPositionY(); + //m_destZ = caster->GetPositionZ(); m_unitTarget = caster; m_unitTargetGUID = caster->GetGUID(); return true; @@ -179,7 +192,7 @@ bool SpellCastTargets::read ( WorldPacket * data, Unit *caster ) if(!readGUID(*data, m_itemTargetGUID)) return false; - if( m_targetMask & TARGET_FLAG_SOURCE_LOCATION ) + /*if( m_targetMask & TARGET_FLAG_SOURCE_LOCATION ) { if(data->rpos()+4+4+4 > data->size()) return false; @@ -187,14 +200,15 @@ bool SpellCastTargets::read ( WorldPacket * data, Unit *caster ) *data >> m_srcX >> m_srcY >> m_srcZ; if(!Trinity::IsValidMapCoord(m_srcX, m_srcY, m_srcZ)) return false; - } + }*/ - if( m_targetMask & TARGET_FLAG_DEST_LOCATION ) + if( m_targetMask & (TARGET_FLAG_SOURCE_LOCATION | TARGET_FLAG_DEST_LOCATION) ) { if(data->rpos()+4+4+4 > data->size()) return false; *data >> m_destX >> m_destY >> m_destZ; + m_hasDest = true; if(!Trinity::IsValidMapCoord(m_destX, m_destY, m_destZ)) return false; } @@ -414,16 +428,59 @@ void Spell::FillTargetMap() SetTargetMap(i,m_spellInfo->EffectImplicitTargetB[i],tmpUnitMap); } + if(m_targets.HasDest()) + { + switch(m_spellInfo->Effect[i]) + { + case SPELL_EFFECT_SUMMON: + case SPELL_EFFECT_SUMMON_WILD: + case SPELL_EFFECT_SUMMON_GUARDIAN: + case SPELL_EFFECT_SUMMON_PET: + case SPELL_EFFECT_SUMMON_POSSESSED: + case SPELL_EFFECT_SUMMON_TOTEM: + case SPELL_EFFECT_SUMMON_OBJECT_WILD: + case SPELL_EFFECT_SUMMON_TOTEM_SLOT1: + case SPELL_EFFECT_SUMMON_TOTEM_SLOT2: + case SPELL_EFFECT_SUMMON_TOTEM_SLOT3: + case SPELL_EFFECT_SUMMON_TOTEM_SLOT4: + case SPELL_EFFECT_SUMMON_CRITTER: + case SPELL_EFFECT_SUMMON_OBJECT_SLOT1: + case SPELL_EFFECT_SUMMON_OBJECT_SLOT2: + case SPELL_EFFECT_SUMMON_OBJECT_SLOT3: + case SPELL_EFFECT_SUMMON_OBJECT_SLOT4: + case SPELL_EFFECT_SUMMON_DEAD_PET: + case SPELL_EFFECT_SUMMON_DEMON: + { + tmpUnitMap.push_back(m_caster); + break; + } + } + } + + if(!m_spellInfo->EffectImplicitTargetA[i]) + { + switch(m_spellInfo->Effect[i]) + { + case SPELL_EFFECT_PARRY: + case SPELL_EFFECT_BLOCK: + case SPELL_EFFECT_SKILL: // always with dummy 3 as A + case SPELL_EFFECT_LEARN_SPELL: + tmpUnitMap.push_back(m_caster); + break; + } + } + if(tmpUnitMap.empty()) { - if( m_spellInfo->EffectImplicitTargetA[i]==TARGET_SCRIPT || + /*if( m_spellInfo->EffectImplicitTargetA[i]==TARGET_SCRIPT || m_spellInfo->EffectImplicitTargetB[i]==TARGET_SCRIPT || m_spellInfo->EffectImplicitTargetA[i]==TARGET_SCRIPT_COORDINATES || m_spellInfo->EffectImplicitTargetB[i]==TARGET_SCRIPT_COORDINATES ) { if(!(m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION)) continue; - } + }*/ + // add here custom effects that need default target. // FOR EVERY TARGET TYPE THERE IS A DIFFERENT FILL!! switch(m_spellInfo->Effect[i]) @@ -499,16 +556,11 @@ void Spell::FillTargetMap() break; } case SPELL_EFFECT_RESURRECT: - case SPELL_EFFECT_PARRY: - case SPELL_EFFECT_BLOCK: case SPELL_EFFECT_CREATE_ITEM: case SPELL_EFFECT_TRIGGER_SPELL: case SPELL_EFFECT_TRIGGER_MISSILE: - case SPELL_EFFECT_LEARN_SPELL: case SPELL_EFFECT_SKILL_STEP: case SPELL_EFFECT_PROFICIENCY: - case SPELL_EFFECT_SUMMON_POSSESSED: - case SPELL_EFFECT_SUMMON_OBJECT_WILD: case SPELL_EFFECT_SELF_RESURRECT: case SPELL_EFFECT_REPUTATION: if(m_targets.getUnitTarget()) @@ -536,28 +588,11 @@ void Spell::FillTargetMap() } } break; - case SPELL_EFFECT_SUMMON: - if(m_spellInfo->EffectMiscValueB[i] == SUMMON_TYPE_POSESSED || m_spellInfo->EffectMiscValueB[i] == SUMMON_TYPE_POSESSED2) - { - if(m_targets.getUnitTarget()) - tmpUnitMap.push_back(m_targets.getUnitTarget()); - } - else - tmpUnitMap.push_back(m_caster); - break; case SPELL_EFFECT_SUMMON_CHANGE_ITEM: - case SPELL_EFFECT_SUMMON_WILD: - case SPELL_EFFECT_SUMMON_GUARDIAN: case SPELL_EFFECT_TRANS_DOOR: case SPELL_EFFECT_ADD_FARSIGHT: case SPELL_EFFECT_STUCK: case SPELL_EFFECT_DESTROY_ALL_TOTEMS: - case SPELL_EFFECT_SUMMON_DEMON: - case SPELL_EFFECT_SKILL: - case SPELL_EFFECT_SUMMON_OBJECT_SLOT1: - case SPELL_EFFECT_SUMMON_OBJECT_SLOT2: - case SPELL_EFFECT_SUMMON_OBJECT_SLOT3: - case SPELL_EFFECT_SUMMON_OBJECT_SLOT4: tmpUnitMap.push_back(m_caster); break; case SPELL_EFFECT_LEARN_PET_SPELL: @@ -1217,7 +1252,7 @@ void Spell::SearchChainTarget(std::list<Unit*> &TagUnitMap, Unit* pUnitTarget, f void Spell::SearchAreaTarget(std::list<Unit*> &TagUnitMap, float radius, const uint32 &type, SpellTargets TargetType, uint32 entry) { - if(type == PUSH_DEST_CENTER && !m_targets.m_destX && !m_targets.m_destY && !m_targets.m_destZ) + if(type == PUSH_DEST_CENTER && !m_targets.HasDest()) { sLog.outError( "SPELL: cannot find destination for spell ID %u\n", m_spellInfo->Id ); return; @@ -1296,6 +1331,8 @@ void Spell::SetTargetMap(uint32 i,uint32 cur,std::list<Unit*> &TagUnitMap) uint32 EffectChainTarget = m_spellInfo->EffectChainTarget[i]; uint32 unMaxTargets = m_spellInfo->MaxAffectedTargets; + if(!unMaxTargets) + unMaxTargets = spellmgr.GetSpellExtraAttr(m_spellInfo->Id, SPELL_EXTRA_ATTR_MAX_TARGETS); if(m_originalCaster) { if(Player* modOwner = m_originalCaster->GetSpellModOwner()) @@ -1360,53 +1397,68 @@ void Spell::SetTargetMap(uint32 i,uint32 cur,std::list<Unit*> &TagUnitMap) AddItemTarget(m_targets.getItemTarget(), i); }break; + // channel + case TARGET_SINGLE_ENEMY: + if(m_caster->m_currentSpells[CURRENT_CHANNELED_SPELL]) + { + if(Unit* target = m_caster->m_currentSpells[CURRENT_CHANNELED_SPELL]->m_targets.getUnitTarget()) + TagUnitMap.push_back(target); + else + sLog.outError( "SPELL: cannot find channel spell target for spell ID %u\n", m_spellInfo->Id ); + } + else + sLog.outError( "SPELL: no current channeled spell for spell ID %u\n", m_spellInfo->Id ); + break; + case TARGET_DEST_CHANNEL: + if(m_caster->m_currentSpells[CURRENT_CHANNELED_SPELL]) + { + if(m_caster->m_currentSpells[CURRENT_CHANNELED_SPELL]->m_targets.HasDest()) + m_targets = m_caster->m_currentSpells[CURRENT_CHANNELED_SPELL]->m_targets; + else + sLog.outError( "SPELL: cannot find channel spell destination for spell ID %u\n", m_spellInfo->Id ); + } + else + sLog.outError( "SPELL: no current channeled spell for spell ID %u\n", m_spellInfo->Id ); + break; + // reference dest case TARGET_EFFECT_SELECT: - m_targets.m_targetMask |= TARGET_FLAG_DEST_LOCATION; + m_targets.setDestination(m_caster, true); + break; case TARGET_ALL_AROUND_CASTER: - { - if(!unMaxTargets) - unMaxTargets = spellmgr.GetSpellExtraAttr(m_spellInfo->Id, SPELL_EXTRA_ATTR_MAX_TARGETS); - m_caster->GetPosition(m_targets.m_destX, m_targets.m_destY, m_targets.m_destZ); - }break; + m_targets.setDestination(m_caster, false); + break; case TARGET_CURRENT_ENEMY_COORDINATES: - m_targets.m_targetMask |= TARGET_FLAG_DEST_LOCATION; + m_targets.setDestination(m_targets.getUnitTarget(), true); + break; case TARGET_DUELVSPLAYER_COORDINATES: // no ground? - { - if(Unit* currentTarget = m_targets.getUnitTarget()) - currentTarget->GetPosition(m_targets.m_destX, m_targets.m_destY, m_targets.m_destZ); - }break; + m_targets.setDestination(m_targets.getUnitTarget(), false); + break; case TARGET_DEST_TABLE_UNKNOWN2: case TARGET_TABLE_X_Y_Z_COORDINATES: - { - SpellTargetPosition const* st = spellmgr.GetSpellTargetPosition(m_spellInfo->Id); - if(st) + if(SpellTargetPosition const* st = spellmgr.GetSpellTargetPosition(m_spellInfo->Id)) { if (st->target_mapId == m_caster->GetMapId()) m_targets.setDestination(st->target_X, st->target_Y, st->target_Z); } else sLog.outError( "SPELL: unknown target coordinates for spell ID %u\n", m_spellInfo->Id ); - }break; + break; // area targets case TARGET_AREAEFFECT_CUSTOM: case TARGET_ALL_ENEMY_IN_AREA_INSTANT: - { if(m_spellInfo->Effect[i] == SPELL_EFFECT_PERSISTENT_AREA_AURA) break; m_targets.m_targetMask |= TARGET_FLAG_DEST_LOCATION; - } case TARGET_ALL_ENEMY_IN_AREA: - { SearchAreaTarget(TagUnitMap, radius, PUSH_DEST_CENTER, SPELL_TARGETS_AOE_DAMAGE); - }break; + break; case TARGET_ALL_FRIENDLY_UNITS_IN_AREA: m_targets.m_targetMask |= TARGET_FLAG_DEST_LOCATION; case TARGET_ALL_FRIENDLY_UNITS_AROUND_CASTER: - { SearchAreaTarget(TagUnitMap, radius, PUSH_DEST_CENTER, SPELL_TARGETS_FRIENDLY); - }break; + break; //case TARGET_AREAEFFECT_CUSTOM: // m_targets.m_targetMask |= TARGET_FLAG_DEST_LOCATION; case TARGET_UNIT_AREA_ENTRY: @@ -1451,7 +1503,6 @@ void Spell::SetTargetMap(uint32 i,uint32 cur,std::list<Unit*> &TagUnitMap) SearchAreaTarget(TagUnitMap, radius, PUSH_IN_FRONT, SPELL_TARGETS_FRIENDLY); }break; - // nearby target case TARGET_UNIT_NEARBY_ALLY: { @@ -1694,17 +1745,6 @@ void Spell::SetTargetMap(uint32 i,uint32 cur,std::list<Unit*> &TagUnitMap) cell_lock->Visit(cell_lock, grid_object_notifier, *MapManager::Instance().GetMap(m_caster->GetMapId(), m_caster)); } }break; - case TARGET_MINION: - { - if(m_spellInfo->Effect[i] != SPELL_EFFECT_DUEL) - TagUnitMap.push_back(m_caster); - }break; - case TARGET_SINGLE_ENEMY: - { - Unit* pUnitTarget = SelectMagnetTarget(); - if(pUnitTarget) - TagUnitMap.push_back(pUnitTarget); - }break; case TARGET_AREAEFFECT_PARTY: { Unit* owner = m_caster->GetCharmerOrOwner(); @@ -1878,6 +1918,9 @@ void Spell::SetTargetMap(uint32 i,uint32 cur,std::list<Unit*> &TagUnitMap) case TARGET_DEST_CASTER_BACK_RIGHT: case TARGET_DEST_CASTER_FRONT_RIGHT: case TARGET_DEST_CASTER_FRONT: + case TARGET_MINION: + case TARGET_DEST_CASTER_FRONT_LEAP: + case TARGET_DEST_CASTER_FRONT_UNKNOWN: case TARGET_DEST_CASTER_BACK: case TARGET_DEST_CASTER_RIGHT: case TARGET_DEST_CASTER_LEFT: @@ -1902,6 +1945,9 @@ void Spell::SetTargetMap(uint32 i,uint32 cur,std::list<Unit*> &TagUnitMap) case TARGET_DEST_CASTER_BACK_LEFT: angle = -3*M_PI/4; break; case TARGET_DEST_CASTER_BACK_RIGHT: angle = 3*M_PI/4; break; case TARGET_DEST_CASTER_FRONT_RIGHT:angle = M_PI/4; break; + case TARGET_MINION: + case TARGET_DEST_CASTER_FRONT_LEAP: + case TARGET_DEST_CASTER_FRONT_UNKNOWN: case TARGET_DEST_CASTER_FRONT: angle = 0.0f; break; case TARGET_DEST_CASTER_BACK: angle = M_PI; break; case TARGET_DEST_CASTER_RIGHT: angle = M_PI/2; break; @@ -1970,6 +2016,7 @@ void Spell::SetTargetMap(uint32 i,uint32 cur,std::list<Unit*> &TagUnitMap) m_targets.setDestination(px, py, pz); }break; case TARGET_SELF2: + m_targets.m_hasDest = true; break; default: break; diff --git a/src/game/Spell.h b/src/game/Spell.h index a4ce3580437..c6a18504784 100644 --- a/src/game/Spell.h +++ b/src/game/Spell.h @@ -107,13 +107,14 @@ class SpellCastTargets m_itemTargetEntry = target.m_itemTargetEntry; - m_srcX = target.m_srcX; - m_srcY = target.m_srcY; - m_srcZ = target.m_srcZ; + //m_srcX = target.m_srcX; + //m_srcY = target.m_srcY; + //m_srcZ = target.m_srcZ; m_destX = target.m_destX; m_destY = target.m_destY; m_destZ = target.m_destZ; + m_hasDest = target.m_hasDest; m_strTarget = target.m_strTarget; @@ -125,7 +126,8 @@ class SpellCastTargets uint64 getUnitTargetGUID() const { return m_unitTargetGUID; } Unit *getUnitTarget() const { return m_unitTarget; } void setUnitTarget(Unit *target); - void setDestination(float x, float y, float z); + void setDestination(float x, float y, float z, bool send = true); + void setDestination(Unit *target, bool send = true); uint64 getGOTargetGUID() const { return m_GOTargetGUID; } GameObject *getGOTarget() const { return m_GOTarget; } @@ -147,11 +149,13 @@ class SpellCastTargets } bool IsEmpty() const { return m_GOTargetGUID==0 && m_unitTargetGUID==0 && m_itemTarget==0 && m_CorpseTargetGUID==0; } + bool HasDest() const { return m_hasDest; } void Update(Unit* caster); float m_srcX, m_srcY, m_srcZ; float m_destX, m_destY, m_destZ; + bool m_hasDest; std::string m_strTarget; uint32 m_targetMask; @@ -551,7 +555,7 @@ namespace Trinity SpellTargets TargetType = SPELL_TARGETS_AOE_DAMAGE, uint32 entry = 0) : i_data(&data), i_spell(spell), i_push_type(type), i_radius(radius), i_TargetType(TargetType), i_entry(entry) { - i_originalCaster = spell.GetOriginalCaster(); + i_originalCaster = spell.GetCaster(); } template<class T> inline void Visit(GridRefManager<T> &m) diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp index 31132246e3f..5cecf67d401 100644 --- a/src/game/SpellAuras.cpp +++ b/src/game/SpellAuras.cpp @@ -471,37 +471,11 @@ PersistentAreaAura::~PersistentAreaAura() { } -SingleEnemyTargetAura::SingleEnemyTargetAura(SpellEntry const* spellproto, uint32 eff, int32 *currentBasePoints, Unit *target, -Unit *caster, Item* castItem) : Aura(spellproto, eff, currentBasePoints, target, caster, castItem) -{ - if (caster) - m_casters_target_guid = caster->GetTypeId()==TYPEID_PLAYER ? ((Player*)caster)->GetSelection() : caster->GetUInt64Value(UNIT_FIELD_TARGET); - else - m_casters_target_guid = 0; -} - -SingleEnemyTargetAura::~SingleEnemyTargetAura() -{ -} - -Unit* SingleEnemyTargetAura::GetTriggerTarget() const -{ - return ObjectAccessor::GetUnit(*m_target, m_casters_target_guid); -} - Aura* CreateAura(SpellEntry const* spellproto, uint32 eff, int32 *currentBasePoints, Unit *target, Unit *caster, Item* castItem) { if (IsAreaAuraEffect(spellproto->Effect[eff])) return new AreaAura(spellproto, eff, currentBasePoints, target, caster, castItem); - uint32 triggeredSpellId = spellproto->EffectTriggerSpell[eff]; - - SpellEntry const* triggredSpellInfo = sSpellStore.LookupEntry(triggeredSpellId); - if (triggredSpellInfo) - for (int i = 0; i < 3; ++i) - if (triggredSpellInfo->EffectImplicitTargetA[i] == TARGET_SINGLE_ENEMY) - return new SingleEnemyTargetAura(spellproto, eff, currentBasePoints, target, caster, castItem); - return new Aura(spellproto, eff, currentBasePoints, target, caster, castItem); } @@ -1907,7 +1881,7 @@ void Aura::TriggerSpell() } } // All ok cast by default case - Spell *spell = new Spell(caster, triggredSpellInfo, true, originalCasterGUID ); + Spell *spell = new Spell(m_target, triggredSpellInfo, true, originalCasterGUID ); SpellCastTargets targets; targets.setUnitTarget( target ); diff --git a/src/game/SpellAuras.h b/src/game/SpellAuras.h index 0bd58ec0dde..aa65f6af15d 100644 --- a/src/game/SpellAuras.h +++ b/src/game/SpellAuras.h @@ -361,18 +361,5 @@ class TRINITY_DLL_SPEC PersistentAreaAura : public Aura void Update(uint32 diff); }; -class TRINITY_DLL_SPEC SingleEnemyTargetAura : public Aura -{ - friend Aura* CreateAura(SpellEntry const* spellproto, uint32 eff, int32 *currentBasePoints, Unit *target, Unit *caster, Item* castItem); - - public: - ~SingleEnemyTargetAura(); - Unit* GetTriggerTarget() const; - - protected: - SingleEnemyTargetAura(SpellEntry const* spellproto, uint32 eff, int32 *currentBasePoints, Unit *target, Unit *caster = NULL, Item* castItem = NULL); - uint64 m_casters_target_guid; -}; - Aura* CreateAura(SpellEntry const* spellproto, uint32 eff, int32 *currentBasePoints, Unit *target, Unit *caster = NULL, Item* castItem = NULL); #endif diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 3fed7edc22e..8427c22b677 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -5085,7 +5085,8 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, SpellEntry const *dummySpell, uint RemoveAurasDueToSpell(triggeredByAura->GetId()); // Cast finish spell (triggeredByAura already not exist!) - CastSpell(this, 27285, true, castItem, NULL, casterGuid); + if(Unit* caster = GetUnit(*this, casterGuid)) + caster->CastSpell(this, 27285, true, castItem); return true; // no hidden cooldown } @@ -5107,7 +5108,8 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, SpellEntry const *dummySpell, uint RemoveAurasDueToSpell(triggeredByAura->GetId()); // Cast finish spell (triggeredByAura already not exist!) - CastSpell(this, 32865, true, castItem, NULL, casterGuid); + if(Unit* caster = GetUnit(*this, casterGuid)) + caster->CastSpell(this, 32865, true, castItem); return true; // no hidden cooldown } // Damage counting |