From 449202e39fbea49d7b30c54f0ebb1aadc089aa96 Mon Sep 17 00:00:00 2001 From: Aaron Kimbre Date: Thu, 16 Nov 2023 07:12:18 -0600 Subject: [PATCH] more worky --- dChatServer/ChatPacketHandler.cpp | 4 ++++ dChatServer/ChatPacketHandler.h | 2 ++ dChatServer/ChatServer.cpp | 10 +++++----- dGame/dComponents/CharacterComponent.cpp | 3 +++ dNet/AuthPackets.cpp | 2 +- dNet/ClientPackets.cpp | 16 ++++++++-------- 6 files changed, 23 insertions(+), 14 deletions(-) diff --git a/dChatServer/ChatPacketHandler.cpp b/dChatServer/ChatPacketHandler.cpp index 7db6f2fe..de01f866 100644 --- a/dChatServer/ChatPacketHandler.cpp +++ b/dChatServer/ChatPacketHandler.cpp @@ -721,6 +721,10 @@ void ChatPacketHandler::HandleGuildLeave(Packet* packet){ Game::logger->Log("ChatPacketHandler", "HandleGuildLeave %llu", playerID); } +void ChatPacketHandler::HandleGuildGetAll(Packet* packet){ + +} + void ChatPacketHandler::SendTeamInvite(PlayerData* receiver, PlayerData* sender) { CBITSTREAM; BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT_INTERNAL, eChatInternalMessageType::ROUTE_TO_PLAYER); diff --git a/dChatServer/ChatPacketHandler.h b/dChatServer/ChatPacketHandler.h index 1097ca00..f0987d9d 100644 --- a/dChatServer/ChatPacketHandler.h +++ b/dChatServer/ChatPacketHandler.h @@ -24,6 +24,8 @@ namespace ChatPacketHandler { void HandleTeamStatusRequest(Packet* packet); void HandleGuildLeave(Packet* packet); + void HandleGuildGetAll(Packet* packet); + void SendTeamInvite(PlayerData* receiver, PlayerData* sender); void SendTeamInviteConfirm(PlayerData* receiver, bool bLeaderIsFreeTrial, LWOOBJID i64LeaderID, LWOZONEID i64LeaderZoneID, uint8_t ucLootFlag, uint8_t ucNumOfOtherPlayers, uint8_t ucResponseCode, std::u16string wsLeaderName); diff --git a/dChatServer/ChatServer.cpp b/dChatServer/ChatServer.cpp index 6774bc67..4ca350c5 100644 --- a/dChatServer/ChatServer.cpp +++ b/dChatServer/ChatServer.cpp @@ -304,11 +304,11 @@ void HandlePacket(Packet* packet) { // Guild messages case eChatMessageType::GUILD_CREATE: - Game::logger->Log("ChatServer", "GUILD_CREATE"); + LOG("GUILD_CREATE"); break; case eChatMessageType::GUILD_INVITE_RESPONSE: - Game::logger->Log("ChatServer", "GUILD_INVITE_RESPONSE"); + LOG("GUILD_INVITE_RESPONSE"); break; case eChatMessageType::GUILD_LEAVE: @@ -316,15 +316,15 @@ void HandlePacket(Packet* packet) { break; case eChatMessageType::GUILD_KICK: - Game::logger->Log("ChatServer", "GUILD_KICK"); + LOG("GUILD_KICK"); break; case eChatMessageType::GUILD_GET_STATUS: - Game::logger->Log("ChatServer", "GUILD_GET_STATUS"); + LOG("GUILD_GET_STATUS"); break; case eChatMessageType::GUILD_GET_ALL: - Game::logger->Log("ChatServer", "GUILD_GET_ALL"); + LOG("GUILD_GET_ALL"); break; default: diff --git a/dGame/dComponents/CharacterComponent.cpp b/dGame/dComponents/CharacterComponent.cpp index cc172643..e9b9e7d8 100644 --- a/dGame/dComponents/CharacterComponent.cpp +++ b/dGame/dComponents/CharacterComponent.cpp @@ -41,6 +41,7 @@ CharacterComponent::CharacterComponent(Entity* parent, Character* character) : C m_CountryCode = 0; m_LastUpdateTimestamp = std::time(nullptr); + m_GuildID = 0; m_GuildName = u""; } @@ -753,3 +754,5 @@ void CharacterComponent::UpdateClientMinimap(bool showFaction, std::string ventu arrayToSend.Insert(ventureVisionType, showFaction); GameMessages::SendUIMessageServerToSingleClient(m_Parent, m_Parent ? m_Parent->GetSystemAddress() : UNASSIGNED_SYSTEM_ADDRESS, "SetFactionVisibility", arrayToSend); } + + diff --git a/dNet/AuthPackets.cpp b/dNet/AuthPackets.cpp index 1445be37..a99c54a6 100644 --- a/dNet/AuthPackets.cpp +++ b/dNet/AuthPackets.cpp @@ -204,7 +204,7 @@ void AuthPackets::SendLoginResponse(dServer* server, const SystemAddress& sysAdd // Event Gating packet.Write(LUString("Talk_Like_A_Pirate")); - packet.Write(LUString("")); + packet.Write(LUString("guilds")); packet.Write(LUString("")); packet.Write(LUString("")); packet.Write(LUString("")); diff --git a/dNet/ClientPackets.cpp b/dNet/ClientPackets.cpp index 891d7d1c..5ee4bb7b 100644 --- a/dNet/ClientPackets.cpp +++ b/dNet/ClientPackets.cpp @@ -432,12 +432,12 @@ void ClientPackets::HandleGuildCreation(const SystemAddress& sysAddr, Packet* pa delete res; delete stmt; - // if (!Game::chatFilter->IsSentenceOkay(guildName, 1).empty()) { - // Game::logger->Log("ClientPackets", "But they used bad words!"); - // auto usedName = GeneralUtils::UTF8ToUTF16(guildName); - // SendGuildCreateResponse(sysAddr, eGuildCreationResponse::REJECTED_BAD_NAME, LWOOBJID_EMPTY, usedName); - // return; - // } + if (!Game::chatFilter->IsSentenceOkay(guildName, character->GetGMLevel()).empty()) { + Game::logger->Log("ClientPackets", "But they used bad words!"); + auto usedName = GeneralUtils::UTF8ToUTF16(guildName); + SendGuildCreateResponse(sysAddr, eGuildCreationResponse::REJECTED_BAD_NAME, LWOOBJID_EMPTY, usedName); + return; + } auto entity = character->GetEntity(); if (!entity) return; @@ -452,9 +452,9 @@ void ClientPackets::HandleGuildCreation(const SystemAddress& sysAddr, Packet* pa } auto creation = (uint32_t)time(nullptr); - + LOG("Creating Guild"); // If not, insert our newly created guild: - auto insertGuild = Database::CreatePreppedStmt("INSERT INTO `guilds`(`name`, `owner_id`, `uscore`, `created`) VALUES (?,?,?,?)"); + auto insertGuild = Database::CreatePreppedStmt("INSERT INTO `guilds`(`name`, `owner_id`, `reputation`, `created`) VALUES (?,?,?,?)"); insertGuild->setString(1, guildName.c_str()); insertGuild->setUInt(2, character->GetID()); insertGuild->setUInt(3, characterComp->GetUScore());