diff --git a/Libraries/Core/Services/BotEquipmentFilterService.cs b/Libraries/Core/Services/BotEquipmentFilterService.cs index 8e075ee4..603d1309 100644 --- a/Libraries/Core/Services/BotEquipmentFilterService.cs +++ b/Libraries/Core/Services/BotEquipmentFilterService.cs @@ -122,8 +122,8 @@ public class BotEquipmentFilterService foreach (var itemKey in generationChanges) { - baseBotGeneration.Items.GetByJsonProp(itemKey.Key).Weights = generationChanges.GetByJsonProp(itemKey.Key).Weights; - baseBotGeneration.Items.GetByJsonProp(itemKey.Key).Whitelist = generationChanges.GetByJsonProp(itemKey.Key).Whitelist; + baseBotGeneration.Items.GetByJsonProp(itemKey.Key).Weights = generationChanges.GetValueOrDefault(itemKey.Key).Weights; + baseBotGeneration.Items.GetByJsonProp(itemKey.Key).Whitelist = generationChanges.GetValueOrDefault(itemKey.Key).Whitelist; } } @@ -476,7 +476,7 @@ public class BotEquipmentFilterService foreach (var itemToEditKvP in poolAdjustmentKvP.Value) { // Only make change if item exists as we're editing, not adding - if (locationToUpdate[itemToEditKvP.Key] != null || locationToUpdate[itemToEditKvP.Key] == 0) + if (locationToUpdate.GetValueOrDefault(itemToEditKvP.Key) != null || locationToUpdate.GetValueOrDefault(itemToEditKvP.Key) == 0) { locationToUpdate[itemToEditKvP.Key] = itemToEditKvP.Value; } diff --git a/Libraries/Core/Services/LocationLifecycleService.cs b/Libraries/Core/Services/LocationLifecycleService.cs index 6cef2d0e..efceb569 100644 --- a/Libraries/Core/Services/LocationLifecycleService.cs +++ b/Libraries/Core/Services/LocationLifecycleService.cs @@ -156,6 +156,7 @@ public class LocationLifecycleService var transitionData = _applicationContext .GetLatestValue(ContextVariableType.TRANSIT_INFO) ?.GetValue(); + if (transitionData is not null) { _logger.Success($"Player: {sessionId} is in transit to {request.Location}"); result.Transition.TransitionType = TransitionType.COMMON;