Merge branch 'fixes'

4 years ago · d6dcd13938
parent 72d29ef8f6
commit d6dcd13938
1 changed files with 1 additions and 1 deletions
--- a/ryzom/server/src/ai_service/messages.cpp
+++ b/ryzom/server/src/ai_service/messages.cpp
@ -1153,7 +1153,7 @@ void	sAggroGain(TDataSetRow playerBot, TDataSetRow targetBot)
 	CAIGainAggroMsg	msg(targetBot, playerBot, false);
 	msg.send("EGS");
-	if (entity->getActionFlags() & RYZOMACTIONFLAGS::InWater)
+	if (entity && entity->getRyzomType()==RYZOMID::player && (entity->getActionFlags() & RYZOMACTIONFLAGS::InWater))
 		return;
 	CAIEntityPhysical *botEntity = CAIEntityPhysicalLocator::getInstance()->getEntity(targetBot);