From 0cf34d2d266c437b15c5affad00cb8115b1fe9f8 Mon Sep 17 00:00:00 2001 From: Remie Richards Date: Sat, 23 Nov 2019 19:11:50 +0000 Subject: [PATCH] Server-side GlobalVerbs now work when used (#455) --- .../GameObjects/EntitySystems/VerbSystem.cs | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/Content.Server/GameObjects/EntitySystems/VerbSystem.cs b/Content.Server/GameObjects/EntitySystems/VerbSystem.cs index b3a311dc56..97feeb17dc 100644 --- a/Content.Server/GameObjects/EntitySystems/VerbSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/VerbSystem.cs @@ -112,6 +112,27 @@ namespace Content.Server.GameObjects.EntitySystems break; } + foreach (var globalVerb in VerbUtility.GetGlobalVerbs(Assembly.GetExecutingAssembly())) + { + if (globalVerb.GetType().ToString() != use.VerbKey) + { + continue; + } + + if (globalVerb.RequireInteractionRange) + { + var distanceSquared = (userEntity.Transform.WorldPosition - entity.Transform.WorldPosition) + .LengthSquared; + if (distanceSquared > VerbUtility.InteractionRangeSquared) + { + break; + } + } + + globalVerb.Activate(userEntity, entity); + break; + } + break; } }