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

38
Content.Server/Station/Systems/StationSystem.cs
View File

@@ -86,9 +86,9 @@ public sealed class StationSystem : EntitySystem
private void OnPostGameMapLoad(PostGameMapLoad ev)
{
var dict = new Dictionary<string, List<GridId>>();
var dict = new Dictionary<string, List<EntityUid>>();
void AddGrid(string station, GridId grid)
void AddGrid(string station, EntityUid grid)
{
if (dict.ContainsKey(station))
{
@@ -96,7 +96,7 @@ public sealed class StationSystem : EntitySystem
}
else
{
dict[station] = new List<GridId> {grid};
dict[station] = new List<EntityUid> {grid};
}
}
@@ -104,7 +104,7 @@ public sealed class StationSystem : EntitySystem
foreach (var grid in ev.Grids)
{
// We still setup the grid
if (!TryComp<BecomesStationComponent>(_mapManager.GetGridEuid(grid), out var becomesStation))
if (!TryComp<BecomesStationComponent>(grid, out var becomesStation))
continue;
AddGrid(becomesStation.Id, grid);
@@ -123,7 +123,7 @@ public sealed class StationSystem : EntitySystem
// Iterate over all PartOfStation
foreach (var grid in ev.Grids)
{
if (!TryComp<PartOfStationComponent>(_mapManager.GetGridEuid(grid), out var partOfStation))
if (!TryComp<PartOfStationComponent>(grid, out var partOfStation))
continue;
AddGrid(partOfStation.Id, grid);
@@ -136,7 +136,7 @@ public sealed class StationSystem : EntitySystem
stationConfig = ev.GameMap.Stations[id];
else
_sawmill.Error($"The station {id} in map {ev.GameMap.ID} does not have an associated station config!");
InitializeNewStation(stationConfig, gridIds.Select(x => _mapManager.GetGridEuid(x)), ev.StationName);
InitializeNewStation(stationConfig, gridIds, ev.StationName);
}
}
@@ -222,11 +222,11 @@ public sealed class StationSystem : EntitySystem
var stationMember = AddComp<StationMemberComponent>(mapGrid);
stationMember.Station = station;
stationData.Grids.Add(gridComponent.GridIndex);
stationData.Grids.Add(gridComponent.Owner);
RaiseLocalEvent(station, new StationGridAddedEvent(gridComponent.GridIndex, false));
RaiseLocalEvent(station, new StationGridAddedEvent(gridComponent.Owner, false));
_sawmill.Info($"Adding grid {mapGrid}:{gridComponent.GridIndex} to station {Name(station)} ({station})");
_sawmill.Info($"Adding grid {mapGrid}:{gridComponent.Owner} to station {Name(station)} ({station})");
}
/// <summary>
@@ -245,10 +245,10 @@ public sealed class StationSystem : EntitySystem
throw new ArgumentException("Tried to use a non-station entity as a station!", nameof(station));
RemComp<StationMemberComponent>(mapGrid);
stationData.Grids.Remove(gridComponent.GridIndex);
stationData.Grids.Remove(gridComponent.Owner);
RaiseLocalEvent(station, new StationGridRemovedEvent(gridComponent.GridIndex));
_sawmill.Info($"Removing grid {mapGrid}:{gridComponent.GridIndex} from station {Name(station)} ({station})");
RaiseLocalEvent(station, new StationGridRemovedEvent(gridComponent.Owner));
_sawmill.Info($"Removing grid {mapGrid}:{gridComponent.Owner} from station {Name(station)} ({station})");
}
/// <summary>
@@ -317,15 +317,13 @@ public sealed class StationSystem : EntitySystem
return CompOrNull<StationMemberComponent>(entity)?.Station;
}
if (xform.GridID == GridId.Invalid)
if (xform.GridEntityId == EntityUid.Invalid)
{
Logger.Debug("A");
return null;
}
var grid = _mapManager.GetGridEuid(xform.GridID);
return CompOrNull<StationMemberComponent>(grid)?.Station;
return CompOrNull<StationMemberComponent>(xform.GridEntityId)?.Station;
}
}
@@ -356,7 +354,7 @@ public sealed class StationGridAddedEvent : EntityEventArgs
/// <summary>
/// ID of the grid added to the station.
/// </summary>
public GridId GridId;
public EntityUid GridId;
/// <summary>
/// Indicates that the event was fired during station setup,
@@ -364,7 +362,7 @@ public sealed class StationGridAddedEvent : EntityEventArgs
/// </summary>
public bool IsSetup;
public StationGridAddedEvent(GridId gridId, bool isSetup)
public StationGridAddedEvent(EntityUid gridId, bool isSetup)
{
GridId = gridId;
IsSetup = isSetup;
@@ -380,9 +378,9 @@ public sealed class StationGridRemovedEvent : EntityEventArgs
/// <summary>
/// ID of the grid removed from the station.
/// </summary>
public GridId GridId;
public EntityUid GridId;
public StationGridRemovedEvent(GridId gridId)
public StationGridRemovedEvent(EntityUid gridId)
{
GridId = gridId;
}