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

Fix candy bowls (#25514)

Browse Source 
* Before SharedItemSystem

* Fixes mispredict, removed unused

* Fix physics
This commit is contained in:
Krunklehorn
2024-02-25 08:08:14 -05:00
committed by GitHub
parent 51acebd232
commit 902198d7e0
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Content.Shared/Storage/EntitySystems/BinSystem.cs
View File

@@ -4,12 +4,11 @@ using Content.Shared.Database;
using Content.Shared.Examine;
using Content.Shared.Hands.EntitySystems;
using Content.Shared.Interaction;
using Content.Shared.Item;
using Content.Shared.Storage.Components;
using Content.Shared.Verbs;
using Robust.Shared.Containers;
using Robust.Shared.Map;
using Robust.Shared.Network;
using Robust.Shared.Timing;
namespace Content.Shared.Storage.EntitySystems;
@@ -18,7 +17,6 @@ namespace Content.Shared.Storage.EntitySystems;
/// </summary>
public sealed class BinSystem : EntitySystem
{
[Dependency] private readonly IGameTiming _timing = default!;
[Dependency] private readonly INetManager _net = default!;
[Dependency] private readonly ISharedAdminLogManager _admin = default!;
[Dependency] private readonly SharedContainerSystem _container = default!;
@@ -32,7 +30,7 @@ public sealed class BinSystem : EntitySystem
SubscribeLocalEvent<BinComponent, ComponentStartup>(OnStartup);
SubscribeLocalEvent<BinComponent, MapInitEvent>(OnMapInit);
SubscribeLocalEvent<BinComponent, EntRemovedFromContainerMessage>(OnEntRemoved);
SubscribeLocalEvent<BinComponent, InteractHandEvent>(OnInteractHand);
SubscribeLocalEvent<BinComponent, InteractHandEvent>(OnInteractHand, before: new[] { typeof(SharedItemSystem) });
SubscribeLocalEvent<BinComponent, AfterInteractUsingEvent>(OnAfterInteractUsing);
SubscribeLocalEvent<BinComponent, GetVerbsEvent<AlternativeVerb>>(OnAltInteractHand);
SubscribeLocalEvent<BinComponent, ExaminedEvent>(OnExamined);
@@ -73,7 +71,7 @@ public sealed class BinSystem : EntitySystem
private void OnInteractHand(EntityUid uid, BinComponent component, InteractHandEvent args)
{
if (args.Handled || !_timing.IsFirstTimePredicted)
if (args.Handled)
return;
EntityUid? toGrab = component.Items.LastOrDefault();
@@ -111,9 +109,6 @@ public sealed class BinSystem : EntitySystem
if (handled || !canReach)
return;
if (!_timing.IsFirstTimePredicted)
return;
if (!TryInsertIntoBin(target, itemInHand, component))
return;