Fix build
This commit is contained in:
@@ -153,7 +153,7 @@ namespace Game.DungeonFinding
|
|||||||
return LfgDungeonStore.LookupByKey(id);
|
return LfgDungeonStore.LookupByKey(id);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void LoadLFGDungeons(bool reload = false)
|
public void LoadLFGDungeons()
|
||||||
{
|
{
|
||||||
uint oldMSTime = Time.GetMSTime();
|
uint oldMSTime = Time.GetMSTime();
|
||||||
|
|
||||||
@@ -191,7 +191,7 @@ namespace Game.DungeonFinding
|
|||||||
uint dungeonId = result.Read<uint>(0);
|
uint dungeonId = result.Read<uint>(0);
|
||||||
if (!LfgDungeonStore.ContainsKey(dungeonId))
|
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;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -208,6 +208,8 @@ namespace Game.DungeonFinding
|
|||||||
|
|
||||||
Log.outInfo(LogFilter.ServerLoading, "Loaded {0} lfg dungeon templates in {1} ms", count, Time.GetMSTimeDiffToNow(oldMSTime));
|
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
|
// Fill all other teleport coords from areatriggers
|
||||||
foreach (var pair in LfgDungeonStore)
|
foreach (var pair in LfgDungeonStore)
|
||||||
{
|
{
|
||||||
@@ -234,9 +236,6 @@ namespace Game.DungeonFinding
|
|||||||
CachedDungeonMapStore.Add((byte)dungeon.group, dungeon.id);
|
CachedDungeonMapStore.Add((byte)dungeon.group, dungeon.id);
|
||||||
CachedDungeonMapStore.Add(0, dungeon.id);
|
CachedDungeonMapStore.Add(0, dungeon.id);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (reload)
|
|
||||||
CachedDungeonMapStore.Clear();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Update(uint diff)
|
public void Update(uint diff)
|
||||||
|
|||||||
@@ -653,9 +653,12 @@ namespace Game
|
|||||||
[WorldPacketHandler(ClientOpcodes.GuildSetGuildMaster)]
|
[WorldPacketHandler(ClientOpcodes.GuildSetGuildMaster)]
|
||||||
void HandleGuildSetGuildMaster(GuildSetGuildMaster packet)
|
void HandleGuildSetGuildMaster(GuildSetGuildMaster packet)
|
||||||
{
|
{
|
||||||
Guild guild = GetPlayer().GetGuild();
|
if (ObjectManager.NormalizePlayerName(ref packet.NewMasterName))
|
||||||
if (guild != null)
|
{
|
||||||
guild.HandleSetNewGuildMaster(this, packet.NewMasterName, false);
|
Guild guild = GetPlayer().GetGuild();
|
||||||
|
if (guild != null)
|
||||||
|
guild.HandleSetNewGuildMaster(this, packet.NewMasterName, false);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
[WorldPacketHandler(ClientOpcodes.GuildSetAchievementTracking)]
|
[WorldPacketHandler(ClientOpcodes.GuildSetAchievementTracking)]
|
||||||
|
|||||||
@@ -3089,7 +3089,7 @@ namespace Game.Spells
|
|||||||
ppm *= 1.0f + mod.Coeff;
|
ppm *= 1.0f + mod.Coeff;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case SpellProcsPerMinuteModType.Battleground:
|
case SpellProcsPerMinuteModType.Aura:
|
||||||
{
|
{
|
||||||
if (caster.HasAura(mod.Param))
|
if (caster.HasAura(mod.Param))
|
||||||
ppm *= 1.0f + mod.Coeff;
|
ppm *= 1.0f + mod.Coeff;
|
||||||
|
|||||||
Reference in New Issue
Block a user