mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-13 13:37:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote branch 'origin/master' into 330

Browse source 
Conflicts:
	src/game/Player.cpp
This commit is contained in:
tomrus88 2010-03-27 13:29:31 +03:00
commit 112046718a
25 changed files with 120 additions and 157 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/game/Level3.cpp
View file

@ -4889,18 +4889,18 @@ bool ChatHandler::HandleQuestComplete(const char* args)
if(uint32 spell_id = pQuest->ReqSpell[i])
{
for(uint16 z = 0; z < creaturecount; ++z)
player->CastedCreatureOrGO(creature, ObjectGuid::EmptyGuid, spell_id);
player->CastedCreatureOrGO(creature, ObjectGuid(), spell_id);
}
else if(creature > 0)
{
if(CreatureInfo const* cInfo = ObjectMgr::GetCreatureTemplate(creature))
for(uint16 z = 0; z < creaturecount; ++z)
player->KilledMonster(cInfo, ObjectGuid::EmptyGuid);
player->KilledMonster(cInfo, ObjectGuid());
}
else if(creature < 0)
{
for(uint16 z = 0; z < creaturecount; ++z)
player->CastedCreatureOrGO(-creature, ObjectGuid::EmptyGuid, 0);
player->CastedCreatureOrGO(-creature, ObjectGuid(), 0);
}
}