space-wizards/RobustToolbox
1
0
Fork 0
mirror of https://github.com/space-wizards/RobustToolbox.git synced 2026-09-06 17:58:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Map Pausing Fixes (#2520)

Browse Source
This commit is contained in:
Acruid
2022-02-12 15:54:03 +11:00
committed by GitHub
parent b540f04a7a
commit 5a28c16cae
16 changed files with 484 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Robust.Shared/GameObjects/Components/IgnorePauseComponent.cs
+5 -6
View File
@@ -1,25 +1,24 @@
using Robust.Shared.IoC;
using Robust.Shared.Timing;
using Robust.Shared.Map;
namespace Robust.Shared.GameObjects
{
[RegisterComponent]
public sealed class IgnorePauseComponent : Component
{
[Dependency] private readonly IEntityManager _entMan = default!;
protected override void OnAdd()
{
base.OnAdd();
_entMan.GetComponent<MetaDataComponent>(Owner).EntityPaused = false;
IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(Owner).EntityPaused = false;
}
protected override void OnRemove()
{
base.OnRemove();
if (IoCManager.Resolve<IPauseManager>().IsMapPaused(_entMan.GetComponent<TransformComponent>(Owner).MapID))
var entMan = IoCManager.Resolve<IEntityManager>();
if (IoCManager.Resolve<IMapManager>().IsMapPaused(entMan.GetComponent<TransformComponent>(Owner).MapID))
{
_entMan.GetComponent<MetaDataComponent>(Owner).EntityPaused = true;
entMan.GetComponent<MetaDataComponent>(Owner).EntityPaused = true;
}
}
}
Robust.Shared/GameObjects/Components/MetaDataComponent.cs
+4 -2
View File
@@ -147,9 +147,11 @@ namespace Robust.Shared.GameObjects
get => _entityPaused;
set
{
if (_entityPaused == value)
return;
var entMan = IoCManager.Resolve<IEntityManager>();
if (_entityPaused == value || value && entMan.HasComponent<IgnorePauseComponent>(Owner))
if (value && entMan.HasComponent<IgnorePauseComponent>(Owner))
return;
_entityPaused = value;
Robust.Shared/GameObjects/Components/Transform/TransformComponent.cs
+13 -3
View File
@@ -728,17 +728,27 @@ namespace Robust.Shared.GameObjects
var oldMapId = MapID;
//Set Paused state
var mapPaused = _mapManager.IsMapPaused(newMapId);
var metaData = _entMan.GetComponent<MetaDataComponent>(Owner);
metaData.EntityPaused = mapPaused;
MapID = newMapId;
MapIdChanged(oldMapId);
UpdateChildMapIdsRecursive(MapID, _entMan);
UpdateChildMapIdsRecursive(MapID, _entMan, mapPaused);
}
private void UpdateChildMapIdsRecursive(MapId newMapId, IEntityManager entMan)
private void UpdateChildMapIdsRecursive(MapId newMapId, IEntityManager entMan, bool mapPaused)
{
var xforms = _entMan.GetEntityQuery<TransformComponent>();
var metaEnts = _entMan.GetEntityQuery<MetaDataComponent>();
foreach (var child in _children)
{
//Set Paused state
var metaData = metaEnts.GetComponent(child);
metaData.EntityPaused = mapPaused;
var concrete = xforms.GetComponent(child);
var old = concrete.MapID;
@@ -747,7 +757,7 @@ namespace Robust.Shared.GameObjects
if (concrete.ChildCount != 0)
{
concrete.UpdateChildMapIdsRecursive(newMapId, entMan);
concrete.UpdateChildMapIdsRecursive(newMapId, entMan, mapPaused);
}
}
}