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

Fix weather audio (#21949)

Browse Source
This commit is contained in:
metalgearsloth
2023-11-28 23:35:38 +11:00
committed by GitHub
parent 6c5a7bf849
commit 0d728b930b
4 changed files with 32 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Content.Shared/Weather/SharedWeatherSystem.cs
View File

@@ -19,9 +19,14 @@ public abstract class SharedWeatherSystem : EntitySystem
[Dependency] private readonly MetaDataSystem _metadata = default!;
[Dependency] private readonly SharedAudioSystem _audio = default!;
private EntityQuery<IgnoreWeatherComponent> _ignoreQuery;
private EntityQuery<PhysicsComponent> _physicsQuery;
public override void Initialize()
{
base.Initialize();
_ignoreQuery = GetEntityQuery<IgnoreWeatherComponent>();
_physicsQuery = GetEntityQuery<PhysicsComponent>();
SubscribeLocalEvent<WeatherComponent, EntityUnpausedEvent>(OnWeatherUnpaused);
}
@@ -38,9 +43,7 @@ public abstract class SharedWeatherSystem : EntitySystem
public bool CanWeatherAffect(
MapGridComponent grid,
TileRef tileRef,
EntityQuery<IgnoreWeatherComponent> weatherIgnoreQuery,
EntityQuery<PhysicsComponent> bodyQuery)
TileRef tileRef)
{
if (tileRef.Tile.IsEmpty)
return true;
@@ -54,8 +57,8 @@ public abstract class SharedWeatherSystem : EntitySystem
while (anchoredEnts.MoveNext(out var ent))
{
if (!weatherIgnoreQuery.HasComponent(ent.Value) &&
bodyQuery.TryGetComponent(ent, out var body) &&
if (!_ignoreQuery.HasComponent(ent.Value) &&
_physicsQuery.TryGetComponent(ent, out var body) &&
body.Hard &&
body.CanCollide)
{