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

Fixes bad Flammable ECS conversion logic

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-10-21 23:07:42 +02:00
parent dc9da409ad
commit bfdd0e055b
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Server/Atmos/EntitySystems/FlammableSystem.cs
View File

@@ -185,7 +185,7 @@ namespace Content.Server.Atmos.EntitySystems
_timer -= UpdateTime;
// TODO: This needs cleanup to take off the crust from TemperatureComponent and shit.
foreach (var (flammable, physics, transform) in EntityManager.EntityQuery<FlammableComponent, PhysicsComponent, ITransformComponent>())
foreach (var (flammable, physics, transform) in EntityManager.EntityQuery<FlammableComponent, IPhysBody, ITransformComponent>())
{
var uid = flammable.Owner.Uid;
@@ -200,7 +200,7 @@ namespace Content.Server.Atmos.EntitySystems
if (!flammable.OnFire)
{
status?.ClearAlert(AlertType.Fire);
return;
continue;
}
status?.ShowAlert(AlertType.Fire);
@@ -221,7 +221,7 @@ namespace Content.Server.Atmos.EntitySystems
else
{
Extinguish(uid, flammable);
return;
continue;
}
var air = _atmosphereSystem.GetTileMixture(transform.Coordinates);
@@ -230,7 +230,7 @@ namespace Content.Server.Atmos.EntitySystems
if (air == null || air.GetMoles(Gas.Oxygen) < 1f)
{
Extinguish(uid, flammable);
return;
continue;
}
_atmosphereSystem.HotspotExpose(transform.Coordinates, 700f, 50f, true);