From 13e1824e6690a12f43af0a9b90a0045fb9e03abe Mon Sep 17 00:00:00 2001 From: Acruid Date: Mon, 29 Mar 2021 16:32:45 -0700 Subject: [PATCH] Engine update to v0.4.26 (Network View Bubble) --- .../GameObjects/Components/Mobs/ServerActionsComponent.cs | 6 ++++-- RobustToolbox | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Content.Server/GameObjects/Components/Mobs/ServerActionsComponent.cs b/Content.Server/GameObjects/Components/Mobs/ServerActionsComponent.cs index 3e196663bc..629cae5789 100644 --- a/Content.Server/GameObjects/Components/Mobs/ServerActionsComponent.cs +++ b/Content.Server/GameObjects/Components/Mobs/ServerActionsComponent.cs @@ -1,9 +1,10 @@ -#nullable enable +#nullable enable using System; using Content.Shared.Actions; using Content.Shared.GameObjects.Components.Mobs; using Content.Shared.GameObjects.EntitySystems.ActionBlocker; using Robust.Server.GameObjects; +using Robust.Server.GameStates; using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Log; @@ -19,6 +20,7 @@ namespace Content.Server.GameObjects.Components.Mobs public sealed class ServerActionsComponent : SharedActionsComponent { [Dependency] private readonly IServerEntityManager _entityManager = default!; + [Dependency] private readonly IServerGameStateManager _stateManager = default!; public override void HandleNetworkMessage(ComponentMessage message, INetChannel netChannel, ICommonSession? session = null) { @@ -174,7 +176,7 @@ namespace Content.Server.GameObjects.Components.Mobs // ensure it's within their clickable range var targetWorldPos = target.ToMapPos(EntityManager); var rangeBox = new Box2(player.Transform.WorldPosition, player.Transform.WorldPosition) - .Enlarged(_entityManager.MaxUpdateRange); + .Enlarged(_stateManager.PvsRange); if (!rangeBox.Contains(targetWorldPos)) { Logger.DebugS("action", "user {0} attempted to" + diff --git a/RobustToolbox b/RobustToolbox index ef22842b90..e16732eb7b 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit ef22842b90403fb69fd4559410bd321c8c97c815 +Subproject commit e16732eb7bdc05898ebe0248e85c49b97495ac6a