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

Fix more errors

Browse Source
This commit is contained in:
DrSmugleaf
2021-12-06 00:52:58 +01:00
parent 2b1fecbe02
commit 215cae5655
55 changed files with 262 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/Power/Components/ApcComponent.cs
View File

@@ -93,7 +93,7 @@ namespace Content.Server.Power.Components
if (user == null) return;
var accessSystem = EntitySystem.Get<AccessReaderSystem>();
if (_accessReader == null || accessSystem.IsAllowed(_accessReader, user))
if (_accessReader == null || accessSystem.IsAllowed(_accessReader, user.Value))
{
MainBreakerEnabled = !MainBreakerEnabled;
IoCManager.Resolve<IEntityManager>().GetComponent<PowerNetworkBatteryComponent>(Owner).CanDischarge = MainBreakerEnabled;
@@ -103,7 +103,7 @@ namespace Content.Server.Power.Components
}
else
{
user.PopupMessageCursor(Loc.GetString("apc-component-insufficient-access"));
user.Value.PopupMessageCursor(Loc.GetString("apc-component-insufficient-access"));
}
}

3
Content.Server/Power/Components/BaseCharger.cs
View File

@@ -90,8 +90,7 @@ namespace Content.Server.Power.Components
/// <param name="user"></param>
public void RemoveItem(EntityUid user)
{
var heldItem = Container.ContainedEntity;
if (heldItem == null)
if (Container.ContainedEntity is not {Valid: true} heldItem)
{
return;
}