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

Fix 3000 errors

Browse Source
This commit is contained in:
DrSmugleaf
2021-12-05 18:09:01 +01:00
parent 2bfec7ec62
commit 2a3b7d809d
569 changed files with 2979 additions and 3280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,7 +25,6 @@ using Robust.Shared.IoC;
using Robust.Shared.Log;
using Robust.Shared.Maths;
using Robust.Shared.Player;
using Robust.Shared.Players;
using Robust.Shared.Prototypes;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
@@ -257,7 +256,7 @@ namespace Content.Server.Doors.Components
if (!ClickOpen)
return;
DoorClickShouldActivateEvent ev = new DoorClickShouldActivateEvent(eventArgs);
var ev = new DoorClickShouldActivateEvent(eventArgs);
IoCManager.Resolve<IEntityManager>().EventBus.RaiseLocalEvent(Owner, ev, false);
if (ev.Handled)
return;
@@ -274,18 +273,17 @@ namespace Content.Server.Doors.Components
#region Opening
public void TryOpen(IEntity? user=null)
public void TryOpen(EntityUid user = default)
{
var msg = new DoorOpenAttemptEvent();
IoCManager.Resolve<IEntityManager>().EventBus.RaiseLocalEvent(Owner, msg);
if (msg.Cancelled) return;
if (user == null)
if (!user.Valid)
{
// a machine opened it or something, idk
Open();
return;
}
else if (CanOpenByEntity(user))
{
@@ -303,9 +301,9 @@ namespace Content.Server.Doors.Components
}
}
public bool CanOpenByEntity(IEntity user)
public bool CanOpenByEntity(EntityUid user)
{
if(!CanOpenGeneric())
if (!CanOpenGeneric())
{
return false;
}
@@ -422,14 +420,14 @@ namespace Content.Server.Doors.Components
#region Closing
public void TryClose(IEntity? user=null)
public void TryClose(EntityUid user = default)
{
var msg = new DoorCloseAttemptEvent();
IoCManager.Resolve<IEntityManager>().EventBus.RaiseLocalEvent(Owner, msg);
if (msg.Cancelled) return;
if (user != null && !CanCloseByEntity(user))
if (user != default && !CanCloseByEntity(user))
{
Deny();
return;
@@ -438,7 +436,7 @@ namespace Content.Server.Doors.Components
Close();
}
public bool CanCloseByEntity(IEntity user)
public bool CanCloseByEntity(EntityUid user)
{
if (!CanCloseGeneric())
{