From c175bebe8b7fe2391c83bcc9a37e68ea13d94f03 Mon Sep 17 00:00:00 2001 From: miozune Date: Fri, 30 Jun 2023 09:23:32 +0900 Subject: Fix crash by casting emptyList to ArrayList (#2103) --- src/main/java/gregtech/api/multitileentity/MultiTileEntityBlock.java | 3 +-- src/main/java/gregtech/common/blocks/GT_Block_Machines.java | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'src/main/java/gregtech') diff --git a/src/main/java/gregtech/api/multitileentity/MultiTileEntityBlock.java b/src/main/java/gregtech/api/multitileentity/MultiTileEntityBlock.java index 7d1c74b1bc..a30d523b55 100644 --- a/src/main/java/gregtech/api/multitileentity/MultiTileEntityBlock.java +++ b/src/main/java/gregtech/api/multitileentity/MultiTileEntityBlock.java @@ -8,7 +8,6 @@ import static gregtech.api.util.GT_Util.getTileEntity; import static gregtech.api.util.GT_Util.setTileEntity; import java.util.ArrayList; -import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -193,7 +192,7 @@ public class MultiTileEntityBlock extends Block implements IDebugableBlock, ITil if (aTileEntity instanceof IDebugableTileEntity) { return ((IDebugableTileEntity) aTileEntity).getDebugInfo(aPlayer, aLogLevel); } - return (ArrayList) Collections.emptyList(); + return new ArrayList<>(); } @Override diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Machines.java b/src/main/java/gregtech/common/blocks/GT_Block_Machines.java index 78044ed44b..ceb0ed67c8 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Machines.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Machines.java @@ -4,7 +4,6 @@ import static gregtech.GT_Mod.GT_FML_LOGGER; import static gregtech.api.objects.XSTR.XSTR_INSTANCE; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import java.util.Random; @@ -446,7 +445,7 @@ public class GT_Block_Machines extends GT_Generic_Block implements IDebugableBlo final IGregTechTileEntity tGregTechTileEntity = mTemporaryTileEntity.get(); final ArrayList tDrops; if (tGregTechTileEntity == null) { - tDrops = (ArrayList) Collections.emptyList(); + tDrops = new ArrayList<>(); } else { tDrops = tGregTechTileEntity.getDrops(); mTemporaryTileEntity.remove(); @@ -626,7 +625,7 @@ public class GT_Block_Machines extends GT_Generic_Block implements IDebugableBlo if (tTileEntity instanceof IDebugableTileEntity) { return ((IDebugableTileEntity) tTileEntity).getDebugInfo(aPlayer, aLogLevel); } - return (ArrayList) Collections.emptyList(); + return new ArrayList<>(); } @Override -- cgit