Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Content update for NetEntities (#18935)

Browse Source
This commit is contained in:
metalgearsloth
2023-09-11 09:42:41 +10:00
committed by GitHub
parent 389c8d1a2c
commit 5a0fc68be2
526 changed files with 3058 additions and 2215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,6 +10,8 @@ namespace Content.Server.Damage.Commands
[AdminCommand(AdminFlags.Admin)]
public sealed class GodModeCommand : IConsoleCommand
{
[Dependency] private readonly IEntityManager _entManager = default!;
public string Command => "godmode";
public string Description => "Makes your entity or another invulnerable to almost anything. May have irreversible changes.";
public string Help => $"Usage: {Command} / {Command} <entityUid>";
@@ -19,8 +21,6 @@ namespace Content.Server.Damage.Commands
var player = shell.Player as IPlayerSession;
EntityUid entity;
var entityManager = IoCManager.Resolve<IEntityManager>();
switch (args.Length)
{
case 0:
@@ -39,29 +39,29 @@ namespace Content.Server.Damage.Commands
entity = player.AttachedEntity.Value;
break;
case 1:
if (!EntityUid.TryParse(args[0], out var id))
if (!NetEntity.TryParse(args[0], out var idNet) || !_entManager.TryGetEntity(idNet, out var id))
{
shell.WriteLine($"{args[0]} isn't a valid entity id.");
return;
}
if (!entityManager.EntityExists(id))
if (!_entManager.EntityExists(id))
{
shell.WriteLine($"No entity found with id {id}.");
return;
}
entity = id;
entity = id.Value;
break;
default:
shell.WriteLine(Help);
return;
}
var godmodeSystem = EntitySystem.Get<SharedGodmodeSystem>();
var godmodeSystem = _entManager.System<SharedGodmodeSystem>();
var enabled = godmodeSystem.ToggleGodmode(entity);
var name = entityManager.GetComponent<MetaDataComponent>(entity).EntityName;
var name = _entManager.GetComponent<MetaDataComponent>(entity).EntityName;
shell.WriteLine(enabled
? $"Enabled godmode for entity {name} with id {entity}"

35
Content.Server/Damage/Commands/HurtCommand.cs
View File

@@ -13,15 +13,13 @@ namespace Content.Server.Damage.Commands
[AdminCommand(AdminFlags.Fun)]
sealed class DamageCommand : IConsoleCommand
{
[Dependency] private readonly IEntityManager _entManager = default!;
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
public string Command => "damage";
public string Description => Loc.GetString("damage-command-description");
public string Help => Loc.GetString("damage-command-help", ("command", Command));
private readonly IPrototypeManager _prototypeManager = default!;
public DamageCommand() {
_prototypeManager = IoCManager.Resolve<IPrototypeManager>();
}
public CompletionResult GetCompletion(IConsoleShell shell, string[] args)
{
if (args.Length == 1)
@@ -75,28 +73,27 @@ namespace Content.Server.Damage.Commands
func = (entity, ignoreResistances) =>
{
var damage = new DamageSpecifier(damageGroup, amount);
EntitySystem.Get<DamageableSystem>().TryChangeDamage(entity, damage, ignoreResistances);
_entManager.System<DamageableSystem>().TryChangeDamage(entity, damage, ignoreResistances);
};
return true;
}
// Fall back to DamageType
else if (_prototypeManager.TryIndex<DamageTypePrototype>(args[0], out var damageType))
if (_prototypeManager.TryIndex<DamageTypePrototype>(args[0], out var damageType))
{
func = (entity, ignoreResistances) =>
{
var damage = new DamageSpecifier(damageType, amount);
EntitySystem.Get<DamageableSystem>().TryChangeDamage(entity, damage, ignoreResistances);
_entManager.System<DamageableSystem>().TryChangeDamage(entity, damage, ignoreResistances);
};
return true;
}
else
{
shell.WriteLine(Loc.GetString("damage-command-error-type", ("arg", args[0])));
func = null;
return false;
}
shell.WriteLine(Loc.GetString("damage-command-error-type", ("arg", args[0])));
func = null;
return false;
}
public void Execute(IConsoleShell shell, string argStr, string[] args)
@@ -107,11 +104,11 @@ namespace Content.Server.Damage.Commands
return;
}
EntityUid target;
var entMan = IoCManager.Resolve<IEntityManager>();
EntityUid? target;
if (args.Length == 4)
{
if (!EntityUid.TryParse(args[3], out target) || !entMan.EntityExists(target))
if (!_entManager.TryParseNetEntity(args[3], out target) || !_entManager.EntityExists(target))
{
shell.WriteLine(Loc.GetString("damage-command-error-euid", ("arg", args[3])));
return;
@@ -127,7 +124,7 @@ namespace Content.Server.Damage.Commands
return;
}
if (!TryParseDamageArgs(shell, target, args, out var damageFunc))
if (!TryParseDamageArgs(shell, target.Value, args, out var damageFunc))
return;
bool ignoreResistances;
@@ -144,7 +141,7 @@ namespace Content.Server.Damage.Commands
ignoreResistances = false;
}
damageFunc(target, ignoreResistances);
damageFunc(target.Value, ignoreResistances);
}
}
}