pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-11 03:31:08 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into aa

Browse Source
This commit is contained in:
Michael Cook (mackal)
2015-06-19 21:44:58 -04:00
parent 94f47e7adf 5481847987
commit 6621a125e6
7 changed files with 3177 additions and 5841 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/attack.cpp
+1 -1
View File
@@ -4248,7 +4248,7 @@ void Mob::TryCriticalHit(Mob *defender, uint16 skill, int32 &damage, ExtraAttack
}
#ifdef BOTS
if (this->IsPet() && this->GetOwner()->IsBot()) {
if (this->IsPet() && this->GetOwner() && this->GetOwner()->IsBot()) {
this->TryPetCriticalHit(defender,skill,damage);
return;
}