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

Add deletion checks to verb execution (#9507)

Browse Source
This commit is contained in:
Leon Friedrich
2022-07-07 15:35:01 +12:00
committed by GitHub
parent d5628fd004
commit 731e9cbd9f
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Content.Shared/Verbs/SharedVerbSystem.cs
View File

@@ -24,6 +24,11 @@ namespace Content.Shared.Verbs
if (user == null) if (user == null)
return; return;
// It is possible that client-side prediction can cause this event to be raised after the target entity has
// been deleted. So we need to check that the entity still exists.
if (Deleted(args.Target) || Deleted(user))
return;
// Get the list of verbs. This effectively also checks that the requested verb is in fact a valid verb that // Get the list of verbs. This effectively also checks that the requested verb is in fact a valid verb that
// the user can perform. // the user can perform.
var verbs = GetLocalVerbs(args.Target, user.Value, args.RequestedVerb.GetType()); var verbs = GetLocalVerbs(args.Target, user.Value, args.RequestedVerb.GetType());
@@ -58,8 +63,10 @@ namespace Content.Shared.Verbs
bool canAccess = false; bool canAccess = false;
if (force || target == user) if (force || target == user)
canAccess = true; canAccess = true;
else if (EntityManager.EntityExists(target) && _interactionSystem.InRangeUnobstructed(user, target)) else if (_interactionSystem.InRangeUnobstructed(user, target))
{ {
// Note that being in a container does not count as an obstruction for InRangeUnobstructed
// Therefore, we need extra checks to ensure the item is actually accessible:
if (ContainerSystem.IsInSameOrParentContainer(user, target)) if (ContainerSystem.IsInSameOrParentContainer(user, target))
canAccess = true; canAccess = true;
else else