Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 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

2
Content.Server/Disposal/Tube/Components/DisposalRouterComponent.cs
View File

@@ -112,7 +112,7 @@ namespace Content.Server.Disposal.Tube.Components
var actionBlocker = EntitySystem.Get<ActionBlockerSystem>();
var groupController = IoCManager.Resolve<IConGroupController>();
//Check if player can interact in their current state
if (!groupController.CanAdminMenu(session) && (!actionBlocker.CanInteract(session.AttachedEntityUid!.Value) || !actionBlocker.CanUse(session.AttachedEntityUid!.Value)))
if (!groupController.CanAdminMenu(session) && (!actionBlocker.CanInteract(session.AttachedEntity!.Value) || !actionBlocker.CanUse(session.AttachedEntity!.Value)))
return false;
return true;

2
Content.Server/Disposal/Tube/Components/DisposalTaggerComponent.cs
View File

@@ -94,7 +94,7 @@ namespace Content.Server.Disposal.Tube.Components
var actionBlocker = EntitySystem.Get<ActionBlockerSystem>();
var groupController = IoCManager.Resolve<IConGroupController>();
//Check if player can interact in their current state
if (!groupController.CanAdminMenu(session) && (!actionBlocker.CanInteract(session.AttachedEntityUid!.Value) || !actionBlocker.CanUse(session.AttachedEntityUid!.Value)))
if (!groupController.CanAdminMenu(session) && (!actionBlocker.CanInteract(session.AttachedEntity!.Value) || !actionBlocker.CanUse(session.AttachedEntity!.Value)))
return false;
return true;

5
Content.Server/Disposal/Tube/Components/DisposalTubeComponent.cs
View File

@@ -7,13 +7,10 @@ using Content.Shared.Acts;
using Content.Shared.Disposal.Components;
using Content.Shared.Popups;
using Content.Shared.Sound;
using Content.Shared.Verbs;
using Robust.Server.Console;
using Robust.Shared.Containers;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Localization;
using Robust.Shared.Map;
using Robust.Shared.Maths;
using Robust.Shared.Physics;
using Robust.Shared.Serialization.Manager.Attributes;
@@ -100,7 +97,7 @@ namespace Content.Server.Disposal.Tube.Components
}
}
public void PopupDirections(IEntity entity)
public void PopupDirections(EntityUid entity)
{
var directions = string.Join(", ", ConnectableDirections());

2
Content.Server/Disposal/Tube/Components/IDisposalTubeComponent.cs
View File

@@ -11,6 +11,6 @@ namespace Content.Server.Disposal.Tube.Components
Direction NextDirection(DisposalHolderComponent holder);
bool CanConnect(Direction direction, IDisposalTubeComponent with);
void PopupDirections(IEntity entity);
void PopupDirections(EntityUid entity);
}
}

4
Content.Server/Disposal/Tube/DisposalTubeSystem.cs
View File

@@ -5,9 +5,9 @@ using Robust.Server.GameObjects;
using Robust.Shared.Audio;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Localization;
using Robust.Shared.Map;
using Robust.Shared.Maths;
using Robust.Shared.Localization;
using Robust.Shared.Player;
using Robust.Shared.Timing;
@@ -68,7 +68,7 @@ namespace Content.Server.Disposal.Tube
return;
}
var entity = EntityManager.GetEntity(uid);
var uid
component.LastClang = _gameTiming.CurTime;
SoundSystem.Play(Filter.Pvs(entity), component.ClangSound.GetSound(), entity);
}

2
Content.Server/Disposal/TubeConnectionsCommand.cs
View File

@@ -38,7 +38,7 @@ namespace Content.Server.Disposal
}
var entityManager = IoCManager.Resolve<IEntityManager>();
if (!entityManager.TryGetEntity(id, out var entity))
if (!entityManager.EntityExists(id)
{
shell.WriteLine(Loc.GetString("shell-could-not-find-entity-with-uid",("uid", id)));
return;

9
Content.Server/Disposal/Unit/Components/DisposalHolderComponent.cs
View File

@@ -1,11 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Content.Server.Atmos;
using Content.Server.Atmos.EntitySystems;
using Content.Server.Disposal.Tube.Components;
using Content.Server.Disposal.Tube;
using Content.Server.Disposal.Unit.EntitySystems;
using Content.Server.Items;
using Content.Shared.Atmos;
using Content.Shared.Body.Components;
@@ -77,7 +72,7 @@ namespace Content.Server.Disposal.Unit.Components
Container = ContainerHelpers.EnsureContainer<Container>(Owner, nameof(DisposalHolderComponent));
}
private bool CanInsert(IEntity entity)
private bool CanInsert(EntityUid entity)
{
if (!Container.CanInsert(entity))
{
@@ -88,7 +83,7 @@ namespace Content.Server.Disposal.Unit.Components
IoCManager.Resolve<IEntityManager>().HasComponent<SharedBodyComponent>(entity);
}
public bool TryInsert(IEntity entity)
public bool TryInsert(EntityUid entity)
{
if (!CanInsert(entity) || !Container.Insert(entity))
{

4
Content.Server/Disposal/Unit/Components/DisposalUnitComponent.cs
View File

@@ -71,7 +71,7 @@ namespace Content.Server.Disposal.Unit.Components
/// </summary>
[ViewVariables] public Container Container = default!;
[ViewVariables] public IReadOnlyList<IEntity> ContainedEntities => Container.ContainedEntities;
[ViewVariables] public IReadOnlyList<EntityUid> ContainedEntities => Container.ContainedEntities;
[ViewVariables]
public bool Powered =>
@@ -88,7 +88,7 @@ namespace Content.Server.Disposal.Unit.Components
[DataField("air")]
public GasMixture Air { get; set; } = new(Atmospherics.CellVolume);
private bool PlayerCanUse(IEntity? player)
private bool PlayerCanUse(EntityUid player)
{
if (player == null)
{

8
Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
View File

@@ -116,7 +116,7 @@ namespace Content.Server.Disposal.Unit.EntitySystems
private void DoInsertDisposalUnit(DoInsertDisposalUnitEvent ev)
{
var toInsert = EntityManager.GetEntity(ev.ToInsert);
var toInsert = ev.ToInsert
if (!EntityManager.TryGetComponent(ev.Unit, out DisposalUnitComponent? unit))
{
@@ -547,7 +547,7 @@ namespace Content.Server.Disposal.Unit.EntitySystems
: SharedDisposalUnitComponent.LightState.Ready);
}
public void Remove(DisposalUnitComponent component, IEntity entity)
public void Remove(DisposalUnitComponent component, EntityUid entity)
{
component.Container.Remove(entity);
@@ -600,7 +600,7 @@ namespace Content.Server.Disposal.Unit.EntitySystems
}
}
public override bool CanInsert(SharedDisposalUnitComponent component, IEntity entity)
public override bool CanInsert(SharedDisposalUnitComponent component, EntityUid entity)
{
if (!base.CanInsert(component, entity) || component is not DisposalUnitComponent serverComp)
return false;
@@ -629,7 +629,7 @@ namespace Content.Server.Disposal.Unit.EntitySystems
}, component.AutomaticEngageToken.Token);
}
public void AfterInsert(DisposalUnitComponent component, IEntity entity)
public void AfterInsert(DisposalUnitComponent component, EntityUid entity)
{
TryQueueEngage(component);