To be more specific on the fix for ChatHandler.cpp:
<<<<<<< HEAD:src/game/ChatHandler.cpp <--- Delete Line
bool WorldSession::ProcessChatmessageFurtherAfterSecurityChecks(std::string& msg, uint32 lang)
{
if (lang != LANG_ADDON)
{
// strip invisible characters for non-addon messages
if(sWorld.getConfig(CONFIG_CHAT_FAKE_MESSAGE_PREVENTING))
stripLineInvisibleChars(msg);
if (sWorld.getConfig(CONFIG_CHAT_STRICT_LINK_CHECKING_SEVERITY) && GetSecurity() < SEC_MODERATOR
&& !ChatHandler(this).isValidChatMessage(msg.c_str()))
{
sLog.outError("Player %s (GUID: %u) sent a chatmessage with an invalid link: %s", GetPlayer()->GetName(),
GetPlayer()->GetGUIDLow(), msg.c_str());
if (sWorld.getConfig(CONFIG_CHAT_STRICT_LINK_CHECKING_KICK))
KickPlayer();
return false;
}
}
return true;
}
======= <--- Delete Line
// Playerbot mod <---Move to headers section
#include "PlayerbotAI.h" <---Move to headers section
>>>>>>> 2243f3c3ec59852bd219a80c45995b907d28a6f6:src/game/ChatHandler.cpp <--- Delete Line