Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Make more uids nullable (#5794)

Browse Source
This commit is contained in:
Leon Friedrich
2021-12-26 15:32:45 +13:00
committed by GitHub
parent 83114de0e4
commit afc3ae6335
42 changed files with 161 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/Storage/Components/CursedEntityStorageComponent.cs
View File

@@ -37,9 +37,9 @@ namespace Content.Server.Storage.Components
if (lockers.Contains(Owner))
lockers.Remove(Owner);
var lockerEnt = _robustRandom.Pick(lockers);
if (lockers.Count == 0) return;
if (lockerEnt == null) return; // No valid lockers anywhere.
var lockerEnt = _robustRandom.Pick(lockers);
var locker = _entMan.GetComponent<EntityStorageComponent>(lockerEnt);

6
Content.Server/Storage/EntitySystems/SpawnItemsOnUseSystem.cs
View File

@@ -27,7 +27,7 @@ namespace Content.Server.Storage.EntitySystems
return;
var alreadySpawnedGroups = new List<string>();
EntityUid entityToPlaceInHands = default;
EntityUid? entityToPlaceInHands = null;
foreach (var storageItem in component.Items)
{
if (!string.IsNullOrEmpty(storageItem.GroupId) &&
@@ -57,10 +57,10 @@ namespace Content.Server.Storage.EntitySystems
EntityManager.DeleteEntity(uid);
}
if (entityToPlaceInHands != default
if (entityToPlaceInHands != null
&& EntityManager.TryGetComponent<SharedHandsComponent?>(args.User, out var hands))
{
hands.TryPutInAnyHand(entityToPlaceInHands);
hands.TryPutInAnyHand(entityToPlaceInHands.Value);
}
}
}