diff options
| author | thenecromancer <none@none> | 2010-01-28 14:42:40 +0100 |
|---|---|---|
| committer | thenecromancer <none@none> | 2010-01-28 14:42:40 +0100 |
| commit | 38209db46e0ce5bcb990061e0af3aa2e372529aa (patch) | |
| tree | 0a30806170709e9fce884ace5ed46b209c732851 /src/game/SpellEffects.cpp | |
| parent | 984a47b5414df4cdf140637e1df01fb6df9585e0 (diff) | |
| parent | 0711119de54091d84ab1ccc65656783394bda3b2 (diff) | |
Merge
--HG--
branch : trunk
Diffstat (limited to 'src/game/SpellEffects.cpp')
| -rw-r--r-- | src/game/SpellEffects.cpp | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index ed85d0767c5..86339274962 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -3290,6 +3290,13 @@ void Spell::SendLoot(uint64 guid, LootType loottype) return; case GAMEOBJECT_TYPE_GOOBER: + // goober_scripts can be triggered if the player don't have the quest + if (gameObjTarget->GetGOInfo()->goober.eventId) + { + sLog.outDebug("Goober ScriptStart id %u for GO %u",gameObjTarget->GetGOInfo()->goober.eventId,gameObjTarget->GetDBTableGUIDLow()); + player->GetMap()->ScriptsStart(sEventScripts, gameObjTarget->GetGOInfo()->goober.eventId, player, gameObjTarget); + gameObjTarget->EventInform(gameObjTarget->GetGOInfo()->goober.eventId); + } gameObjTarget->Use(m_caster); return; @@ -3746,7 +3753,7 @@ void Spell::EffectDispel(uint32 i) } bool dispel_charges = aura->GetSpellProto()->AttributesEx7 & SPELL_ATTR_EX7_DISPEL_CHARGES; - + for (uint8 i = dispel_charges ? aura->GetCharges() : aura->GetStackAmount(); i; --i) dispel_list.push_back(aura); } @@ -3867,7 +3874,7 @@ void Spell::EffectPickPocket(uint32 /*i*/) // victim have to be alive and humanoid or undead if (unitTarget->isAlive() && (unitTarget->GetCreatureTypeMask() &CREATURE_TYPEMASK_HUMANOID_OR_UNDEAD) != 0) - ((Player*)m_caster)->SendLoot(unitTarget->GetGUID(),LOOT_PICKPOCKETING); + ((Player*)m_caster)->SendLoot(unitTarget->GetGUID(),LOOT_PICKPOCKETING); } void Spell::EffectAddFarsight(uint32 i) @@ -6605,7 +6612,7 @@ void Spell::EffectQuestComplete(uint32 i) if (m_caster->GetTypeId() == TYPEID_PLAYER) pPlayer = (Player*)m_caster; - else if (unitTarget && unitTarget->GetTypeId() == TYPEID_PLAYER) + else if (unitTarget && unitTarget->GetTypeId() == TYPEID_PLAYER) pPlayer = (Player*)unitTarget; else return; @@ -7176,7 +7183,7 @@ void Spell::EffectStealBeneficialBuff(uint32 i) continue; bool dispel_charges = aura->GetSpellProto()->AttributesEx7 & SPELL_ATTR_EX7_DISPEL_CHARGES; - + for (uint8 i = dispel_charges ? aura->GetCharges() : aura->GetStackAmount(); i; --i) steal_list.push_back(aura); } |