From 6a29799a6ef0b5409395ad04ddad7176b21b49f9 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Tue, 10 May 2022 14:35:56 -0400 Subject: [PATCH] Some cleanups --- Source/Framework/Constants/AchievementConst.cs | 2 +- Source/Game/Entities/Unit/Unit.Fields.cs | 1 - Source/Game/Entities/Unit/Unit.cs | 1 - Source/Game/Guilds/Guild.cs | 7 +++++-- Source/Game/Networking/Packets/HotfixPackets.cs | 1 - 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Source/Framework/Constants/AchievementConst.cs b/Source/Framework/Constants/AchievementConst.cs index 501587609..5ef9d0899 100644 --- a/Source/Framework/Constants/AchievementConst.cs +++ b/Source/Framework/Constants/AchievementConst.cs @@ -745,7 +745,7 @@ namespace Framework.Constants GameEvent = 24, SItemQuality = 25, - Max = 25 + Max } public enum ProgressType diff --git a/Source/Game/Entities/Unit/Unit.Fields.cs b/Source/Game/Entities/Unit/Unit.Fields.cs index 6e53a65d5..dfd21865c 100644 --- a/Source/Game/Entities/Unit/Unit.Fields.cs +++ b/Source/Game/Entities/Unit/Unit.Fields.cs @@ -69,7 +69,6 @@ namespace Game.Entities public bool m_canDualWield; public int BaseSpellCritChance { get; set; } public uint RegenTimer { get; set; } - uint combatTimer; public uint ExtraAttacks { get; set; } //Charm diff --git a/Source/Game/Entities/Unit/Unit.cs b/Source/Game/Entities/Unit/Unit.cs index 392ae346a..0f089754b 100644 --- a/Source/Game/Entities/Unit/Unit.cs +++ b/Source/Game/Entities/Unit/Unit.cs @@ -1960,7 +1960,6 @@ namespace Game.Entities public SheathState GetSheath() { return (SheathState)(byte)m_unitData.SheatheState; } - public uint GetCombatTimer() { return combatTimer; } public UnitPVPStateFlags GetPvpFlags() { return (UnitPVPStateFlags)(byte)m_unitData.PvpFlags; } public bool HasPvpFlag(UnitPVPStateFlags flags) { return (m_unitData.PvpFlags & (uint)flags) != 0; } public void AddPvpFlag(UnitPVPStateFlags flags) { SetUpdateFieldFlagValue(m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.PvpFlags), (byte)flags); } diff --git a/Source/Game/Guilds/Guild.cs b/Source/Game/Guilds/Guild.cs index 555dfc725..85b5a74f7 100644 --- a/Source/Game/Guilds/Guild.cs +++ b/Source/Game/Guilds/Guild.cs @@ -34,6 +34,9 @@ namespace Game.Guilds public Guild() { m_achievementSys = new GuildAchievementMgr(this); + + for (var i = 0; i < m_bankEventLog.Length; ++i) + m_bankEventLog[i] = new LogHolder(); } public bool Create(Player pLeader, string name) @@ -2555,9 +2558,9 @@ namespace Game.Guilds List m_bankTabs = new(); // These are actually ordered lists. The first element is the oldest entry. - LogHolder m_eventLog; + LogHolder m_eventLog = new(); LogHolder[] m_bankEventLog = new LogHolder[GuildConst.MaxBankTabs + 1]; - LogHolder m_newsLog; + LogHolder m_newsLog = new(); GuildAchievementMgr m_achievementSys; #endregion diff --git a/Source/Game/Networking/Packets/HotfixPackets.cs b/Source/Game/Networking/Packets/HotfixPackets.cs index 24b59afaa..f758b8e34 100644 --- a/Source/Game/Networking/Packets/HotfixPackets.cs +++ b/Source/Game/Networking/Packets/HotfixPackets.cs @@ -91,7 +91,6 @@ namespace Game.Networking.Packets } public uint VirtualRealmAddress; - public uint HotfixCount; public MultiMap Hotfixes; }