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

disposal emag fix and refactoring (#19790)

Browse Source 
Co-authored-by: deltanedas <@deltanedas:kde.org>
This commit is contained in:
deltanedas
2023-09-04 15:11:34 +01:00
committed by GitHub
parent db1ff07821
commit 4b5228e10d
3 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
View File

@@ -542,7 +542,7 @@ public sealed class DisposalUnitSystem : SharedDisposalUnitSystem
if (entry == default || component is not DisposalUnitComponent sDisposals)
{
component.Engaged = false;
Dirty(component);
Dirty(uid, component);
return false;
}
@@ -550,7 +550,10 @@ public sealed class DisposalUnitSystem : SharedDisposalUnitSystem
_disposalTubeSystem.TryInsert(entry, sDisposals, beforeFlushArgs.Tags);
component.NextPressurized = GameTiming.CurTime + TimeSpan.FromSeconds(1f / PressurePerSecond);
component.NextPressurized = GameTiming.CurTime;
if (!component.DisablePressure)
component.NextPressurized += TimeSpan.FromSeconds(1f / PressurePerSecond);
component.Engaged = false;
// stop queuing NOW
component.NextFlush = null;
@@ -558,7 +561,7 @@ public sealed class DisposalUnitSystem : SharedDisposalUnitSystem
UpdateVisualState(uid, component, true);
UpdateInterface(uid, component, component.Powered);
Dirty(component);
Dirty(uid, component);
return true;
}
@@ -674,7 +677,7 @@ public sealed class DisposalUnitSystem : SharedDisposalUnitSystem
component.RecentlyEjected.Add(toRemove);
UpdateVisualState(uid, component);
Dirty(component);
Dirty(uid, component);
}
public bool CanFlush(EntityUid unit, SharedDisposalUnitComponent component)
@@ -689,7 +692,7 @@ public sealed class DisposalUnitSystem : SharedDisposalUnitSystem
component.Engaged = true;
UpdateVisualState(uid, component);
UpdateInterface(uid, component, component.Powered);
Dirty(component);
Dirty(uid, component);
if (!CanFlush(uid, component))
return;
@@ -713,7 +716,7 @@ public sealed class DisposalUnitSystem : SharedDisposalUnitSystem
UpdateVisualState(uid, component);
UpdateInterface(uid, component, component.Powered);
Dirty(component);
Dirty(uid, component);
}
/// <summary>

2
Content.Shared/Disposal/Components/SharedDisposalUnitComponent.cs
View File

@@ -55,7 +55,7 @@ public abstract partial class SharedDisposalUnitComponent : Component
/// Removes the pressure requirement for flushing.
/// </summary>
[DataField("disablePressure"), ViewVariables(VVAccess.ReadWrite)]
public bool DisablePressure = false;
public bool DisablePressure;
/// <summary>
/// Last time that an entity tried to exit this disposal unit.

16
Content.Shared/Disposal/SharedDisposalUnitSystem.cs
View File

@@ -80,8 +80,7 @@ public abstract class SharedDisposalUnitSystem : EntitySystem
var otherBody = args.OtherEntity;
// Items dropped shouldn't collide but items thrown should
if (EntityManager.HasComponent<ItemComponent>(otherBody) &&
!EntityManager.HasComponent<ThrownItemComponent>(otherBody))
if (HasComp<ItemComponent>(otherBody) && !HasComp<ThrownItemComponent>(otherBody))
{
args.Cancelled = true;
return;
@@ -110,25 +109,20 @@ public abstract class SharedDisposalUnitSystem : EntitySystem
public virtual bool CanInsert(EntityUid uid, SharedDisposalUnitComponent component, EntityUid entity)
{
if (!EntityManager.GetComponent<TransformComponent>(uid).Anchored)
if (!Transform(uid).Anchored)
return false;
// TODO: Probably just need a disposable tag.
if (!EntityManager.TryGetComponent(entity, out ItemComponent? storable) &&
!EntityManager.HasComponent<BodyComponent>(entity))
{
var storable = HasComp<ItemComponent>(entity);
if (!storable && !HasComp<BodyComponent>(entity))
return false;
}
//Check if the entity is a mob and if mobs can be inserted
if (TryComp<MobStateComponent>(entity, out var damageState) && !component.MobsCanEnter)
return false;
if (EntityManager.TryGetComponent(entity, out PhysicsComponent? physics) &&
(physics.CanCollide || storable != null))
{
if (TryComp<PhysicsComponent>(entity, out var physics) && (physics.CanCollide || storable))
return true;
}
return damageState != null && (!component.MobsCanEnter || _mobState.IsDead(entity, damageState));
}