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

Remove 700 usages of Component.Owner (#21100)

Browse Source
This commit is contained in:
DrSmugleaf
2023-10-19 12:34:31 -07:00
committed by GitHub
parent 5825ffb95c
commit f560f88eb5
261 changed files with 2291 additions and 2036 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,9 +16,7 @@ using Content.Shared.Temperature;
using Content.Shared.Throwing;
using Content.Shared.Weapons.Melee.Events;
using Robust.Server.GameObjects;
using Robust.Shared.Physics;
using Robust.Shared.Physics.Components;
using Robust.Shared.Physics.Dynamics;
using Robust.Shared.Physics.Events;
using Robust.Shared.Physics.Systems;
@@ -48,7 +46,7 @@ namespace Content.Server.Atmos.EntitySystems
private float _timer;
private Dictionary<FlammableComponent, float> _fireEvents = new();
private readonly Dictionary<Entity<FlammableComponent>, float> _fireEvents = new();
public override void Initialize()
{
@@ -188,14 +186,14 @@ namespace Content.Server.Atmos.EntitySystems
args.IsHot = flammable.OnFire;
}
private void OnTileFire(EntityUid uid, FlammableComponent flammable, ref TileFireEvent args)
private void OnTileFire(Entity<FlammableComponent> ent, ref TileFireEvent args)
{
var tempDelta = args.Temperature - MinIgnitionTemperature;
_fireEvents.TryGetValue(flammable, out var maxTemp);
_fireEvents.TryGetValue(ent, out var maxTemp);
if (tempDelta > maxTemp)
_fireEvents[flammable] = tempDelta;
_fireEvents[ent] = tempDelta;
}
private void OnRejuvenate(EntityUid uid, FlammableComponent component, RejuvenateEvent args)
@@ -295,7 +293,7 @@ namespace Content.Server.Atmos.EntitySystems
{
// 100 -> 1, 200 -> 2, 400 -> 3...
var fireStackMod = Math.Max(MathF.Log2(deltaTemp / 100) + 1, 0);
var fireStackDelta = fireStackMod - flammable.FireStacks;
var fireStackDelta = fireStackMod - flammable.Comp.FireStacks;
var flammableEntity = flammable.Owner;
if (fireStackDelta > 0)
{
@@ -313,10 +311,9 @@ namespace Content.Server.Atmos.EntitySystems
_timer -= UpdateTime;
// TODO: This needs cleanup to take off the crust from TemperatureComponent and shit.
foreach (var (flammable, transform) in EntityManager.EntityQuery<FlammableComponent, TransformComponent>())
var query = EntityQueryEnumerator<FlammableComponent, TransformComponent>();
while (query.MoveNext(out var uid, out var flammable, out var transform))
{
var uid = flammable.Owner;
// Slowly dry ourselves off if wet.
if (flammable.FireStacks < 0)
{