Skip to content

Commit b9517bd

Browse files
authored
Merge pull request project-topaz#1538 from claywar/bugfix/november-client-tell
Fix Tells due to November Client packet changes (project-topaz#1534)
2 parents 72aca1c + 52b9b02 commit b9517bd

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/map/packet_system.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -4495,23 +4495,23 @@ void SmallPacket0x0B6(map_session_data_t* const PSession, CCharEntity* const PCh
44954495
PChar->pushPacket(new CMessageBasicPacket(PChar, PChar, 0, 0, 316));
44964496
return;
44974497
}
4498-
string_t RecipientName = string_t((const char*)data[5], 15);
4498+
string_t RecipientName = string_t((const char*)data[6], 15);
44994499

45004500
int8 packetData[64];
45014501
strncpy((char*)packetData + 4, RecipientName.c_str(), RecipientName.length() + 1);
45024502
ref<uint32>(packetData, 0) = PChar->id;
4503-
message::send(MSG_CHAT_TELL, packetData, RecipientName.length() + 5, new CChatMessagePacket(PChar, MESSAGE_TELL, (const char*)data[20]));
4503+
message::send(MSG_CHAT_TELL, packetData, RecipientName.length() + 5, new CChatMessagePacket(PChar, MESSAGE_TELL, (const char*)data[21]));
45044504

45054505
if (map_config.audit_chat == 1 && map_config.audit_tell == 1)
45064506
{
45074507
char escaped_speaker[16 * 2 + 1];
45084508
Sql_EscapeString(SqlHandle, escaped_speaker, (const char*)PChar->GetName());
45094509

45104510
char escaped_recipient[16 * 2 + 1];
4511-
Sql_EscapeString(SqlHandle, escaped_recipient, (const char*)data[5]);
4511+
Sql_EscapeString(SqlHandle, escaped_recipient, &RecipientName[0]);
45124512

4513-
std::string escaped_full_string; escaped_full_string.reserve(strlen((const char*)data[20]) * 2 + 1);
4514-
Sql_EscapeString(SqlHandle, escaped_full_string.data(), (const char*)data[20]);
4513+
std::string escaped_full_string; escaped_full_string.reserve(strlen((const char*)data[21]) * 2 + 1);
4514+
Sql_EscapeString(SqlHandle, escaped_full_string.data(), (const char*)data[21]);
45154515

45164516
const char* fmtQuery = "INSERT into audit_chat (speaker,type,recipient,message,datetime) VALUES('%s','TELL','%s','%s',current_timestamp())";
45174517
if (Sql_Query(SqlHandle, fmtQuery, escaped_speaker, escaped_recipient, escaped_full_string.data()) == SQL_ERROR)

0 commit comments

Comments
 (0)