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

MapManager warning cleanup shared edition (#36795)

Browse Source 
* cleanup and reworking

* one of these days I'll merge a conflict without breaking shit.

* Update Content.Shared/Shuttles/Systems/SharedShuttleSystem.cs

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Content.Shared/Tabletop/SharedTabletopSystem.cs

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* I'm gonna send this but... I'll be honest, I dunno what it does.

* fix coordinates

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
This commit is contained in:
Kyle Tyo
2025-05-14 19:24:44 -04:00
committed by GitHub
parent bb442d1234
commit c84d4753b9
4 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Shared/Tabletop/SharedTabletopSystem.cs
View File

@@ -5,7 +5,6 @@ using Content.Shared.Hands.Components;
using Content.Shared.Interaction;
using Content.Shared.Tabletop.Components;
using Content.Shared.Tabletop.Events;
using Robust.Shared.Map;
using Robust.Shared.Network;
using Robust.Shared.Serialization;
@@ -16,8 +15,8 @@ namespace Content.Shared.Tabletop
[Dependency] protected readonly ActionBlockerSystem ActionBlockerSystem = default!;
[Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
[Dependency] private readonly SharedAppearanceSystem _appearance = default!;
[Dependency] private readonly SharedMapSystem _mapSystem = default!;
[Dependency] protected readonly SharedTransformSystem Transforms = default!;
[Dependency] private readonly IMapManager _mapMan = default!;
public override void Initialize()
{
@@ -41,7 +40,7 @@ namespace Content.Shared.Tabletop
// Move the entity and dirty it (we use the map ID from the entity so noone can try to be funny and move the item to another map)
var transform = EntityManager.GetComponent<TransformComponent>(moved);
Transforms.SetParent(moved, transform, _mapMan.GetMapEntityId(transform.MapID));
Transforms.SetParent(moved, transform, _mapSystem.GetMapOrInvalid(transform.MapID));
Transforms.SetLocalPositionNoLerp(moved, msg.Coordinates.Position, transform);
}