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

Remove Explicit GridId References (#8315)

Browse Source 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
This commit is contained in:
Acruid
2022-06-11 18:54:41 -07:00
committed by GitHub
parent 846321cebb
commit 4f9be42f40
131 changed files with 531 additions and 588 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Server/Gravity/EntitySystems/GravitySystem.cs
View File

@@ -16,12 +16,12 @@ namespace Content.Server.Gravity.EntitySystems
private void HandleGravityInitialize(EntityUid uid, GravityComponent component, ComponentInit args)
{
// Incase there's already a generator on the grid we'll just set it now.
var gridId = EntityManager.GetComponent<TransformComponent>(component.Owner).GridID;
var gridId = EntityManager.GetComponent<TransformComponent>(component.Owner).GridEntityId;
GravityChangedMessage message;
foreach (var generator in EntityManager.EntityQuery<GravityGeneratorComponent>())
{
if (EntityManager.GetComponent<TransformComponent>(generator.Owner).GridID == gridId && generator.GravityActive)
if (EntityManager.GetComponent<TransformComponent>(generator.Owner).GridEntityId == gridId && generator.GravityActive)
{
component.Enabled = true;
message = new GravityChangedMessage(gridId, true);
@@ -45,7 +45,7 @@ namespace Content.Server.Gravity.EntitySystems
if (comp.Enabled) return;
comp.Enabled = true;
var gridId = EntityManager.GetComponent<TransformComponent>(comp.Owner).GridID;
var gridId = EntityManager.GetComponent<TransformComponent>(comp.Owner).GridEntityId;
var message = new GravityChangedMessage(gridId, true);
RaiseLocalEvent(message);
}
@@ -55,7 +55,7 @@ namespace Content.Server.Gravity.EntitySystems
if (!comp.Enabled) return;
comp.Enabled = false;
var gridId = EntityManager.GetComponent<TransformComponent>(comp.Owner).GridID;
var gridId = EntityManager.GetComponent<TransformComponent>(comp.Owner).GridEntityId;
var message = new GravityChangedMessage(gridId, false);
RaiseLocalEvent(message);
}