rechka/fish-station
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix material storage going BRRT (#29167)

Browse source 
If the volume hits 0 we just remove it.
This commit is contained in:
metalgearsloth 2024-06-19 07:47:19 +10:00 • committed by GitHub
parent 3358aef40f
commit dabf3d1521
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Content.Client/Lathe/UI/LatheMenu.xaml.cs
View file

@ -78,9 +78,6 @@ public sealed partial class LatheMenu : DefaultWindow
/// </summary>
public void PopulateRecipes()
{
if (!_entityManager.TryGetComponent<LatheComponent>(_owner, out var component))
return;
var recipesToShow = new List<LatheRecipePrototype>();
foreach (var recipe in Recipes)
{

12
Content.Shared/Materials/SharedMaterialStorageSystem.cs
View file

@ -1,11 +1,13 @@
using System.Linq;
using Content.Shared.Interaction;
using Content.Shared.Interaction.Components;
using Content.Shared.Mobs;
using Content.Shared.Stacks;
using Content.Shared.Whitelist;
using JetBrains.Annotations;
using Robust.Shared.Prototypes;
using Robust.Shared.Timing;
using Robust.Shared.Utility;
namespace Content.Shared.Materials;
@ -166,8 +168,14 @@ public abstract class SharedMaterialStorageSystem : EntitySystem
return false;
if (!CanChangeMaterialAmount(uid, materialId, volume, component))
return false;
component.Storage.TryAdd(materialId, 0);
component.Storage[materialId] += volume;
var existing = component.Storage.GetOrNew(materialId);
existing += volume;
if (existing == 0)
component.Storage.Remove(materialId);
else
component.Storage[materialId] = existing;
var ev = new MaterialAmountChangedEvent();
RaiseLocalEvent(uid, ref ev);