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

Fix decal system error (#10346)

Browse Source
This commit is contained in:
Leon Friedrich
2022-08-06 15:08:05 +12:00
committed by GitHub
parent 09aa2dd8c7
commit 064112a045
3 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Server/Chunking/ChunkingSystem.cs
View File

@@ -6,6 +6,7 @@ using Robust.Shared.Configuration;
using Robust.Shared.Enums; using Robust.Shared.Enums;
using Robust.Shared.Map; using Robust.Shared.Map;
using Robust.Shared.Utility; using Robust.Shared.Utility;
using System.Linq;
namespace Content.Shared.Chunking; namespace Content.Shared.Chunking;
@@ -77,7 +78,12 @@ public sealed class ChunkingSystem : EntitySystem
foreach (var viewerUid in viewers) foreach (var viewerUid in viewers)
{ {
var xform = xformQuery.GetComponent(viewerUid); if (!xformQuery.TryGetComponent(viewerUid, out var xform))
{
Logger.Error($"Player has deleted viewer entities? Viewers: {string.Join(", ", viewers.Select(x => ToPrettyString(x)))}");
continue;
}
var pos = _transform.GetWorldPosition(xform, xformQuery); var pos = _transform.GetWorldPosition(xform, xformQuery);
var bounds = _baseViewBounds.Translated(pos).Enlarged(viewEnlargement); var bounds = _baseViewBounds.Translated(pos).Enlarged(viewEnlargement);

3
Content.Server/Decals/DecalSystem.cs
View File

@@ -18,7 +18,6 @@ namespace Content.Server.Decals
[Dependency] private readonly IPlayerManager _playerManager = default!; [Dependency] private readonly IPlayerManager _playerManager = default!;
[Dependency] private readonly IAdminManager _adminManager = default!; [Dependency] private readonly IAdminManager _adminManager = default!;
[Dependency] private readonly ITileDefinitionManager _tileDefMan = default!; [Dependency] private readonly ITileDefinitionManager _tileDefMan = default!;
[Dependency] private readonly SharedTransformSystem _transform = default!;
[Dependency] private readonly ChunkingSystem _chunking = default!; [Dependency] private readonly ChunkingSystem _chunking = default!;
private readonly Dictionary<EntityUid, HashSet<Vector2i>> _dirtyChunks = new(); private readonly Dictionary<EntityUid, HashSet<Vector2i>> _dirtyChunks = new();
@@ -405,7 +404,7 @@ namespace Content.Server.Decals
var chunksInRange = _chunking.GetChunksForSession(playerSession, ChunkSize, xformQuery, _chunkIndexPool, _chunkViewerPool); var chunksInRange = _chunking.GetChunksForSession(playerSession, ChunkSize, xformQuery, _chunkIndexPool, _chunkViewerPool);
var staleChunks = _chunkViewerPool.Get(); var staleChunks = _chunkViewerPool.Get();
var previouslySent = _previousSentChunks[playerSession]; var previouslySent = _previousSentChunks.GetOrNew(playerSession);
// Get any chunks not in range anymore // Get any chunks not in range anymore
// Then, remove them from previousSentChunks (for stuff like grids out of range) // Then, remove them from previousSentChunks (for stuff like grids out of range)

14
Content.Shared/Decals/SharedDecalSystem.cs
View File

@@ -20,25 +20,11 @@ namespace Content.Shared.Decals
public const int ChunkSize = 32; public const int ChunkSize = 32;
public static Vector2i GetChunkIndices(Vector2 coordinates) => new ((int) Math.Floor(coordinates.X / ChunkSize), (int) Math.Floor(coordinates.Y / ChunkSize)); public static Vector2i GetChunkIndices(Vector2 coordinates) => new ((int) Math.Floor(coordinates.X / ChunkSize), (int) Math.Floor(coordinates.Y / ChunkSize));
private float _viewSize;
public override void Initialize() public override void Initialize()
{ {
base.Initialize(); base.Initialize();
SubscribeLocalEvent<GridInitializeEvent>(OnGridInitialize); SubscribeLocalEvent<GridInitializeEvent>(OnGridInitialize);
_configurationManager.OnValueChanged(CVars.NetMaxUpdateRange, OnPvsRangeChanged, true);
}
public override void Shutdown()
{
base.Shutdown();
_configurationManager.UnsubValueChanged(CVars.NetMaxUpdateRange, OnPvsRangeChanged);
}
private void OnPvsRangeChanged(float obj)
{
_viewSize = obj * 2f;
} }
private void OnGridInitialize(GridInitializeEvent msg) private void OnGridInitialize(GridInitializeEvent msg)