From 5f2501693f52f2b8ca6348ccb6b438f81df0c613 Mon Sep 17 00:00:00 2001 From: Xander Victory Date: Tue, 18 Jul 2017 17:12:28 +0800 Subject: [PATCH] add a sanity check for weird ISidedInventorys that give us a slot id that's higher than the inv size they reported. (see #4484) --- .../common/content/transporter/TransporterManager.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/mekanism/common/content/transporter/TransporterManager.java b/src/main/java/mekanism/common/content/transporter/TransporterManager.java index ca9cd31ed..2fabf0060 100644 --- a/src/main/java/mekanism/common/content/transporter/TransporterManager.java +++ b/src/main/java/mekanism/common/content/transporter/TransporterManager.java @@ -9,6 +9,7 @@ import java.util.Set; import mekanism.api.Coord4D; import mekanism.api.EnumColor; +import mekanism.common.Mekanism; import mekanism.common.base.ISideConfiguration; import mekanism.common.content.transporter.TransitRequest.TransitResponse; import mekanism.common.content.transporter.TransporterStack.Path; @@ -113,6 +114,11 @@ public class TransporterManager { int slotID = slots[get]; + if (slotID >= ret.size()){ + Mekanism.logger.error("Inventory {} gave slot number >= the number of slots it reported! {} >= {} ", inv.getClass().getName(), slotID, inv.getSizeInventory()); + continue; + } + ret.set(slotID, !sidedInventory.getStackInSlot(slotID).isEmpty() ? sidedInventory.getStackInSlot(slotID).copy() : ItemStack.EMPTY); }