Remove bad string splitting

Thanks to Makpptfox at getmangos.eu for report
This commit is contained in:
Rochet2
2017-04-12 21:36:24 +03:00
parent ecad5370ef
commit d7ec5438a5
2 changed files with 21 additions and 20 deletions

View File

@@ -35,9 +35,21 @@ bool Eluna::OnAddonMessage(Player* sender, uint32 type, std::string& msg, Player
START_HOOK_WITH_RETVAL(ADDON_EVENT_ON_MESSAGE, true);
Push(sender);
Push(type);
const char* c_msg = msg.c_str();
Push(strtok((char*)c_msg, "\t")); // prefix
Push(strtok(NULL, "")); // msg
auto delimeter_position = msg.find('\t');
if (delimeter_position == std::string::npos)
{
Push(msg); // prefix
Push(); // msg
}
else
{
std::string prefix = msg.substr(0, delimeter_position);
std::string content = msg.substr(delimeter_position + 1, std::string::npos);
Push(prefix);
Push(content);
}
if (receiver)
Push(receiver);
else if (guild)