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

9
Content.Server/Explosion/Components/ClusterFlashComponent.cs
View File

@@ -1,5 +1,4 @@
using System;
using System.Diagnostics.CodeAnalysis;
using System.Threading.Tasks;
using Content.Server.Explosion.EntitySystems;
using Content.Server.Flash.Components;
@@ -100,7 +99,7 @@ namespace Content.Server.Explosion.Components
var delay = 20;
var grenadesInserted = _grenadesContainer.ContainedEntities.Count + _unspawnedCount;
var thrownCount = 0;
var segmentAngle = (int) (360 / grenadesInserted);
var segmentAngle = 360 / grenadesInserted;
while (TryGetGrenade(out var grenade))
{
var angleMin = segmentAngle * thrownCount;
@@ -123,14 +122,14 @@ namespace Content.Server.Explosion.Components
});
}
IoCManager.Resolve<IEntityManager>().DeleteEntity((EntityUid) Owner);
IoCManager.Resolve<IEntityManager>().DeleteEntity(Owner);
});
return true;
}
private bool TryGetGrenade([NotNullWhen(true)] out IEntity? grenade)
private bool TryGetGrenade(out EntityUid grenade)
{
grenade = null;
grenade = default;
if (_unspawnedCount > 0)
{

2
Content.Server/Explosion/Components/OnUseTimerTriggerComponent.cs
View File

@@ -17,7 +17,7 @@ namespace Content.Server.Explosion.Components
private float _delay = 0f;
// TODO: Need to split this out so it's a generic "OnUseTimerTrigger" component.
public void Trigger(IEntity user)
public void Trigger(EntityUid user)
{
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(Owner, out AppearanceComponent? appearance))
appearance.SetData(TriggerVisuals.VisualState, TriggerVisualState.Primed);

19
Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
View File

@@ -5,7 +5,6 @@ using Content.Server.Administration.Logs;
using Content.Server.Camera;
using Content.Server.Explosion.Components;
using Content.Shared.Acts;
using Content.Shared.Administration.Logs;
using Content.Shared.Database;
using Content.Shared.Interaction.Helpers;
using Content.Shared.Maps;
@@ -53,7 +52,7 @@ namespace Content.Server.Explosion.EntitySystems
[Dependency] private readonly TriggerSystem _triggers = default!;
[Dependency] private readonly AdminLogSystem _logSystem = default!;
private bool IgnoreExplosivePassable(IEntity e)
private bool IgnoreExplosivePassable(EntityUid e)
{
return e.HasTag("ExplosivePassable");
}
@@ -82,12 +81,12 @@ namespace Content.Server.Explosion.EntitySystems
foreach (var player in players)
{
if (player.AttachedEntity == null || !IoCManager.Resolve<IEntityManager>().TryGetComponent(player.AttachedEntity, out CameraRecoilComponent? recoil))
if (!player.AttachedEntity.Valid || !EntityManager.TryGetComponent(player.AttachedEntity, out CameraRecoilComponent? recoil))
{
continue;
}
var playerPos = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(player.AttachedEntity).WorldPosition;
var playerPos = EntityManager.GetComponent<TransformComponent>(player.AttachedEntity).WorldPosition;
var delta = epicenter.ToMapPos(EntityManager) - playerPos;
//Change if zero. Will result in a NaN later breaking camera shake if not changed
@@ -122,26 +121,26 @@ namespace Content.Server.Explosion.EntitySystems
{
var entitiesInRange = _entityLookup.GetEntitiesInRange(mapId, boundingBox, 0).ToList();
var impassableEntities = new List<(IEntity, float)>();
var nonImpassableEntities = new List<(IEntity, float)>();
var impassableEntities = new List<(EntityUid, float)>();
var nonImpassableEntities = new List<(EntityUid, float)>();
// TODO: Given this seems to rely on physics it should just query directly like everything else.
// The entities are paired with their distance to the epicenter
// and splitted into two lists based on if they are Impassable or not
foreach (var entity in entitiesInRange)
{
if ((!IoCManager.Resolve<IEntityManager>().EntityExists(entity) ? EntityLifeStage.Deleted : IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(entity).EntityLifeStage) >= EntityLifeStage.Deleted || entity.IsInContainer())
if ((!EntityManager.EntityExists(entity) ? EntityLifeStage.Deleted : EntityManager.GetComponent<MetaDataComponent>(entity).EntityLifeStage) >= EntityLifeStage.Deleted || entity.IsInContainer())
{
continue;
}
if (!IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(entity).Coordinates.TryDistance(EntityManager, epicenter, out var distance) ||
if (!EntityManager.GetComponent<TransformComponent>(entity).Coordinates.TryDistance(EntityManager, epicenter, out var distance) ||
distance > maxRange)
{
continue;
}
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(entity, out PhysicsComponent? body) || body.Fixtures.Count < 1)
if (!EntityManager.TryGetComponent(entity, out PhysicsComponent? body) || body.Fixtures.Count < 1)
{
continue;
}
@@ -310,7 +309,7 @@ namespace Content.Server.Explosion.EntitySystems
}
else
{
while (EntityManager.TryGetEntity(entity, out var e) && e.TryGetContainer(out var container))
while (EntityManager.EntityExists(entity) && entity.TryGetContainer(out var container))
{
entity = container.Owner;
}

10
Content.Server/Explosion/EntitySystems/TriggerSystem.cs
View File

@@ -20,10 +20,10 @@ namespace Content.Server.Explosion.EntitySystems
/// </summary>
public class TriggerEvent : HandledEntityEventArgs
{
public IEntity Triggered { get; }
public IEntity? User { get; }
public EntityUid Triggered { get; }
public EntityUid User { get; }
public TriggerEvent(IEntity triggered, IEntity? user = null)
public TriggerEvent(EntityUid triggered, EntityUid user = default)
{
Triggered = triggered;
User = user;
@@ -116,13 +116,13 @@ namespace Content.Server.Explosion.EntitySystems
Trigger(component.Owner);
}
public void Trigger(IEntity trigger, IEntity? user = null)
public void Trigger(EntityUid trigger, EntityUid user = default)
{
var triggerEvent = new TriggerEvent(trigger, user);
EntityManager.EventBus.RaiseLocalEvent(trigger, triggerEvent);
}
public void HandleTimerTrigger(TimeSpan delay, IEntity triggered, IEntity? user = null)
public void HandleTimerTrigger(TimeSpan delay, EntityUid triggered, EntityUid user = default)
{
if (delay.TotalSeconds <= 0)
{