pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-13 18:51:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed more possible nullptr related bot crashes.

Browse Source
This commit is contained in:
Kinglykrab 2015-06-19 01:42:01 -04:00
parent a583391319
commit 56e064751b
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
zone/bot.cpp
View File

@ -11359,7 +11359,7 @@ void Bot::ProcessBotCommands(Client *c, const Seperator *sep) {
// pull // pull
if(!strcasecmp(sep->arg[1], "pull")) { if(!strcasecmp(sep->arg[1], "pull")) {
Mob *target = c->GetTarget(); Mob *target = c->GetTarget();
if(target == nullptr || target == c || target->IsBot() || (target->IsPet() && target->GetOwner()->IsBot())) if(target == nullptr || target == c || target->IsBot() || (target->IsPet() && target->GetOwner() && target->GetOwner()->IsBot()))
{ {
c->Message(15, "You must select a monster"); c->Message(15, "You must select a monster");
return; return;
@ -12381,7 +12381,7 @@ void Bot::ProcessBotCommands(Client *c, const Seperator *sep) {
if(!strcasecmp(sep->arg[1], "ai") && !strcasecmp(sep->arg[2], "mez")) if(!strcasecmp(sep->arg[1], "ai") && !strcasecmp(sep->arg[2], "mez"))
{ {
Mob *target = c->GetTarget(); Mob *target = c->GetTarget();
if(target == nullptr || target == c || target->IsBot() || (target->IsPet() && target->GetOwner()->IsBot())) if(target == nullptr || target == c || target->IsBot() || (target->IsPet() && target->GetOwner() && target->GetOwner()->IsBot()))
{ {
c->Message(15, "You must select a monster"); c->Message(15, "You must select a monster");
return; return;
@ -12631,7 +12631,7 @@ void Bot::ProcessBotCommands(Client *c, const Seperator *sep) {
{ {
Mob *target = c->GetTarget(); Mob *target = c->GetTarget();
if(target == nullptr || target->IsClient() || target->IsBot() || target->IsPet() && target->GetOwner()->IsBot()) if(target == nullptr || target->IsClient() || target->IsBot() || (target->IsPet() && target->GetOwner() && target->GetOwner()->IsBot()))
c->Message(15, "You must select a monster"); c->Message(15, "You must select a monster");
else { else {
if(c->IsGrouped()) { if(c->IsGrouped()) {
@ -12683,7 +12683,7 @@ void Bot::ProcessBotCommands(Client *c, const Seperator *sep) {
if(!strcasecmp(sep->arg[1], "charm")) if(!strcasecmp(sep->arg[1], "charm"))
{ {
Mob *target = c->GetTarget(); Mob *target = c->GetTarget();
if(target == nullptr || target->IsClient() || target->IsBot() || (target->IsPet() && target->GetOwner()->IsBot())) if(target == nullptr || target->IsClient() || target->IsBot() || (target->IsPet() && target->GetOwner() && target->GetOwner()->IsBot()))
{ {
c->Message(15, "You must select a monster"); c->Message(15, "You must select a monster");
return; return;
@ -12796,7 +12796,7 @@ void Bot::ProcessBotCommands(Client *c, const Seperator *sep) {
if(!strcasecmp(sep->arg[1], "Dire") && !strcasecmp(sep->arg[2], "Charm")) if(!strcasecmp(sep->arg[1], "Dire") && !strcasecmp(sep->arg[2], "Charm"))
{ {
Mob *target = c->GetTarget(); Mob *target = c->GetTarget();
if(target == nullptr || target->IsClient() || target->IsBot() || (target->IsPet() && target->GetOwner()->IsBot())) if(target == nullptr || target->IsClient() || target->IsBot() || (target->IsPet() && target->GetOwner() && target->GetOwner()->IsBot()))
{ {
c->Message(15, "You must select a monster"); c->Message(15, "You must select a monster");
return; return;