From cd7584f512a224e409e9159c456b07f125840bd0 Mon Sep 17 00:00:00 2001 From: Uleat Date: Tue, 5 Nov 2019 18:31:21 -0500 Subject: [PATCH] Fix for Merc::CheckAETaunt() server crash --- zone/merc.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zone/merc.cpp b/zone/merc.cpp index 365e442ee..13f352033 100644 --- a/zone/merc.cpp +++ b/zone/merc.cpp @@ -4169,7 +4169,7 @@ bool Merc::CheckAETaunt() { if(g) { for(int i = 0; i < g->GroupCount(); i++) { //if(npc->IsOnHatelist(g->members[i]) && g->members[i]->GetTarget() != npc && g->members[i]->IsEngaged()) { - if(GetTarget() != npc && g->members[i]->GetTarget() != npc && npc->IsOnHatelist(g->members[i])) { + if(GetTarget() != npc && g->members[i] && g->members[i]->GetTarget() != npc && npc->IsOnHatelist(g->members[i])) { result++; } }