Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-20 17:27:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix script started twice for Gobber (GO type=10) with eventID.

Browse Source 
Fixes issue #1589.
With help of Az@zel, thanks.

--HG--
branch : trunk
This commit is contained in:
Trazom62
2010-04-11 23:49:00 +02:00
parent e2ed15655b
commit d9367da5f2
2 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/game/GameObject.cpp
View File

@@ -1137,6 +1137,7 @@ void GameObject::Use(Unit* user)
{
sLog.outDebug("Goober ScriptStart id %u for GO entry %u (GUID %u).", info->goober.eventId, GetEntry(), GetDBTableGUIDLow());
GetMap()->ScriptsStart(sEventScripts, info->goober.eventId, player, this);
EventInform(info->goober.eventId);
}
// possible quest objective for active quests
@@ -1147,10 +1148,8 @@ void GameObject::Use(Unit* user)
break;
}
if (BattleGround* bg = player->GetBattleGround())
{
bg->EventPlayerUsedGO(player, this);
}
if (BattleGround* bg = player->GetBattleGround())
bg->EventPlayerUsedGO(player, this);
player->CastedCreatureOrGO(info->id, GetGUID(), 0);
}

7
src/game/SpellEffects.cpp
View File

@@ -3346,13 +3346,6 @@ 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;