Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 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

10
Content.Server/Verbs/VerbSystem.cs
View File

@@ -27,15 +27,15 @@ namespace Content.Server.Verbs
{
var player = (IPlayerSession) eventArgs.SenderSession;
if (!EntityManager.EntityExists(args.EntityUid))
if (!EntityManager.EntityExists(GetEntity(args.EntityUid)))
{
Logger.Warning($"{nameof(HandleVerbRequest)} called on a non-existent entity with id {args.EntityUid} by player {player}.");
Log.Warning($"{nameof(HandleVerbRequest)} called on a non-existent entity with id {args.EntityUid} by player {player}.");
return;
}
if (player.AttachedEntity is not {} attached)
{
Logger.Warning($"{nameof(HandleVerbRequest)} called by player {player} with no attached entity.");
Log.Warning($"{nameof(HandleVerbRequest)} called by player {player} with no attached entity.");
return;
}
@@ -54,11 +54,11 @@ namespace Content.Server.Verbs
if (type != null)
verbTypes.Add(type);
else
Logger.Error($"Unknown verb type received: {key}");
Log.Error($"Unknown verb type received: {key}");
}
var response =
new VerbsResponseEvent(args.EntityUid, GetLocalVerbs(args.EntityUid, attached, verbTypes, force));
new VerbsResponseEvent(args.EntityUid, GetLocalVerbs(GetEntity(args.EntityUid), attached, verbTypes, force));
RaiseNetworkEvent(response, player.ConnectedClient);
}