mirror of
https://github.com/EQEmu/Server.git
synced 2026-03-06 18:42:27 +00:00
Merge branch 'master' of https://github.com/EQEmu/Server into teleport_door
This commit is contained in:
commit
7d45de865d
@ -8290,11 +8290,11 @@ void Client::Handle_OP_ItemLinkClick(const EQApplicationPacket *app)
|
||||
parse->EventNPC(EVENT_SAY, GetTarget()->CastToNPC(), this, response.c_str(), 0);
|
||||
|
||||
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
|
||||
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
|
||||
else {
|
||||
@ -8310,11 +8310,11 @@ void Client::Handle_OP_ItemLinkClick(const EQApplicationPacket *app)
|
||||
else {
|
||||
if (silentsaylink) {
|
||||
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
|
||||
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
|
||||
else {
|
||||
|
||||
@ -459,6 +459,8 @@ Mob::Mob(
|
||||
#ifdef BOTS
|
||||
m_manual_follow = false;
|
||||
#endif
|
||||
|
||||
mob_scan_close.Trigger();
|
||||
}
|
||||
|
||||
Mob::~Mob()
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user