pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-03-24 20:02:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #427 from KinglyKrab/master

Browse Source 
Fixed possible bot crashes due to nullptr conflict.
This commit is contained in:
Natedog2012 2015-06-18 21:02:33 -07:00
commit a583391319
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zone/attack.cpp
View File

@ -4249,7 +4249,7 @@ void Mob::TryCriticalHit(Mob *defender, uint16 skill, int32 &damage, ExtraAttack
} }
#ifdef BOTS #ifdef BOTS
if (this->IsPet() && this->GetOwner()->IsBot()) { if (this->IsPet() && this->GetOwner() && this->GetOwner()->IsBot()) {
this->TryPetCriticalHit(defender,skill,damage); this->TryPetCriticalHit(defender,skill,damage);
return; return;
} }

2
zone/mob_ai.cpp
View File

@ -1105,7 +1105,7 @@ void Mob::AI_Process() {
} }
#ifdef BOTS #ifdef BOTS
if (IsPet() && GetOwner()->IsBot() && target == GetOwner()) if (IsPet() && GetOwner() && GetOwner()->IsBot() && target == GetOwner())
{ {
// this blocks all pet attacks against owner..bot pet test (copied above check) // this blocks all pet attacks against owner..bot pet test (copied above check)
RemoveFromHateList(this); RemoveFromHateList(this);