tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests 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

12
Content.Server/Flash/FlashSystem.cs
View File

@@ -3,7 +3,6 @@ using Content.Server.Flash.Components;
using Content.Server.Inventory.Components;
using Content.Server.Items;
using Content.Server.Stunnable;
using Content.Server.Stunnable.Components;
using Content.Server.Weapon.Melee;
using Content.Shared.Examine;
using Content.Shared.Flash;
@@ -13,7 +12,6 @@ using Content.Shared.Inventory;
using Content.Shared.Physics;
using Content.Shared.Popups;
using Content.Shared.Sound;
using Content.Shared.Stunnable;
using Robust.Server.GameObjects;
using Robust.Shared.Audio;
using Robust.Shared.GameObjects;
@@ -50,7 +48,7 @@ namespace Content.Server.Flash
}
args.Handled = true;
foreach (IEntity e in args.HitEntities)
foreach (EntityUide in args.HitEntities)
{
Flash(e, args.User, uid, comp.FlashDuration, comp.SlowTo);
}
@@ -83,7 +81,7 @@ namespace Content.Server.Flash
}
}
private bool UseFlash(FlashComponent comp, IEntity user)
private bool UseFlash(FlashComponent comp, EntityUiduser)
{
if (comp.HasUses)
{
@@ -136,9 +134,9 @@ namespace Content.Server.Flash
if (displayPopup && user != null && target != user)
{
// TODO Resolving the IEntity here bad.
if(EntityManager.TryGetEntity(user.Value, out var userEntity)
&& EntityManager.TryGetEntity(target, out var targetEntity))
// TODO Resolving the EntityUidhere bad.
if(EntityManager.EntityExists(user.Value)
&& EntityManager.EntityExists(target)
userEntity.PopupMessage(targetEntity,
Loc.GetString(