From 13f22e0c06fcce0d76fba3530eff9a1c06c72674 Mon Sep 17 00:00:00 2001 From: Shauren Date: Sun, 28 Sep 2025 00:06:28 +0200 Subject: Core/Misc: Reduce differences between branches --- src/server/game/Handlers/GuildHandler.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/server/game/Handlers/GuildHandler.cpp') diff --git a/src/server/game/Handlers/GuildHandler.cpp b/src/server/game/Handlers/GuildHandler.cpp index 2dbc1c5e02a..f8d41200177 100644 --- a/src/server/game/Handlers/GuildHandler.cpp +++ b/src/server/game/Handlers/GuildHandler.cpp @@ -589,8 +589,11 @@ void WorldSession::HandleGuildReplaceGuildMaster(WorldPackets::Guild::GuildRepla void WorldSession::HandleGuildSetGuildMaster(WorldPackets::Guild::GuildSetGuildMaster& packet) { - if (Guild* guild = GetPlayer()->GetGuild()) - guild->HandleSetNewGuildMaster(this, packet.NewMasterName, false); + TC_LOG_DEBUG("guild", "CMSG_GUILD_SET_GUILD_MASTER [{}]: Target: {}", GetPlayerInfo(), packet.NewMasterName); + + if (normalizePlayerName(packet.NewMasterName)) + if (Guild* guild = GetPlayer()->GetGuild()) + guild->HandleSetNewGuildMaster(this, packet.NewMasterName, false); } void WorldSession::HandleGuildSetAchievementTracking(WorldPackets::Guild::GuildSetAchievementTracking& packet) -- cgit v1.2.3