space-wizards/RobustToolbox
1
0
Fork 0
mirror of https://github.com/space-wizards/RobustToolbox.git synced 2026-02-14 19:29:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix deserialized grid networking (#3514)

Browse Source
This commit is contained in:
metalgearsloth
2022-11-22 20:24:58 +11:00
committed by GitHub
parent 846cc3fa48
commit 3bfb23f35d
3 changed files with 12 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
Robust.Shared/GameObjects/Systems/SharedGridFixtureSystem.cs
View File

@@ -100,37 +100,6 @@ namespace Robust.Shared.GameObjects
CheckSplit(gridEuid, mapChunks, removedChunks);
}
internal void RegenerateCollision(EntityUid gridEuid, MapChunk chunk, List<Box2i> rectangles)
{
if (!_enabled) return;
if (chunk.FilledTiles == 0)
{
CheckSplit(gridEuid, chunk, rectangles);
return;
}
if (!EntityManager.TryGetComponent(gridEuid, out PhysicsComponent? physicsComponent))
{
Sawmill.Error($"Trying to regenerate collision for {gridEuid} that doesn't have {nameof(physicsComponent)}");
return;
}
if (!EntityManager.TryGetComponent(gridEuid, out FixturesComponent? fixturesComponent))
{
Sawmill.Error($"Trying to regenerate collision for {gridEuid} that doesn't have {nameof(fixturesComponent)}");
return;
}
if (UpdateFixture(chunk, rectangles, physicsComponent, fixturesComponent))
{
_fixtures.FixtureUpdate(fixturesComponent, physicsComponent);
EntityManager.EventBus.RaiseLocalEvent(gridEuid,new GridFixtureChangeEvent {NewFixtures = chunk.Fixtures}, true);
CheckSplit(gridEuid, chunk, rectangles);
}
}
internal virtual void CheckSplit(EntityUid gridEuid, Dictionary<MapChunk, List<Box2i>> mapChunks,
List<MapChunk> removedChunks) {}

10
Robust.Shared/GameObjects/Systems/SharedMapSystem.Grid.cs
View File

@@ -53,6 +53,16 @@ public abstract partial class SharedMapSystem
_transform.SetParent(xform, MapManager.GetMapEntityIdOrThrow(mapId), xformQuery);
}
// Force networkedmapmanager to send it due to non-ECS legacy code.
var curTick = _timing.CurTick;
foreach (var chunk in component.Chunks.Values)
{
chunk.LastTileModifiedTick = curTick;
}
component.LastTileModifiedTick = curTick;
// Just in case.
_transform.SetGridId(xform, uid, xformQuery);

2
Robust.Shared/GameObjects/Systems/SharedMapSystem.cs
View File

@@ -6,12 +6,14 @@ using System.Collections.Generic;
using Robust.Shared.GameStates;
using Robust.Shared.Map.Components;
using System.Linq;
using Robust.Shared.Timing;
namespace Robust.Shared.GameObjects
{
[UsedImplicitly]
public abstract partial class SharedMapSystem : EntitySystem
{
[Dependency] private readonly IGameTiming _timing = default!;
[Dependency] protected readonly IMapManager MapManager = default!;
[Dependency] private readonly SharedTransformSystem _transform = default!;