diff options
| author | miozune <miozune@gmail.com> | 2023-07-04 17:31:46 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-04 17:31:46 +0900 |
| commit | 82fd45bd708f172a9878be87eca3fbcf2b78477f (patch) | |
| tree | 4ecf905b2f74deccaaa435269db3845532ff4017 /src/main | |
| parent | 891ab02fcad4f8f8f13ba07b1792d2d67023c5fa (diff) | |
| download | GT5-Unofficial-82fd45bd708f172a9878be87eca3fbcf2b78477f.tar.gz GT5-Unofficial-82fd45bd708f172a9878be87eca3fbcf2b78477f.tar.bz2 GT5-Unofficial-82fd45bd708f172a9878be87eca3fbcf2b78477f.zip | |
Fix NPE with grid proxy (#2116)
* Fix NPE with grid proxy
* Create proxy instead of check null
Diffstat (limited to 'src/main')
3 files changed, 11 insertions, 5 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_InputBus_ME.java b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_InputBus_ME.java index c8b5a65e9c..4ecb38136f 100644 --- a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_InputBus_ME.java +++ b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_InputBus_ME.java @@ -7,6 +7,8 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import javax.annotation.Nullable; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; @@ -69,7 +71,7 @@ public class GT_MetaTileEntity_Hatch_InputBus_ME extends GT_MetaTileEntity_Hatch private static final int SLOT_COUNT = 16; private BaseActionSource requestSource = null; - private AENetworkProxy gridProxy = null; + private @Nullable AENetworkProxy gridProxy = null; private final ItemStack[] shadowInventory = new ItemStack[SLOT_COUNT]; private final int[] savedStackSizes = new int[SLOT_COUNT]; private boolean processingRecipe = false; @@ -173,7 +175,7 @@ public class GT_MetaTileEntity_Hatch_InputBus_ME extends GT_MetaTileEntity_Hatch aNBT.setBoolean("autoStock", autoPullItemList); aNBT.setInteger("minAutoPullStackSize", minAutoPullStackSize); if (GregTech_API.mAE2) { - gridProxy.writeToNBT(aNBT); + getProxy().writeToNBT(aNBT); } } diff --git a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_OutputBus_ME.java b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_OutputBus_ME.java index 303730d338..e47afb7222 100644 --- a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_OutputBus_ME.java +++ b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_OutputBus_ME.java @@ -6,6 +6,8 @@ import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_ME_HATCH_ACTIVE; import java.util.ArrayList; import java.util.List; +import javax.annotation.Nullable; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTBase; @@ -46,7 +48,7 @@ public class GT_MetaTileEntity_Hatch_OutputBus_ME extends GT_MetaTileEntity_Hatc implements IPowerChannelState { private BaseActionSource requestSource = null; - private AENetworkProxy gridProxy = null; + private @Nullable AENetworkProxy gridProxy = null; final IItemList<IAEItemStack> itemCache = GregTech_API.mAE2 ? AEApi.instance() .storage() .createItemList() : null; diff --git a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_Output_ME.java b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_Output_ME.java index e20258193a..5ba4fb85c9 100644 --- a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_Output_ME.java +++ b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_Output_ME.java @@ -6,6 +6,8 @@ import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_ME_FLUID_HATCH_ACTI import java.util.ArrayList; import java.util.List; +import javax.annotation.Nullable; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagCompound; @@ -50,7 +52,7 @@ import gregtech.api.util.GT_Utility; public class GT_MetaTileEntity_Hatch_Output_ME extends GT_MetaTileEntity_Hatch_Output implements IPowerChannelState { private BaseActionSource requestSource = null; - private AENetworkProxy gridProxy = null; + private @Nullable AENetworkProxy gridProxy = null; final IItemList<IAEFluidStack> fluidCache = GregTech_API.mAE2 ? AEApi.instance() .storage() .createFluidList() : null; @@ -240,7 +242,7 @@ public class GT_MetaTileEntity_Hatch_Output_ME extends GT_MetaTileEntity_Hatch_O fluids.appendTag(tag); } aNBT.setTag("cachedFluids", fluids); - gridProxy.writeToNBT(aNBT); + getProxy().writeToNBT(aNBT); } } |