diff --git a/Source/Game/Combat/ThreatManager.cs b/Source/Game/Combat/ThreatManager.cs index 4b1a9b36d..781e27932 100644 --- a/Source/Game/Combat/ThreatManager.cs +++ b/Source/Game/Combat/ThreatManager.cs @@ -659,7 +659,6 @@ namespace Game.Combat void fillSharedPacketDataAndSend(dynamic packet) { packet.UnitGUID = _owner.GetGUID(); - packet.ThreatList.reserve(_sortedThreatList.Count); foreach (ThreatReference refe in _sortedThreatList) { diff --git a/Source/Game/Conditions/ConditionManager.cs b/Source/Game/Conditions/ConditionManager.cs index 90ce36d1f..f1ce9f86c 100644 --- a/Source/Game/Conditions/ConditionManager.cs +++ b/Source/Game/Conditions/ConditionManager.cs @@ -1106,7 +1106,7 @@ namespace Game break; default: Log.outError(LogFilter.Sql, $"{cond.ToString()} Invalid ConditionSourceType in `condition` table, ignoring."); - break; + return false; } return true; diff --git a/Source/Game/Entities/Unit/Unit.cs b/Source/Game/Entities/Unit/Unit.cs index cb788ac36..4ce154884 100644 --- a/Source/Game/Entities/Unit/Unit.cs +++ b/Source/Game/Entities/Unit/Unit.cs @@ -467,8 +467,8 @@ namespace Game.Entities if (IsCharmed()) RemoveCharmedBy(null); - Cypher.Assert(!GetCharmedGUID().IsEmpty(), $"Unit {GetEntry()} has charmed guid when removed from world"); - Cypher.Assert(!GetCharmerGUID().IsEmpty(), $"Unit {GetEntry()} has charmer guid when removed from world"); + Cypher.Assert(GetCharmedGUID().IsEmpty(), $"Unit {GetEntry()} has charmed guid when removed from world"); + Cypher.Assert(GetCharmerGUID().IsEmpty(), $"Unit {GetEntry()} has charmer guid when removed from world"); Unit owner = GetOwner(); if (owner != null) diff --git a/Source/Game/Maps/Map.cs b/Source/Game/Maps/Map.cs index ab80e37e1..cc05711bd 100644 --- a/Source/Game/Maps/Map.cs +++ b/Source/Game/Maps/Map.cs @@ -5558,7 +5558,7 @@ namespace Game.Maps public uint AreaId; public float FloorZ; - public bool outdoors; + public bool outdoors = true; public ZLiquidStatus LiquidStatus; public Optional areaInfo; public Optional LiquidInfo; diff --git a/Source/Game/Networking/Packets/GuildPackets.cs b/Source/Game/Networking/Packets/GuildPackets.cs index a1c61f4ed..551dbda1c 100644 --- a/Source/Game/Networking/Packets/GuildPackets.cs +++ b/Source/Game/Networking/Packets/GuildPackets.cs @@ -578,7 +578,7 @@ namespace Game.Networking.Packets public override void Read() { - RankID = _worldPacket.ReadInt32(); + RankID = _worldPacket.ReadUInt8(); RankOrder = _worldPacket.ReadInt32(); Flags = _worldPacket.ReadUInt32(); WithdrawGoldLimit = _worldPacket.ReadUInt32(); @@ -597,7 +597,7 @@ namespace Game.Networking.Packets OldFlags = _worldPacket.ReadUInt32(); } - public int RankID; + public byte RankID; public int RankOrder; public uint WithdrawGoldLimit; public uint Flags; diff --git a/Source/Scripts/World/AreaTrigger.cs b/Source/Scripts/World/AreaTrigger.cs index a8fab07ca..3b26e8ccb 100644 --- a/Source/Scripts/World/AreaTrigger.cs +++ b/Source/Scripts/World/AreaTrigger.cs @@ -210,47 +210,6 @@ namespace Scripts.World.Areatriggers } } - [Script] - class AreaTrigger_at_last_rites : AreaTriggerScript - { - public AreaTrigger_at_last_rites() : base("at_last_rites") { } - - public override bool OnTrigger(Player player, AreaTriggerRecord areaTrigger, bool entered) - { - if (!(player.GetQuestStatus(QuestIds.LastRites) == QuestStatus.Incomplete || - player.GetQuestStatus(QuestIds.LastRites) == QuestStatus.Complete || - player.GetQuestStatus(QuestIds.BreakingThrough) == QuestStatus.Incomplete || - player.GetQuestStatus(QuestIds.BreakingThrough) == QuestStatus.Complete)) - return false; - - WorldLocation pPosition; - - switch (areaTrigger.Id) - { - case 5332: - case 5338: - pPosition = new WorldLocation(571, 3733.68f, 3563.25f, 290.812f, 3.665192f); - break; - case 5334: - pPosition = new WorldLocation(571, 3802.38f, 3585.95f, 49.5765f, 0.0f); - break; - case 5340: - if (player.GetQuestStatus(QuestIds.LastRites) == QuestStatus.Incomplete || - player.GetQuestStatus(QuestIds.LastRites) == QuestStatus.Complete) - pPosition = new WorldLocation(571, 3687.91f, 3577.28f, 473.342f); - else - pPosition = new WorldLocation(571, 3739.38f, 3567.09f, 341.58f); - break; - default: - return false; - } - - player.TeleportTo(pPosition); - - return false; - } - } - [Script] class AreaTrigger_at_sholazar_waygate : AreaTriggerScript {