tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix errors

Browse Source
This commit is contained in:
DrSmugleaf
2021-12-05 21:02:04 +01:00
parent 2a3b7d809d
commit ab9d0cc6d8
94 changed files with 568 additions and 591 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Content.Server/Light/EntitySystems/PoweredLightSystem.cs
View File

@@ -154,7 +154,7 @@ namespace Content.Server.Light.EntitySystems
return false;
// try to insert bulb in container
if (!light.LightBulbContainer.Insert(EntityManager.GetEntity(bulbUid)))
if (!light.LightBulbContainer.Insert(bulbUid))
return false;
UpdateLight(uid, light);
@@ -172,24 +172,22 @@ namespace Content.Server.Light.EntitySystems
return null;
// check if light has bulb
var bulbUid = GetBulb(uid, light);
if (bulbUid == null)
if (GetBulb(uid, light) is not {Valid: true} bulb)
return null;
// try to remove bulb from container
var bulbbulbUid.Value
if (!light.LightBulbContainer.Remove(bulbEnt))
if (!light.LightBulbContainer.Remove(bulb))
return null;
// try to place bulb in hands
if (userUid != null)
{
if (EntityManager.TryGetComponent(userUid.Value, out SharedHandsComponent? hands))
hands.TryPutInActiveHandOrAny(bulbEnt);
hands.TryPutInActiveHandOrAny(bulb);
}
UpdateLight(uid, light);
return bulbUid;
return bulb;
}
/// <summary>