Fixes bad Flammable ECS conversion logic
This commit is contained in:
@@ -185,7 +185,7 @@ namespace Content.Server.Atmos.EntitySystems
|
|||||||
_timer -= UpdateTime;
|
_timer -= UpdateTime;
|
||||||
|
|
||||||
// TODO: This needs cleanup to take off the crust from TemperatureComponent and shit.
|
// 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;
|
var uid = flammable.Owner.Uid;
|
||||||
|
|
||||||
@@ -200,7 +200,7 @@ namespace Content.Server.Atmos.EntitySystems
|
|||||||
if (!flammable.OnFire)
|
if (!flammable.OnFire)
|
||||||
{
|
{
|
||||||
status?.ClearAlert(AlertType.Fire);
|
status?.ClearAlert(AlertType.Fire);
|
||||||
return;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
status?.ShowAlert(AlertType.Fire);
|
status?.ShowAlert(AlertType.Fire);
|
||||||
@@ -221,7 +221,7 @@ namespace Content.Server.Atmos.EntitySystems
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
Extinguish(uid, flammable);
|
Extinguish(uid, flammable);
|
||||||
return;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
var air = _atmosphereSystem.GetTileMixture(transform.Coordinates);
|
var air = _atmosphereSystem.GetTileMixture(transform.Coordinates);
|
||||||
@@ -230,7 +230,7 @@ namespace Content.Server.Atmos.EntitySystems
|
|||||||
if (air == null || air.GetMoles(Gas.Oxygen) < 1f)
|
if (air == null || air.GetMoles(Gas.Oxygen) < 1f)
|
||||||
{
|
{
|
||||||
Extinguish(uid, flammable);
|
Extinguish(uid, flammable);
|
||||||
return;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
_atmosphereSystem.HotspotExpose(transform.Coordinates, 700f, 50f, true);
|
_atmosphereSystem.HotspotExpose(transform.Coordinates, 700f, 50f, true);
|
||||||
|
|||||||
4
Resources/Changelog/Parts/fire.yml
Normal file
4
Resources/Changelog/Parts/fire.yml
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
author: Zumorica
|
||||||
|
changes:
|
||||||
|
- type: Fix # One of the following: Add, Remove, Tweak, Fix
|
||||||
|
message: Fixes mobs being on fire permanently
|
||||||
Reference in New Issue
Block a user