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

Cleanup all instances of IMapManager.GetMapEntityId (#37814)

Browse Source 
* Cleanup all instances of IMapManager.GetMapEntityId

* Dependencies

* LocalizedEntityCommands
This commit is contained in:
Tayrtahn
2025-05-25 13:09:47 -04:00
committed by GitHub
parent e08a7f3c84
commit 50fb48de2e
8 changed files with 39 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Server/GameTicking/GameTicker.Spawning.cs
View File

@@ -275,7 +275,7 @@ namespace Content.Server.GameTicking
_mind.TransferTo(newMind, mob);
_roles.MindAddJobRole(newMind, silent: silent, jobPrototype:jobId);
_roles.MindAddJobRole(newMind, silent: silent, jobPrototype: jobId);
var jobName = _jobs.MindTryGetJobName(newMind);
_admin.UpdatePlayerList(player);
@@ -475,17 +475,17 @@ namespace Content.Server.GameTicking
return spawn;
}
if (_mapManager.MapExists(DefaultMap))
if (_map.MapExists(DefaultMap))
{
var mapUid = _mapManager.GetMapEntityId(DefaultMap);
var mapUid = _map.GetMapOrInvalid(DefaultMap);
if (!TerminatingOrDeleted(mapUid))
return new EntityCoordinates(mapUid, Vector2.Zero);
}
// Just pick a point at this point I guess.
foreach (var map in _mapManager.GetAllMapIds())
foreach (var map in _map.GetAllMapIds())
{
var mapUid = _mapManager.GetMapEntityId(map);
var mapUid = _map.GetMapOrInvalid(map);
if (!metaQuery.TryGetComponent(mapUid, out var meta)
|| meta.EntityPaused