From 17759869bbcd8ae1e0d7ab3f3de774a2c6823f9d Mon Sep 17 00:00:00 2001 From: Hondacrx Date: Mon, 8 Dec 2025 14:23:56 -0500 Subject: [PATCH] Fix build --- Source/Game/DungeonFinding/LFGManager.cs | 9 ++++----- Source/Game/Handlers/GuildHandler.cs | 9 ++++++--- Source/Game/Spells/SpellInfo.cs | 2 +- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Source/Game/DungeonFinding/LFGManager.cs b/Source/Game/DungeonFinding/LFGManager.cs index 9e3702ce4..ba2ec4fb5 100644 --- a/Source/Game/DungeonFinding/LFGManager.cs +++ b/Source/Game/DungeonFinding/LFGManager.cs @@ -153,7 +153,7 @@ namespace Game.DungeonFinding return LfgDungeonStore.LookupByKey(id); } - public void LoadLFGDungeons(bool reload = false) + public void LoadLFGDungeons() { uint oldMSTime = Time.GetMSTime(); @@ -191,7 +191,7 @@ namespace Game.DungeonFinding uint dungeonId = result.Read(0); if (!LfgDungeonStore.ContainsKey(dungeonId)) { - Log.outError(LogFilter.Sql, "table `lfg_entrances` contains coordinates for wrong dungeon {0}", dungeonId); + Log.outError(LogFilter.Sql, "table `lfg_dungeon_template` contains coordinates for wrong dungeon {0}", dungeonId); continue; } @@ -208,6 +208,8 @@ namespace Game.DungeonFinding Log.outInfo(LogFilter.ServerLoading, "Loaded {0} lfg dungeon templates in {1} ms", count, Time.GetMSTimeDiffToNow(oldMSTime)); + CachedDungeonMapStore.Clear(); + // Fill all other teleport coords from areatriggers foreach (var pair in LfgDungeonStore) { @@ -234,9 +236,6 @@ namespace Game.DungeonFinding CachedDungeonMapStore.Add((byte)dungeon.group, dungeon.id); CachedDungeonMapStore.Add(0, dungeon.id); } - - if (reload) - CachedDungeonMapStore.Clear(); } public void Update(uint diff) diff --git a/Source/Game/Handlers/GuildHandler.cs b/Source/Game/Handlers/GuildHandler.cs index f57724a7c..fe50b6124 100644 --- a/Source/Game/Handlers/GuildHandler.cs +++ b/Source/Game/Handlers/GuildHandler.cs @@ -653,9 +653,12 @@ namespace Game [WorldPacketHandler(ClientOpcodes.GuildSetGuildMaster)] void HandleGuildSetGuildMaster(GuildSetGuildMaster packet) { - Guild guild = GetPlayer().GetGuild(); - if (guild != null) - guild.HandleSetNewGuildMaster(this, packet.NewMasterName, false); + if (ObjectManager.NormalizePlayerName(ref packet.NewMasterName)) + { + Guild guild = GetPlayer().GetGuild(); + if (guild != null) + guild.HandleSetNewGuildMaster(this, packet.NewMasterName, false); + } } [WorldPacketHandler(ClientOpcodes.GuildSetAchievementTracking)] diff --git a/Source/Game/Spells/SpellInfo.cs b/Source/Game/Spells/SpellInfo.cs index f5edd6e30..f35b8d4fc 100644 --- a/Source/Game/Spells/SpellInfo.cs +++ b/Source/Game/Spells/SpellInfo.cs @@ -3089,7 +3089,7 @@ namespace Game.Spells ppm *= 1.0f + mod.Coeff; break; } - case SpellProcsPerMinuteModType.Battleground: + case SpellProcsPerMinuteModType.Aura: { if (caster.HasAura(mod.Param)) ppm *= 1.0f + mod.Coeff;