Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2026-11-15 00:07:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: route only the chat messages a client sends

Browse Source 
A world server passed every routed packet on to the chat server under
whatever message ID it carried. It now passes on the messages a client
sends, and SHOW_ALL only for the level the showall command needs. The
message ID is read as the full 32 bit number, the packet has to be long
enough to hold a chat packet and the sender needs a character.

Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
This commit is contained in:
Aaron Kimbrell
2026-11-10 12:56:54 -06:00
parent 5f3b10f466
commit b88168f2ed
4 changed files with 133 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
dWorldServer/WorldServer.cpp
View File

@@ -70,6 +70,7 @@
#include "Entity.h"
#include "Character.h"
#include "ChatPackets.h"
#include "ChatRouting.h"
#include "ScriptedActivityComponent.h"
#include "eReplicaComponentType.h"
#include "WorldRoutePacket.h"
@@ -1564,14 +1565,24 @@ namespace {
return;
}
//We need to insert the player's objectID so the chat server can find who originated this request:
LWOOBJID objectID = 0;
auto user = UserManager::Instance()->GetUser(sysAddr);
if (user) {
const auto* const lastChar = user->GetLastUsedChar();
if (lastChar) objectID = lastChar->GetObjectID();
// The chat server looks the sender up by this ID, so there has to be a character to send as
auto* const user = UserManager::Instance()->GetUser(sysAddr);
const auto* const lastChar = user ? user->GetLastUsedChar() : nullptr;
if (!lastChar) {
LOG("Tried to route a chat packet without a character.");
return;
}
// The whole 32 bit ID is checked, the chat server gets its first byte
const auto chatMessageId = static_cast<MessageType::Chat>(routedMessageID);
if (!ChatRouting::CanRoute(chatMessageId, lastChar->GetGMLevel())) {
LOG("Character %llu tried to route chat message %u, which they may not send.", lastChar->GetObjectID(), routedMessageID);
return;
}
//We need to insert the player's objectID so the chat server can find who originated this request:
const LWOOBJID objectID = lastChar->GetObjectID();
ChatServerLink::Send(ToChat(objectID), SYSTEM_PRIORITY, RELIABLE_ORDERED);
}
};