From eb8b62276e8be76097801ab1a1835671dbad60cc Mon Sep 17 00:00:00 2001 From: hondacrx Date: Thu, 4 Feb 2021 20:24:46 -0500 Subject: [PATCH] Fix few crashes while loading server. --- Source/Game/DataStorage/AreaTriggerDataStorage.cs | 2 +- Source/Game/Entities/AreaTrigger/AreaTriggerTemplate.cs | 2 +- Source/Game/Maps/ObjectGridLoader.cs | 2 +- Source/Game/Networking/Packets/BattleGroundPackets.cs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/Game/DataStorage/AreaTriggerDataStorage.cs b/Source/Game/DataStorage/AreaTriggerDataStorage.cs index bd31f7ea7..64f43b16a 100644 --- a/Source/Game/DataStorage/AreaTriggerDataStorage.cs +++ b/Source/Game/DataStorage/AreaTriggerDataStorage.cs @@ -308,7 +308,7 @@ namespace Game.DataStorage AreaTriggerSpawn spawn = new AreaTriggerSpawn(); spawn.SpawnId = spawnId; spawn.Id = areaTriggerId; - spawn.Location.WorldRelocate(location); + spawn.Location = new WorldLocation(location); spawn.PhaseUseFlags = templates.Read(8); spawn.PhaseId = templates.Read(9); diff --git a/Source/Game/Entities/AreaTrigger/AreaTriggerTemplate.cs b/Source/Game/Entities/AreaTrigger/AreaTriggerTemplate.cs index 3fb70713e..234c0e34f 100644 --- a/Source/Game/Entities/AreaTrigger/AreaTriggerTemplate.cs +++ b/Source/Game/Entities/AreaTrigger/AreaTriggerTemplate.cs @@ -199,7 +199,7 @@ namespace Game.Entities public override bool Equals(object obj) { - return Equals((AreaTriggerId)obj); + return this == (AreaTriggerId)obj; } public static bool operator ==(AreaTriggerId left, AreaTriggerId right) diff --git a/Source/Game/Maps/ObjectGridLoader.cs b/Source/Game/Maps/ObjectGridLoader.cs index 65fb37323..4994ab7c6 100644 --- a/Source/Game/Maps/ObjectGridLoader.cs +++ b/Source/Game/Maps/ObjectGridLoader.cs @@ -80,7 +80,7 @@ namespace Game.Maps { CellCoord cellCoord = i_cell.GetCellCoord(); SortedSet areaTriggers = Global.AreaTriggerDataStorage.GetAreaTriggersForMapAndCell(i_map.GetId(), cellCoord.GetId()); - if (areaTriggers.Empty()) + if (areaTriggers == null) return; LoadHelper(areaTriggers, cellCoord, ref i_areaTriggers, i_map); diff --git a/Source/Game/Networking/Packets/BattleGroundPackets.cs b/Source/Game/Networking/Packets/BattleGroundPackets.cs index 312d8da6e..f42668181 100644 --- a/Source/Game/Networking/Packets/BattleGroundPackets.cs +++ b/Source/Game/Networking/Packets/BattleGroundPackets.cs @@ -515,7 +515,7 @@ namespace Game.Networking.Packets } //Structs - class BracketInfo + struct BracketInfo { public int PersonalRating; public int Ranking;