Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2025-05-23 15:22:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

more worky

Browse Source
This commit is contained in:
Aaron Kimbre 2023-11-16 07:12:18 -06:00
parent 09bd4e9089
commit 449202e39f
6 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dChatServer/ChatPacketHandler.cpp
View File

@ -721,6 +721,10 @@ void ChatPacketHandler::HandleGuildLeave(Packet* packet){
Game::logger->Log("ChatPacketHandler", "HandleGuildLeave %llu", playerID); Game::logger->Log("ChatPacketHandler", "HandleGuildLeave %llu", playerID);
} }
void ChatPacketHandler::HandleGuildGetAll(Packet* packet){
}
void ChatPacketHandler::SendTeamInvite(PlayerData* receiver, PlayerData* sender) { void ChatPacketHandler::SendTeamInvite(PlayerData* receiver, PlayerData* sender) {
CBITSTREAM; CBITSTREAM;
BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT_INTERNAL, eChatInternalMessageType::ROUTE_TO_PLAYER); BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT_INTERNAL, eChatInternalMessageType::ROUTE_TO_PLAYER);

2
dChatServer/ChatPacketHandler.h
View File

@ -24,6 +24,8 @@ namespace ChatPacketHandler {
void HandleTeamStatusRequest(Packet* packet); void HandleTeamStatusRequest(Packet* packet);
void HandleGuildLeave(Packet* packet); void HandleGuildLeave(Packet* packet);
void HandleGuildGetAll(Packet* packet);
void SendTeamInvite(PlayerData* receiver, PlayerData* sender); 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); void SendTeamInviteConfirm(PlayerData* receiver, bool bLeaderIsFreeTrial, LWOOBJID i64LeaderID, LWOZONEID i64LeaderZoneID, uint8_t ucLootFlag, uint8_t ucNumOfOtherPlayers, uint8_t ucResponseCode, std::u16string wsLeaderName);

10
dChatServer/ChatServer.cpp
View File

@ -304,11 +304,11 @@ void HandlePacket(Packet* packet) {
// Guild messages // Guild messages
case eChatMessageType::GUILD_CREATE: case eChatMessageType::GUILD_CREATE:
Game::logger->Log("ChatServer", "GUILD_CREATE"); LOG("GUILD_CREATE");
break; break;
case eChatMessageType::GUILD_INVITE_RESPONSE: case eChatMessageType::GUILD_INVITE_RESPONSE:
Game::logger->Log("ChatServer", "GUILD_INVITE_RESPONSE"); LOG("GUILD_INVITE_RESPONSE");
break; break;
case eChatMessageType::GUILD_LEAVE: case eChatMessageType::GUILD_LEAVE:
@ -316,15 +316,15 @@ void HandlePacket(Packet* packet) {
break; break;
case eChatMessageType::GUILD_KICK: case eChatMessageType::GUILD_KICK:
Game::logger->Log("ChatServer", "GUILD_KICK"); LOG("GUILD_KICK");
break; break;
case eChatMessageType::GUILD_GET_STATUS: case eChatMessageType::GUILD_GET_STATUS:
Game::logger->Log("ChatServer", "GUILD_GET_STATUS"); LOG("GUILD_GET_STATUS");
break; break;
case eChatMessageType::GUILD_GET_ALL: case eChatMessageType::GUILD_GET_ALL:
Game::logger->Log("ChatServer", "GUILD_GET_ALL"); LOG("GUILD_GET_ALL");
break; break;
default: default:

3
dGame/dComponents/CharacterComponent.cpp
View File

@ -41,6 +41,7 @@ CharacterComponent::CharacterComponent(Entity* parent, Character* character) : C
m_CountryCode = 0; m_CountryCode = 0;
m_LastUpdateTimestamp = std::time(nullptr); m_LastUpdateTimestamp = std::time(nullptr);
m_GuildID = 0; m_GuildID = 0;
m_GuildName = u""; m_GuildName = u"";
} }
@ -753,3 +754,5 @@ void CharacterComponent::UpdateClientMinimap(bool showFaction, std::string ventu
arrayToSend.Insert(ventureVisionType, showFaction); arrayToSend.Insert(ventureVisionType, showFaction);
GameMessages::SendUIMessageServerToSingleClient(m_Parent, m_Parent ? m_Parent->GetSystemAddress() : UNASSIGNED_SYSTEM_ADDRESS, "SetFactionVisibility", arrayToSend); GameMessages::SendUIMessageServerToSingleClient(m_Parent, m_Parent ? m_Parent->GetSystemAddress() : UNASSIGNED_SYSTEM_ADDRESS, "SetFactionVisibility", arrayToSend);
} }

2
dNet/AuthPackets.cpp
View File

@ -204,7 +204,7 @@ void AuthPackets::SendLoginResponse(dServer* server, const SystemAddress& sysAdd
// Event Gating // Event Gating
packet.Write(LUString("Talk_Like_A_Pirate")); packet.Write(LUString("Talk_Like_A_Pirate"));
packet.Write(LUString("")); packet.Write(LUString("guilds"));
packet.Write(LUString("")); packet.Write(LUString(""));
packet.Write(LUString("")); packet.Write(LUString(""));
packet.Write(LUString("")); packet.Write(LUString(""));

16
dNet/ClientPackets.cpp
View File

@ -432,12 +432,12 @@ void ClientPackets::HandleGuildCreation(const SystemAddress& sysAddr, Packet* pa
delete res; delete res;
delete stmt; delete stmt;
// if (!Game::chatFilter->IsSentenceOkay(guildName, 1).empty()) { if (!Game::chatFilter->IsSentenceOkay(guildName, character->GetGMLevel()).empty()) {
// Game::logger->Log("ClientPackets", "But they used bad words!"); Game::logger->Log("ClientPackets", "But they used bad words!");
// auto usedName = GeneralUtils::UTF8ToUTF16(guildName); auto usedName = GeneralUtils::UTF8ToUTF16(guildName);
// SendGuildCreateResponse(sysAddr, eGuildCreationResponse::REJECTED_BAD_NAME, LWOOBJID_EMPTY, usedName); SendGuildCreateResponse(sysAddr, eGuildCreationResponse::REJECTED_BAD_NAME, LWOOBJID_EMPTY, usedName);
// return; return;
// } }
auto entity = character->GetEntity(); auto entity = character->GetEntity();
if (!entity) return; if (!entity) return;
@ -452,9 +452,9 @@ void ClientPackets::HandleGuildCreation(const SystemAddress& sysAddr, Packet* pa
} }
auto creation = (uint32_t)time(nullptr); auto creation = (uint32_t)time(nullptr);
LOG("Creating Guild");
// If not, insert our newly created 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->setString(1, guildName.c_str());
insertGuild->setUInt(2, character->GetID()); insertGuild->setUInt(2, character->GetID());
insertGuild->setUInt(3, characterComp->GetUScore()); insertGuild->setUInt(3, characterComp->GetUScore());