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

Fatality! (Fix for event_say parse events not observing the correct parser for their situation)

Browse Source
This commit is contained in:
Uleat 2020-01-13 01:47:39 -05:00
parent c438819ed6
commit 9bdb70b2f0
2 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
zone/client.cpp
View File

@ -1106,14 +1106,22 @@ void Client::ChannelMessageReceived(uint8 chan_num, uint8 language, uint8 lang_s
case ChatChannel_Say: { /* Say */ case ChatChannel_Say: { /* Say */
if(message[0] == COMMAND_CHAR) { if(message[0] == COMMAND_CHAR) {
if(command_dispatch(this, message) == -2) { if(command_dispatch(this, message) == -2) {
if(parse->PlayerHasQuestSub(EVENT_COMMAND)) { if (parse->PlayerHasQuestSub(EVENT_COMMAND)) {
int i = parse->EventPlayer(EVENT_COMMAND, this, message, 0); int i = parse->EventPlayer(EVENT_COMMAND, this, message, 0);
if(i == 0 && !RuleB(Chat, SuppressCommandErrors)) { if (i == 0 && !RuleB(Chat, SuppressCommandErrors)) {
Message(Chat::Red, "Command '%s' not recognized.", message); Message(Chat::Red, "Command '%s' not recognized.", message);
} }
} else { }
if(!RuleB(Chat, SuppressCommandErrors)) else if (parse->PlayerHasQuestSub(EVENT_SAY)) {
int i = parse->EventPlayer(EVENT_SAY, this, message, 0);
if (i == 0 && !RuleB(Chat, SuppressCommandErrors)) {
Message(Chat::Red, "Command '%s' not recognized.", message); Message(Chat::Red, "Command '%s' not recognized.", message);
}
}
else {
if (!RuleB(Chat, SuppressCommandErrors)) {
Message(Chat::Red, "Command '%s' not recognized.", message);
}
} }
} }
break; break;
@ -1128,9 +1136,16 @@ void Client::ChannelMessageReceived(uint8 chan_num, uint8 language, uint8 lang_s
Message(Chat::Red, "Bot command '%s' not recognized.", message); Message(Chat::Red, "Bot command '%s' not recognized.", message);
} }
} }
else { else if (parse->PlayerHasQuestSub(EVENT_SAY)) {
if (!RuleB(Chat, SuppressCommandErrors)) int i = parse->EventPlayer(EVENT_SAY, this, message, 0);
if (i == 0 && !RuleB(Chat, SuppressCommandErrors)) {
Message(Chat::Red, "Bot command '%s' not recognized.", message); Message(Chat::Red, "Bot command '%s' not recognized.", message);
}
}
else {
if (!RuleB(Chat, SuppressCommandErrors)) {
Message(Chat::Red, "Bot command '%s' not recognized.", message);
}
} }
} }
break; break;

8
zone/client_packet.cpp
View File

@ -8297,7 +8297,9 @@ void Client::Handle_OP_ItemLinkClick(const EQApplicationPacket *app)
parse->EventPlayer(EVENT_BOT_COMMAND, this, response.substr(1).c_str(), 0); parse->EventPlayer(EVENT_BOT_COMMAND, this, response.substr(1).c_str(), 0);
} }
#endif #endif
parse->EventPlayer(EVENT_SAY, this, response.c_str(), 0); else {
parse->EventPlayer(EVENT_SAY, this, response.c_str(), 0);
}
} }
else { else {
Message(Chat::LightGray, "You say, '%s'", response.c_str()); Message(Chat::LightGray, "You say, '%s'", response.c_str());
@ -8315,7 +8317,9 @@ void Client::Handle_OP_ItemLinkClick(const EQApplicationPacket *app)
parse->EventPlayer(EVENT_BOT_COMMAND, this, response.substr(1).c_str(), 0); parse->EventPlayer(EVENT_BOT_COMMAND, this, response.substr(1).c_str(), 0);
} }
#endif #endif
parse->EventPlayer(EVENT_SAY, this, response.c_str(), 0); else {
parse->EventPlayer(EVENT_SAY, this, response.c_str(), 0);
}
} }
else { else {
Message(Chat::LightGray, "You say, '%s'", response.c_str()); Message(Chat::LightGray, "You say, '%s'", response.c_str());