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

Merge branch 'master' of https://github.com/EQEmu/Server into teleport_door

Browse Source
This commit is contained in:
Uleat 2020-01-14 19:01:18 -05:00
commit 7d45de865d
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
zone/client_packet.cpp
View File

@ -8290,11 +8290,11 @@ void Client::Handle_OP_ItemLinkClick(const EQApplicationPacket *app)
parse->EventNPC(EVENT_SAY, GetTarget()->CastToNPC(), this, response.c_str(), 0); parse->EventNPC(EVENT_SAY, GetTarget()->CastToNPC(), this, response.c_str(), 0);
if (response[0] == '#' && parse->PlayerHasQuestSub(EVENT_COMMAND)) { if (response[0] == '#' && parse->PlayerHasQuestSub(EVENT_COMMAND)) {
parse->EventPlayer(EVENT_COMMAND, this, response.substr(1).c_str(), 0); parse->EventPlayer(EVENT_COMMAND, this, response.c_str(), 0);
} }
#ifdef BOTS #ifdef BOTS
else if (response[0] == '^' && parse->PlayerHasQuestSub(EVENT_BOT_COMMAND)) { else if (response[0] == '^' && parse->PlayerHasQuestSub(EVENT_BOT_COMMAND)) {
parse->EventPlayer(EVENT_BOT_COMMAND, this, response.substr(1).c_str(), 0); parse->EventPlayer(EVENT_BOT_COMMAND, this, response.c_str(), 0);
} }
#endif #endif
else { else {
@ -8310,11 +8310,11 @@ void Client::Handle_OP_ItemLinkClick(const EQApplicationPacket *app)
else { else {
if (silentsaylink) { if (silentsaylink) {
if (response[0] == '#' && parse->PlayerHasQuestSub(EVENT_COMMAND)) { if (response[0] == '#' && parse->PlayerHasQuestSub(EVENT_COMMAND)) {
parse->EventPlayer(EVENT_COMMAND, this, response.substr(1).c_str(), 0); parse->EventPlayer(EVENT_COMMAND, this, response.c_str(), 0);
} }
#ifdef BOTS #ifdef BOTS
else if (response[0] == '^' && parse->PlayerHasQuestSub(EVENT_BOT_COMMAND)) { else if (response[0] == '^' && parse->PlayerHasQuestSub(EVENT_BOT_COMMAND)) {
parse->EventPlayer(EVENT_BOT_COMMAND, this, response.substr(1).c_str(), 0); parse->EventPlayer(EVENT_BOT_COMMAND, this, response.c_str(), 0);
} }
#endif #endif
else { else {

2
zone/mob.cpp
View File

@ -459,6 +459,8 @@ Mob::Mob(
#ifdef BOTS #ifdef BOTS
m_manual_follow = false; m_manual_follow = false;
#endif #endif
mob_scan_close.Trigger();
} }
Mob::~Mob() Mob::~Mob()