tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GodMode code uses EntityUid

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-11-09 12:20:02 +01:00
parent e5c062559a
commit c00cdbff90
2 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Content.Server/Damage/Commands/GodModeCommand.cs
View File

@@ -18,7 +18,9 @@ namespace Content.Server.Damage.Commands
public void Execute(IConsoleShell shell, string argStr, string[] args) public void Execute(IConsoleShell shell, string argStr, string[] args)
{ {
var player = shell.Player as IPlayerSession; var player = shell.Player as IPlayerSession;
IEntity entity; EntityUid entity;
var entityManager = IoCManager.Resolve<IEntityManager>();
switch (args.Length) switch (args.Length)
{ {
@@ -29,13 +31,13 @@ namespace Content.Server.Damage.Commands
return; return;
} }
if (player.AttachedEntity == null) if (player.AttachedEntityUid == null)
{ {
shell.WriteLine("An entity needs to be specified when you aren't attached to an entity."); shell.WriteLine("An entity needs to be specified when you aren't attached to an entity.");
return; return;
} }
entity = player.AttachedEntity; entity = player.AttachedEntityUid.Value;
break; break;
case 1: case 1:
if (!EntityUid.TryParse(args[0], out var id)) if (!EntityUid.TryParse(args[0], out var id))
@@ -44,14 +46,13 @@ namespace Content.Server.Damage.Commands
return; return;
} }
var entityManager = IoCManager.Resolve<IEntityManager>(); if (!entityManager.EntityExists(id))
if (!entityManager.TryGetEntity(id, out var parsedEntity))
{ {
shell.WriteLine($"No entity found with id {id}."); shell.WriteLine($"No entity found with id {id}.");
return; return;
} }
entity = parsedEntity; entity = id;
break; break;
default: default:
shell.WriteLine(Help); shell.WriteLine(Help);
@@ -61,9 +62,11 @@ namespace Content.Server.Damage.Commands
var godmodeSystem = EntitySystem.Get<GodmodeSystem>(); var godmodeSystem = EntitySystem.Get<GodmodeSystem>();
var enabled = godmodeSystem.ToggleGodmode(entity); var enabled = godmodeSystem.ToggleGodmode(entity);
var name = entityManager.GetComponent<MetaDataComponent>(entity).EntityName;
shell.WriteLine(enabled shell.WriteLine(enabled
? $"Enabled godmode for entity {entity.Name} with id {entity.Uid}" ? $"Enabled godmode for entity {name} with id {entity}"
: $"Disabled godmode for entity {entity.Name} with id {entity.Uid}"); : $"Disabled godmode for entity {name} with id {entity}");
} }
} }
} }

28
Content.Server/Damage/Systems/GodmodeSystem.cs
View File

@@ -11,7 +11,7 @@ namespace Content.Server.Damage.Systems
[UsedImplicitly] [UsedImplicitly]
public class GodmodeSystem : EntitySystem public class GodmodeSystem : EntitySystem
{ {
private readonly Dictionary<IEntity, OldEntityInformation> _entities = new(); private readonly Dictionary<EntityUid, OldEntityInformation> _entities = new();
[Dependency] private readonly DamageableSystem _damageableSystem = default!; [Dependency] private readonly DamageableSystem _damageableSystem = default!;
public override void Initialize() public override void Initialize()
@@ -26,21 +26,21 @@ namespace Content.Server.Damage.Systems
_entities.Clear(); _entities.Clear();
} }
public bool EnableGodmode(IEntity entity) public bool EnableGodmode(EntityUid entity)
{ {
if (_entities.ContainsKey(entity)) if (_entities.ContainsKey(entity))
{ {
return false; return false;
} }
_entities[entity] = new OldEntityInformation(entity); _entities[entity] = new OldEntityInformation(entity, EntityManager);
if (entity.TryGetComponent(out MovedByPressureComponent? moved)) if (EntityManager.TryGetComponent(entity, out MovedByPressureComponent? moved))
{ {
moved.Enabled = false; moved.Enabled = false;
} }
if (entity.TryGetComponent(out DamageableComponent? damageable)) if (EntityManager.TryGetComponent(entity, out DamageableComponent? damageable))
{ {
_damageableSystem.SetDamage(damageable, new DamageSpecifier()); _damageableSystem.SetDamage(damageable, new DamageSpecifier());
} }
@@ -48,24 +48,24 @@ namespace Content.Server.Damage.Systems
return true; return true;
} }
public bool HasGodmode(IEntity entity) public bool HasGodmode(EntityUid entity)
{ {
return _entities.ContainsKey(entity); return _entities.ContainsKey(entity);
} }
public bool DisableGodmode(IEntity entity) public bool DisableGodmode(EntityUid entity)
{ {
if (!_entities.Remove(entity, out var old)) if (!_entities.Remove(entity, out var old))
{ {
return false; return false;
} }
if (entity.TryGetComponent(out MovedByPressureComponent? moved)) if (EntityManager.TryGetComponent(entity, out MovedByPressureComponent? moved))
{ {
moved.Enabled = old.MovedByPressure; moved.Enabled = old.MovedByPressure;
} }
if (entity.TryGetComponent(out DamageableComponent? damageable)) if (EntityManager.TryGetComponent(entity, out DamageableComponent? damageable))
{ {
if (old.Damage != null) if (old.Damage != null)
{ {
@@ -81,7 +81,7 @@ namespace Content.Server.Damage.Systems
/// </summary> /// </summary>
/// <param name="entity">The entity to toggle godmode for.</param> /// <param name="entity">The entity to toggle godmode for.</param>
/// <returns>true if enabled, false if disabled.</returns> /// <returns>true if enabled, false if disabled.</returns>
public bool ToggleGodmode(IEntity entity) public bool ToggleGodmode(EntityUid entity)
{ {
if (HasGodmode(entity)) if (HasGodmode(entity))
{ {
@@ -97,18 +97,18 @@ namespace Content.Server.Damage.Systems
public class OldEntityInformation public class OldEntityInformation
{ {
public OldEntityInformation(IEntity entity) public OldEntityInformation(EntityUid entity, IEntityManager entityManager)
{ {
Entity = entity; Entity = entity;
MovedByPressure = entity.IsMovedByPressure(); MovedByPressure = entityManager.HasComponent<MovedByPressureComponent>(entity);
if (entity.TryGetComponent(out DamageableComponent? damageable)) if (entityManager.TryGetComponent(entity, out DamageableComponent? damageable))
{ {
Damage = damageable.Damage; Damage = damageable.Damage;
} }
} }
public IEntity Entity { get; } public EntityUid Entity { get; }
public bool MovedByPressure { get; } public bool MovedByPressure { get; }