Server-side GlobalVerbs now work when used (#455)

2019-11-23 19:11:50 +00:00
parent d5a9747712
commit 0cf34d2d26
1 changed files with 21 additions and 0 deletions
--- 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;
                }
            }