josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix a crash in GameObject::TakenDamage

Browse Source 
Fixes issue 2082

--HG--
branch : trunk
This commit is contained in:
Spp
2010-05-09 21:32:49 +02:00
parent 02dfc46849
commit 3b3f0caa69
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/GameObject.cpp
+7 -5
View File
@@ -1576,11 +1576,13 @@ void GameObject::TakenDamage(uint32 damage, Unit *who)
return; return;
Player* pwho = NULL; Player* pwho = NULL;
if (who && who->GetTypeId() == TYPEID_PLAYER) if (who)
pwho = who->ToPlayer(); {
if (who->GetTypeId() == TYPEID_PLAYER)
if (who && who->IsVehicle()) pwho = who->ToPlayer();
pwho = who->GetCharmerOrOwner()->ToPlayer(); else if (who->IsVehicle() && who->GetCharmerOrOwner())
pwho = who->GetCharmerOrOwner()->ToPlayer();
}
if (m_goValue->building.health > damage) if (m_goValue->building.health > damage)
m_goValue->building.health -= damage; m_goValue->building.health -= damage;