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

Merge branch 'master' into 310

Browse source 
Conflicts:
	src/game/Unit.cpp
This commit is contained in:
tomrus88 2009-04-03 21:21:40 +04:00
commit 3ad6044f72
11 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/game/Unit.cpp
View file

@ -10641,7 +10641,7 @@ Player* Unit::GetSpellModOwner()
void Unit::SendPetCastFail(uint32 spellid, SpellCastResult msg)
{
if(msg == SPELL_CAST_OK)
return;
return;
Unit *owner = GetCharmerOrOwner();
if(!owner || owner->GetTypeId() != TYPEID_PLAYER)