tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests 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

10
Content.Server/Doors/Components/ServerDoorComponent.cs
View File

@@ -275,19 +275,19 @@ namespace Content.Server.Doors.Components
#region Opening
public void TryOpen(EntityUid user = default)
public void TryOpen(EntityUid? user = null)
{
var msg = new DoorOpenAttemptEvent();
_entMan.EventBus.RaiseLocalEvent(Owner, msg);
if (msg.Cancelled) return;
if (!user.Valid)
if (user == null)
{
// a machine opened it or something, idk
Open();
}
else if (CanOpenByEntity(user))
else if (CanOpenByEntity(user.Value))
{
Open();
@@ -422,14 +422,14 @@ namespace Content.Server.Doors.Components
#region Closing
public void TryClose(EntityUid user = default)
public void TryClose(EntityUid? user = null)
{
var msg = new DoorCloseAttemptEvent();
_entMan.EventBus.RaiseLocalEvent(Owner, msg);
if (msg.Cancelled) return;
if (user != default && !CanCloseByEntity(user))
if (user != null && !CanCloseByEntity(user.Value))
{
Deny();
return;