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

5
Content.Server/Ghost/Components/GhostRadioComponent.cs
View File

@@ -2,7 +2,6 @@
using Content.Server.Radio.Components;
using Content.Shared.Chat;
using Robust.Server.GameObjects;
using Robust.Shared.Containers;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Localization;
@@ -24,7 +23,7 @@ namespace Content.Server.Ghost.Components
public IReadOnlyList<int> Channels => _channels;
public void Receive(string message, int channel, IEntity speaker)
public void Receive(string message, int channel, EntityUidspeaker)
{
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(Owner, out ActorComponent? actor))
return;
@@ -40,6 +39,6 @@ namespace Content.Server.Ghost.Components
_netManager.ServerSendMessage(msg, playerChannel);
}
public void Broadcast(string message, IEntity speaker) { }
public void Broadcast(string message, EntityUidspeaker) { }
}
}

4
Content.Server/Ghost/GhostSystem.cs
View File

@@ -169,7 +169,7 @@ namespace Content.Server.Ghost
return;
}
if (!EntityManager.TryGetEntity(msg.Target, out var entity))
if (!EntityManager.EntityExists(msg.Target)
{
Logger.Warning($"User {args.SenderSession.Name} tried to warp to an invalid entity id: {msg.Target}");
return;
@@ -180,7 +180,7 @@ namespace Content.Server.Ghost
private void DeleteEntity(EntityUid uid)
{
if (!EntityManager.TryGetEntity(uid, out var entity)
if (!EntityManager.EntityExists(uid)
|| (!IoCManager.Resolve<IEntityManager>().EntityExists(entity) ? EntityLifeStage.Deleted : IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(entity).EntityLifeStage) >= EntityLifeStage.Deleted
|| (!IoCManager.Resolve<IEntityManager>().EntityExists(entity) ? EntityLifeStage.Deleted : IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(entity).EntityLifeStage) == EntityLifeStage.Terminating)
return;

4
Content.Server/Ghost/Roles/Components/GhostRoleMobSpawnerComponent.cs
View File

@@ -1,13 +1,11 @@
using System;
using Content.Server.Mind.Commands;
using Content.Server.Mind.Components;
using Content.Server.Players;
using JetBrains.Annotations;
using Robust.Server.Player;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.Utility;
using Robust.Shared.ViewVariables;
namespace Content.Server.Ghost.Roles.Components
@@ -58,7 +56,7 @@ namespace Content.Server.Ghost.Roles.Components
Taken = true;
if (_deleteOnSpawn)
IoCManager.Resolve<IEntityManager>().DeleteEntity((EntityUid) Owner);
IoCManager.Resolve<IEntityManager>().DeleteEntity(Owner);
return true;
}