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

2
Content.Shared/Shuttles/Systems/SharedShuttleSystem.cs
View File

@@ -41,7 +41,7 @@ public abstract partial class SharedShuttleSystem : EntitySystem
/// </summary>
public bool CanFTLTo(EntityUid shuttleUid, MapId targetMap, EntityUid consoleUid)
{
var mapUid = _mapManager.GetMapEntityId(targetMap);
var mapUid = Maps.GetMapOrInvalid(targetMap);
var shuttleMap = _xformQuery.GetComponent(shuttleUid).MapID;
if (shuttleMap == targetMap)