Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Content update for NetEntities (#18935)

Browse Source
This commit is contained in:
metalgearsloth
2023-09-11 09:42:41 +10:00
committed by GitHub
parent 389c8d1a2c
commit 5a0fc68be2
526 changed files with 3058 additions and 2215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Server/Explosion/EntitySystems/ExplosionSystem.TileFill.cs
View File

@@ -331,12 +331,12 @@ public sealed partial class ExplosionSystem : EntitySystem
var (area, iterationIntensity, spaceData, gridData, spaceMatrix) = results.Value;
Logger.Info($"Generated explosion preview with {area} tiles in {stopwatch.Elapsed.TotalMilliseconds}ms");
Log.Info($"Generated explosion preview with {area} tiles in {stopwatch.Elapsed.TotalMilliseconds}ms");
Dictionary<EntityUid, Dictionary<int, List<Vector2i>>> tileLists = new();
Dictionary<NetEntity, Dictionary<int, List<Vector2i>>> tileLists = new();
foreach (var (grid, data) in gridData)
{
tileLists.Add(grid, data.TileLists);
tileLists.Add(GetNetEntity(grid), data.TileLists);
}
return new ExplosionVisualsState(

8
Content.Server/Explosion/EntitySystems/ExplosionSystem.Visuals.cs
View File

@@ -15,12 +15,18 @@ public sealed partial class ExplosionSystem : EntitySystem
private void OnGetState(EntityUid uid, ExplosionVisualsComponent component, ref ComponentGetState args)
{
Dictionary<NetEntity, Dictionary<int, List<Vector2i>>> tileLists = new();
foreach (var (grid, data) in component.Tiles)
{
tileLists.Add(GetNetEntity(grid), data);
}
args.State = new ExplosionVisualsState(
component.Epicenter,
component.ExplosionType,
component.Intensity,
component.SpaceTiles,
component.Tiles,
tileLists,
component.SpaceMatrix,
component.SpaceTileSize);
}

2
Content.Server/Explosion/EntitySystems/TriggerSystem.cs
View File

@@ -236,7 +236,7 @@ namespace Content.Server.Explosion.EntitySystems
if (user != null)
{
// Check if entity is bomb/mod. grenade/etc
if (_container.TryGetContainer(uid, "payload", out IContainer? container) &&
if (_container.TryGetContainer(uid, "payload", out BaseContainer? container) &&
container.ContainedEntities.Count > 0 &&
TryComp(container.ContainedEntities[0], out ChemicalPayloadComponent? chemicalPayloadComponent))
{