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

MaterialComponent cleanup (#13326)

Browse Source
This commit is contained in:
Leon Friedrich
2023-01-08 11:36:32 +13:00
committed by GitHub
parent 89301629f5
commit 1f5bae751f
12 changed files with 70 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Content.Shared/Materials/SharedMaterialStorageSystem.cs
View File

@@ -1,4 +1,4 @@
using System.Linq;
using System.Linq;
using Content.Shared.Interaction;
using Content.Shared.Stacks;
using JetBrains.Annotations;
@@ -152,24 +152,13 @@ public abstract class SharedMaterialStorageSystem : EntitySystem
if (component.EntityWhitelist?.IsValid(toInsert) == false)
return false;
if (component.MaterialWhiteList != null)
{
var matUsed = false;
foreach (var mat in material.Materials)
{
if (component.MaterialWhiteList.Contains(mat.ID))
matUsed = true;
}
if (!matUsed)
return false;
}
// Material Whitelist checked implicitly by CanChangeMaterialAmount();
var multiplier = TryComp<StackComponent>(toInsert, out var stackComponent) ? stackComponent.Count : 1;
var totalVolume = 0;
foreach (var (mat, vol) in component.Storage)
foreach (var (mat, vol) in material.Materials)
{
if (!CanChangeMaterialAmount(receiver, mat, vol, component))
if (!CanChangeMaterialAmount(receiver, mat, vol * multiplier, component))
return false;
totalVolume += vol * multiplier;
}
@@ -177,12 +166,12 @@ public abstract class SharedMaterialStorageSystem : EntitySystem
if (!CanTakeVolume(receiver, totalVolume, component))
return false;
foreach (var (mat, vol) in material._materials)
foreach (var (mat, vol) in material.Materials)
{
TryChangeMaterialAmount(receiver, mat, vol * multiplier, component);
}
RaiseLocalEvent(component.Owner, new MaterialEntityInsertedEvent(material._materials));
RaiseLocalEvent(component.Owner, new MaterialEntityInsertedEvent(material));
return true;
}