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

Revert "Update submodule (again)" (#7730)

Browse Source
This commit is contained in:
metalgearsloth
2022-04-24 02:26:00 +10:00
committed by GitHub
parent 7feea724fd
commit ecaad9c349
36 changed files with 151 additions and 292 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Server/NodeContainer/EntitySystems/NodeContainerSystem.cs
View File

@@ -22,7 +22,6 @@ namespace Content.Server.NodeContainer.EntitySystems
SubscribeLocalEvent<NodeContainerComponent, ComponentStartup>(OnStartupEvent);
SubscribeLocalEvent<NodeContainerComponent, ComponentShutdown>(OnShutdownEvent);
SubscribeLocalEvent<NodeContainerComponent, AnchorStateChangedEvent>(OnAnchorStateChanged);
SubscribeLocalEvent<NodeContainerComponent, ReAnchorEvent>(OnReAnchor);
SubscribeLocalEvent<NodeContainerComponent, RotateEvent>(OnRotateEvent);
SubscribeLocalEvent<NodeContainerComponent, ExaminedEvent>(OnExamine);
}
@@ -72,15 +71,6 @@ namespace Content.Server.NodeContainer.EntitySystems
}
}
private void OnReAnchor(EntityUid uid, NodeContainerComponent component, ref ReAnchorEvent args)
{
foreach (var node in component.Nodes.Values)
{
_nodeGroupSystem.QueueNodeRemove(node);
_nodeGroupSystem.QueueReflood(node);
}
}
private void OnRotateEvent(EntityUid uid, NodeContainerComponent container, ref RotateEvent ev)
{
if (ev.NewRotation == ev.OldRotation)

4
Content.Server/NodeContainer/EntitySystems/NodeGroupSystem.cs
View File

@@ -157,8 +157,8 @@ namespace Content.Server.NodeContainer.EntitySystems
var sw = Stopwatch.StartNew();
var xformQuery = GetEntityQuery<TransformComponent>();
var nodeQuery = GetEntityQuery<NodeContainerComponent>();
var xformQuery = EntityManager.GetEntityQuery<TransformComponent>();
var nodeQuery = EntityManager.GetEntityQuery<NodeContainerComponent>();
foreach (var toRemove in _toRemove)
{

2
Content.Server/NodeContainer/NodeGroups/NodeGroupFactory.cs
View File

@@ -55,7 +55,7 @@ namespace Content.Server.NodeContainer.NodeGroups
}
}
public enum NodeGroupID : byte
public enum NodeGroupID
{
Default,
HVPower,