Skip to content

Commit 6676caa

Browse files
committed
document NRE
1 parent 11579ab commit 6676caa

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

Intersect.Server/Networking/PacketSender.cs

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,7 @@ public static void SendMapInstanceChangedPacket(Player player, MapController old
411411
{
412412
var entitiesToDispose = oldMapInstance.GetEntities(true);
413413
var effectedMaps = oldMapInstance.GetController().GetSurroundingMapIds(true);
414-
414+
415415
var enPackets = new List<EntityPacket>();
416416
for (var i = 0; i < entitiesToDispose.Count; i++)
417417
{
@@ -1041,7 +1041,7 @@ public static MapItemsPacket GenerateMapItemsPacket(Player player, Guid mapId)
10411041
{
10421042
items.Add(new MapItemUpdatePacket(mapId, item.TileIndex, item.UniqueId, item.ItemId, item.BagId, item.Quantity, item.Properties));
10431043
}
1044-
}
1044+
}
10451045
}
10461046
return new MapItemsPacket(mapId, items.ToArray());
10471047
}
@@ -1095,7 +1095,7 @@ public static void SendMapItemsToProximity(Guid mapId, MapInstance mapInstance)
10951095
SendDataToProximityOnMapInstance(mapId, mapInstanceId, new MapItemUpdatePacket(mapId, itemRef.TileIndex, itemRef.UniqueId));
10961096
}
10971097
}
1098-
1098+
10991099
}
11001100
else
11011101
{
@@ -1262,7 +1262,12 @@ public static void SendPlayerCharacters(Client client)
12621262
}
12631263
}
12641264

1265-
if (client.Characters.Count > 0)
1265+
var clientCharacters = client?.Characters;
1266+
if (clientCharacters == default) {
1267+
Log.Error($"PLEASE REPORT THIS WITH LOGS: About to crash because {(client == default ? nameof(client) : nameof(client.Characters))} is null.");
1268+
}
1269+
1270+
if (client.Characters.Count > 0) /* TODO: Fix NRE when logging out and back in */
12661271
{
12671272
foreach (var character in client.Characters.OrderByDescending(p => p.LastOnline))
12681273
{
@@ -2167,7 +2172,7 @@ public static bool SendDataAcrossMapInstancesInProximity(Guid mapId, IPacket pac
21672172
{
21682173
return false;
21692174
}
2170-
2175+
21712176
SendDataToAllLayersOfMap(mapId, packet, except, mode);
21722177

21732178
foreach (var surrMap in map.SurroundingMapIds)

0 commit comments

Comments
 (0)