Bug Fix: Collapsed stockpile groups would have duplicates after update

Merge Master
GoldenGnu · May 3, 2024 · b3ee0b1 · b3ee0b1
2 parents 554f8e2 + 4ff6b7e
commit b3ee0b1
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/main/java/net/nikr/eve/jeveasset/gui/tabs/stockpile/StockpileData.java b/src/main/java/net/nikr/eve/jeveasset/gui/tabs/stockpile/StockpileData.java
@@ -89,8 +89,13 @@ public void updateData(EventList<StockpileItem> eventList) {
 		//Update Stockpiles (StockpileItem)
 		for (Stockpile stockpile : StockpileTab.getShownStockpiles(profileManager)) {
 			stockpile.updateDynamicValues();
-			stockpileItems.addAll(stockpile.getItems());
 			updateStockpile(stockpile);
+			String group = Settings.get().getStockpileGroupSettings().getGroup(stockpile);
+			if (Settings.get().getStockpileGroupSettings().isGroupExpanded(group)) { //Stockpile group expanded or not in group
+				stockpileItems.addAll(stockpile.getItems());
+			} else {
+				stockpileItems.add(stockpile.getIgnoreItem());
+			}
 		}
 		//Update Subpiles (SubpileItem)
 		stockpileItems.addAll(getUpdatedSubpiles());
@@ -490,7 +495,10 @@ private void updateSubpile(List<StockpileItem> updated, List<StockpileItem> remo
 		}
 		updated.removeAll(subpileItems);
 		if (profileManager.getStockpileIDs().isShown(parent.getStockpileID())) {
-			updated.addAll(parent.getSubpileItems());
+			String group = Settings.get().getStockpileGroupSettings().getGroup(parent);
+			if (Settings.get().getStockpileGroupSettings().isGroupExpanded(group)) { //Stockpile group expanded or not in group
+				updated.addAll(parent.getSubpileItems());
+			}
 		}
 	}