Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2024-11-25 23:17:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'guild_temp' of https://github.com/DarkflameUniverse/DarkflameServer into guild_temp

Browse Source
This commit is contained in:
David Markowitz 2023-11-26 20:56:44 -08:00
commit 0d668aefcf
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dGame/dComponents/CharacterComponent.cpp
View File

@ -271,12 +271,10 @@ void CharacterComponent::LoadFromXml(tinyxml2::XMLDocument* doc) {
if (gid != 0) {
auto guild = Database::Get()->GetGuild(gid);
if (guild && Database::Get()->CheckIsInGuild(guild->id, m_Parent->GetCharacter()->GetID())) {
LOG("Found Guild %i name %s", guild->id, guild->name.c_str());
m_GuildName = GeneralUtils::UTF8ToUTF16(guild->name);
m_GuildID = gid;
m_DirtySocialInfo = true;
} else {
LOG("Unalbe to find Guild %i name %s", guild->id, guild->name.c_str());
SetGuild(0, u"");
}
}

4
dNet/ClientPackets.cpp
View File

@ -444,8 +444,8 @@ void ClientPackets::HandleGuildCreation(Packet* packet) {
characterComp->SetGuild(newGuild->id, guildName.string);
SendGuildCreateResponse(packet->systemAddress, eGuildCreationResponse::CREATED, newGuild->id, guildName.string);
AMFArrayValue data;
data.Insert("bOn", true);
GameMessages::SendUIMessageServerToSingleClient(entity, packet->systemAddress, "ToggleGuildUI", data);
data.Insert("bDisplay", true);
GameMessages::SendUIMessageServerToSingleClient(entity, packet->systemAddress, "EnableGuild", data);
}