Only initialize the HandlerTransitRequest item map if we have any ite…

…ms in it
mekanism · Apr 5, 2024 · e022c13 · e022c13
1 parent eac6619
commit e022c13
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/main/java/mekanism/common/lib/inventory/HandlerTransitRequest.java b/src/main/java/mekanism/common/lib/inventory/HandlerTransitRequest.java
@@ -4,6 +4,7 @@
 import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap;
 import it.unimi.dsi.fastutil.objects.ObjectIterator;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import mekanism.common.Mekanism;
@@ -14,14 +15,17 @@
 public class HandlerTransitRequest extends TransitRequest {
 
     private final IItemHandler handler;
-    private final Map<HashedItem, HandlerItemData> itemMap = new LinkedHashMap<>();
+    private Map<HashedItem, HandlerItemData> itemMap = Collections.emptyMap();
 
     public HandlerTransitRequest(IItemHandler handler) {
         this.handler = handler;
     }
 
     public void addItem(ItemStack stack, int slot) {
         HashedItem hashed = HashedItem.create(stack);
+        if (itemMap.isEmpty()) {
+            itemMap = new LinkedHashMap<>();
+        }
         itemMap.computeIfAbsent(hashed, HandlerItemData::new).addSlot(slot, stack);
     }
 
@@ -62,8 +66,7 @@ public ItemStack use(int amount) {
             if (handler != null && !slotMap.isEmpty()) {
                 HashedItem itemType = getItemType();
                 ItemStack itemStack = itemType.getInternalStack();
-                ObjectIterator<Int2IntMap.Entry> iterator = slotMap.int2IntEntrySet().iterator();
-                while (iterator.hasNext()) {
+                for (ObjectIterator<Int2IntMap.Entry> iterator = slotMap.int2IntEntrySet().iterator(); iterator.hasNext(); )  {
                     Int2IntMap.Entry entry = iterator.next();
                     int slot = entry.getIntKey();
                     int currentCount = entry.getIntValue();