diff --git a/Source/Game/Entities/Object/ObjectGuid.cs b/Source/Game/Entities/Object/ObjectGuid.cs index 0b2c13740..9bd9908e7 100644 --- a/Source/Game/Entities/Object/ObjectGuid.cs +++ b/Source/Game/Entities/Object/ObjectGuid.cs @@ -552,7 +552,7 @@ namespace Game.Entities public static ObjectGuid CreateWorldLayer(uint arg1, ushort arg2, byte arg3, uint arg4) { - return new ObjectGuid((ulong)(((ulong)HighGuid.WorldLayer << 58) | ((ulong)(arg1 & 0xFFFFFFFF) << 10) | (ulong)(arg2 & 0x1FF)), (ulong)(((ulong)(arg3 & 0xFF) << 24) | (ulong)(arg4 & 0x7FFFFF))); + return new ObjectGuid((ulong)(((ulong)HighGuid.WorldLayer << 58) | ((ulong)(arg1 & 0xFFFFFFFF) << 10) | (ulong)(arg2 & 0x1FFu)), (ulong)(((ulong)(arg3 & 0xFF) << 24) | (ulong)(arg4 & 0x7FFFFF))); } static uint GetRealmIdForObjectGuid(uint realmId) diff --git a/Source/Game/Guilds/GuildManager.cs b/Source/Game/Guilds/GuildManager.cs index e87670a6b..edc64a2e1 100644 --- a/Source/Game/Guilds/GuildManager.cs +++ b/Source/Game/Guilds/GuildManager.cs @@ -502,7 +502,6 @@ namespace Game public List GetGuildRewards() { return guildRewards; } - uint NextGuildId; Dictionary GuildStore = new(); List guildRewards = new(); diff --git a/Source/Game/Phasing/PhasingHandler.cs b/Source/Game/Phasing/PhasingHandler.cs index 0d04c5e2d..bed88c5bc 100644 --- a/Source/Game/Phasing/PhasingHandler.cs +++ b/Source/Game/Phasing/PhasingHandler.cs @@ -639,7 +639,7 @@ namespace Game { StringBuilder uiWorldMapAreaIdSwaps = new(); foreach (var uiWorldMapAreaIdSwap in phaseShift.UiMapPhaseIds) - uiWorldMapAreaIdSwaps.Append(uiWorldMapAreaIdSwap.Key + ',' + ' '); + uiWorldMapAreaIdSwaps.AppendFormat($"{uiWorldMapAreaIdSwap.Key}, "); chat.SendSysMessage(CypherStrings.PhaseshiftUiWorldMapAreaSwaps, uiWorldMapAreaIdSwaps.ToString()); } diff --git a/Source/Scripts/Argus/AntorusTheBurningThrone/GarothiWorldbreaker.cs b/Source/Scripts/Argus/AntorusTheBurningThrone/GarothiWorldbreaker.cs index db0c4e68d..c80e4ad39 100644 --- a/Source/Scripts/Argus/AntorusTheBurningThrone/GarothiWorldbreaker.cs +++ b/Source/Scripts/Argus/AntorusTheBurningThrone/GarothiWorldbreaker.cs @@ -377,9 +377,8 @@ namespace Scripts.Argus.AntorusTheBurningThrone.GarothiWorldbreaker break; case EventIds.SurgingFel: { - var guids = _surgingFelDummyGuids; - guids.Remove(_lastSurgingFelDummyGuid); - _lastSurgingFelDummyGuid = guids.SelectRandom(); + _surgingFelDummyGuids.Remove(_lastSurgingFelDummyGuid); + _lastSurgingFelDummyGuid = _surgingFelDummyGuids.SelectRandom(); Creature dummy = ObjectAccessor.GetCreature(me, _lastSurgingFelDummyGuid); if (dummy) dummy.CastSpell(dummy, SpellIds.SurgingFelAreaTrigger); @@ -404,7 +403,7 @@ namespace Scripts.Argus.AntorusTheBurningThrone.GarothiWorldbreaker uint _lastCanonEntry; bool _castEradication; ObjectGuid _lastSurgingFelDummyGuid; - List _surgingFelDummyGuids; + List _surgingFelDummyGuids = new(); void CleanupEncounter() {