fixes master woooo

Citadel-Station-13 · Dec 6, 2023 · 0ea63b1 · 0ea63b1
1 parent 042b261
commit 0ea63b1
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 3 deletions.
diff --git a/Content.Server/_Citadel/Contracts/Components/ContractCriteriaControlComponent.cs b/Content.Server/_Citadel/Contracts/Components/ContractCriteriaControlComponent.cs
@@ -22,7 +22,7 @@ public sealed partial class ContractCriteriaControlComponent : Component
     /// Additional criteria effects, on top of the ones the groups already have.
     /// </summary>
     [DataField("criteriaEffects")]
-    public Dictionary<string, List<CriteriaGroupEffectEvent>> CriteriaEffects = default!;
+    public Dictionary<string, List<CriteriaGroupEffectEvent>> CriteriaEffects = new();
 
     /// <summary>
     /// The actual criteria entities.

diff --git a/...er/_Citadel/MiningContracts/Criteria/Systems/CriteriaMaterialStorageHasMaterialsSystem.cs b/...er/_Citadel/MiningContracts/Criteria/Systems/CriteriaMaterialStorageHasMaterialsSystem.cs
@@ -25,6 +25,7 @@ public sealed class CriteriaMaterialStorageHasMaterialsSystem : EntitySystem
     [Dependency] private readonly MaterialStorageSystem _material = default!;
     [Dependency] private readonly ContractVesselManagementSystem _contractVessel = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly IEntityManager _entityManager = default!;
 
     /// <inheritdoc/>
     public override void Initialize()
@@ -66,7 +67,10 @@ public override void Update(float frameTime)
 
         while (q.MoveNext(out var uid, out var cc, out var criteria))
         {
-            if (Comp<ContractComponent>(cc.OwningContract).OwningContractor is not {} owningContractor)
+            if (!_entityManager.TryGetComponent<ContractComponent>(cc.OwningContract, out var owningContractComponent))
+                continue;
+
+            if (owningContractComponent.OwningContractor is not {} owningContractor)
                 continue;
 
             if (_contractVessel.LocateUserVesselContract(new Entity<MindComponent>(owningContractor.Owner, owningContractor)) is not

diff --git a/Content.Server/_Citadel/VesselContracts/Systems/ContractVesselManagementSystem.cs b/Content.Server/_Citadel/VesselContracts/Systems/ContractVesselManagementSystem.cs
@@ -38,6 +38,8 @@ public override void Initialize()
 
     private void OnVesselContractShutdown(EntityUid uid, VesselContractComponent component, ComponentShutdown args)
     {
+        if (component.Vessel == null)
+            return;
         _station.DeleteStation(component.Vessel!.Value);
     }
 

diff --git a/Resources/Locale/en-US/_citadel/cartridges.ftl b/Resources/Locale/en-US/_citadel/cartridges.ftl
@@ -0,0 +1 @@
+contracts-program-name = Contracts
diff --git a/Resources/Prototypes/_Citadel/PDA/cartridges.yml b/Resources/Prototypes/_Citadel/PDA/cartridges.yml
@@ -14,7 +14,7 @@
     - type: UIFragment
       ui: !type:ContractsCartridgeUi
     - type: Cartridge
-      programName: Contracts
+      programName: contracts-program-name
       icon:
         sprite: Objects/Misc/books.rsi
         state: book6