remove empty items created by the item loading safeguard

blushiemagic · Feb 3, 2024 · 4c1768c · 4c1768c
1 parent 406ecf0
commit 4c1768c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/Components/TEStorageHeart.cs b/Components/TEStorageHeart.cs
@@ -768,6 +768,8 @@ internal void DestroyUnloadedGlobalItemData(bool net = false) {
 
 		internal void TryDeleteExactItem(string itemData) {
 			Item clone = Utility.FromBase64NoCompression(itemData);
+			if (clone.IsAir)
+				return;
 
 			foreach (TEStorageUnit unit in GetStorageUnits().OfType<TEStorageUnit>()) {
 				if (unit.IsEmpty || !unit.HasItem(clone, ignorePrefix: true))

diff --git a/Components/TEStorageUnit.cs b/Components/TEStorageUnit.cs
@@ -453,7 +453,7 @@ public override void LoadData(TagCompound tag)
 		{
 			base.LoadData(tag);
 			ClearItemsData();
-			foreach (Item item in tag.GetList<TagCompound>("Items").Select(Utility.SafelyLoadItem))
+			foreach (Item item in tag.GetList<TagCompound>("Items").Select(Utility.SafelyLoadItem).Where(static i => !i.IsAir))
 			{
 				items.Add(item);
 				ItemData data = new(item);

diff --git a/ItemTypeOrderedSet.cs b/ItemTypeOrderedSet.cs
@@ -86,7 +86,7 @@ public void Load(TagCompound tag)
 		{
 			if (tag.GetList<TagCompound>(_name) is { Count: > 0 } listV1) 
 			{
-				_items = listV1.Select(Utility.SafelyLoadItem).ToList();
+				_items = listV1.Select(Utility.SafelyLoadItem).Where(static i => !i.IsAir).ToList();
 			}
 			else if (tag.GetList<int>(_name + Suffix) is { Count: > 0 } listV2) 
 			{