Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2025-10-18 13:28:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

more misc work

Browse Source
This commit is contained in:
Aaron Kimbre
2025-04-11 09:12:45 -05:00
parent 8364e60799
commit 48d32f2c77
11 changed files with 90 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
dChatServer/ChatPacketHandler.cpp
View File

@@ -450,24 +450,21 @@ void ChatPacketHandler::HandleChatMessage(Packet* packet) {
switch (data.channel) {
case eChatChannel::LOCAL: {
break;
}
case eChatChannel::TEAM: {
auto* team = Game::playerContainer.GetTeam(data.sender.playerID);
if (team == nullptr) return;
data.teamID = team->teamID;
case eChatChannel::TEAM: {
auto* team = Game::playerContainer.GetTeam(data.sender.playerID);
if (team == nullptr) return;
data.teamID = team->teamID;
for (const auto memberId : team->memberIDs) {
const auto& otherMember = Game::playerContainer.GetPlayerData(memberId);
if (!otherMember) return;
SendPrivateChatMessage(data.sender, otherMember, otherMember, data.message, eChatChannel::TEAM, eChatMessageResponseCode::SENT);
for (const auto memberId : team->memberIDs) {
const auto& otherMember = Game::playerContainer.GetPlayerData(memberId);
if (!otherMember) return;
SendPrivateChatMessage(data.sender, otherMember, otherMember, data.message, eChatChannel::TEAM, eChatMessageResponseCode::SENT);
}
break;
}
break;
}
default:
LOG("Unhandled Chat channel [%s]", StringifiedEnum::ToString(data.channel).data());
break;
default:
LOG_DEBUG("Unhandled Chat channel [%s]", StringifiedEnum::ToString(data.channel).data());
break;
}
ChatWeb::SendWSChatMessage(data);
}

3
dChatServer/ChatWeb.cpp
View File

@@ -150,12 +150,9 @@ namespace ChatWeb {
json data;
data["message"] = chatMessage.message.GetAsString();
data["sender"] = chatMessage.sender;
data["channel"] = magic_enum::enum_name(chatMessage.channel);
switch (chatMessage.channel) {
case eChatChannel::LOCAL:
break;
case eChatChannel::TEAM:
data["teamID"] = chatMessage.teamID;
break;