Skip to content

Commit a46460d

Browse files
Check item and capability before attempting to extract/insert (#2731)
1 parent 4733593 commit a46460d

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

src/main/java/gregtech/api/metatileentity/MetaTileEntity.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1162,6 +1162,10 @@ public void fillInternalTankFromFluidContainer() {
11621162
public void fillInternalTankFromFluidContainer(IFluidHandler fluidHandler) {
11631163
for (int i = 0; i < importItems.getSlots(); i++) {
11641164
ItemStack inputContainerStack = importItems.extractItem(i, 1, true);
1165+
if (inputContainerStack.isEmpty() ||
1166+
!inputContainerStack.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY, null)) {
1167+
continue;
1168+
}
11651169
FluidActionResult result = FluidUtil.tryEmptyContainer(inputContainerStack, fluidHandler, Integer.MAX_VALUE,
11661170
null, false);
11671171
if (result.isSuccess()) {
@@ -1184,6 +1188,10 @@ public void fillContainerFromInternalTank() {
11841188
public void fillContainerFromInternalTank(IFluidHandler fluidHandler) {
11851189
for (int i = 0; i < importItems.getSlots(); i++) {
11861190
ItemStack emptyContainer = importItems.extractItem(i, 1, true);
1191+
if (emptyContainer.isEmpty() ||
1192+
!emptyContainer.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY, null)) {
1193+
continue;
1194+
}
11871195
FluidActionResult result = FluidUtil.tryFillContainer(emptyContainer, fluidHandler, Integer.MAX_VALUE, null,
11881196
false);
11891197
if (result.isSuccess()) {

0 commit comments

Comments
 (0)