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

2
Content.Server/Singularity/EntitySystems/EmitterSystem.cs
View File

@@ -189,7 +189,7 @@ namespace Content.Server.Singularity.EntitySystems
IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(projectile).WorldRotation = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(component.Owner).WorldRotation;
// TODO: Move to projectile's code.
Timer.Spawn(3000, () => IoCManager.Resolve<IEntityManager>().DeleteEntity((EntityUid) projectile));
Timer.Spawn(3000, () => IoCManager.Resolve<IEntityManager>().DeleteEntity(projectile));
SoundSystem.Play(Filter.Pvs(component.Owner), component.FireSound.GetSound(), component.Owner,
AudioHelpers.WithVariation(EmitterComponent.Variation).WithVolume(EmitterComponent.Volume).WithMaxDistance(EmitterComponent.Distance));

8
Content.Server/Singularity/EntitySystems/SingularitySystem.cs
View File

@@ -99,7 +99,7 @@ namespace Content.Server.Singularity.EntitySystems
return component.Level - 0.5f;
}
private bool CanDestroy(SharedSingularityComponent component, IEntity entity)
private bool CanDestroy(SharedSingularityComponent component, EntityUid entity)
{
return entity == component.Owner ||
IoCManager.Resolve<IEntityManager>().HasComponent<IMapGridComponent>(entity) ||
@@ -108,7 +108,7 @@ namespace Content.Server.Singularity.EntitySystems
IoCManager.Resolve<IEntityManager>().HasComponent<ContainmentFieldGeneratorComponent>(entity);
}
private void HandleDestroy(ServerSingularityComponent component, IEntity entity)
private void HandleDestroy(ServerSingularityComponent component, EntityUid entity)
{
// TODO: Need singuloimmune tag
if (CanDestroy(component, entity)) return;
@@ -125,7 +125,7 @@ namespace Content.Server.Singularity.EntitySystems
otherSingulo.BeingDeletedByAnotherSingularity = true;
}
IoCManager.Resolve<IEntityManager>().QueueDeleteEntity((EntityUid) entity);
IoCManager.Resolve<IEntityManager>().QueueDeleteEntity(entity);
if (IoCManager.Resolve<IEntityManager>().TryGetComponent<SinguloFoodComponent?>(entity, out var singuloFood))
component.Energy += singuloFood.Energy;
@@ -147,7 +147,7 @@ namespace Content.Server.Singularity.EntitySystems
}
}
private bool CanPull(IEntity entity)
private bool CanPull(EntityUid entity)
{
return !(IoCManager.Resolve<IEntityManager>().HasComponent<GhostComponent>(entity) ||
IoCManager.Resolve<IEntityManager>().HasComponent<IMapGridComponent>(entity) ||