From 4cf7062d81dc6a69f647218ab1f7cac9c9ce10aa Mon Sep 17 00:00:00 2001 From: Darkere Date: Sun, 17 Oct 2021 22:36:33 +0200 Subject: [PATCH] fix nullptr when loading old PortableGridTile nbt --- .../refinedstorage/tile/grid/portable/PortableGridTile.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/grid/portable/PortableGridTile.java b/src/main/java/com/refinedmods/refinedstorage/tile/grid/portable/PortableGridTile.java index 0c10171ea..52282e52c 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/grid/portable/PortableGridTile.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/grid/portable/PortableGridTile.java @@ -70,6 +70,7 @@ import net.minecraftforge.energy.CapabilityEnergy; import net.minecraftforge.energy.EnergyStorage; import net.minecraftforge.energy.IEnergyStorage; import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fml.server.ServerLifecycleHooks; import net.minecraftforge.items.IItemHandlerModifiable; import javax.annotation.Nonnull; @@ -486,7 +487,7 @@ public class PortableGridTile extends BaseTile implements ITickableTileEntity, I this.itemStorageTrackerId = UUID.randomUUID(); } - this.itemStorageTracker = (ItemStorageTracker) API.instance().getStorageTrackerManager((ServerWorld) world).getOrCreate(itemStorageTrackerId, StorageType.ITEM); + this.itemStorageTracker = (ItemStorageTracker) API.instance().getStorageTrackerManager(ServerLifecycleHooks.getCurrentServer().func_241755_D_()).getOrCreate(itemStorageTrackerId, StorageType.ITEM); } return itemStorageTracker; @@ -499,7 +500,7 @@ public class PortableGridTile extends BaseTile implements ITickableTileEntity, I this.fluidStorageTrackerId = UUID.randomUUID(); } - this.fluidStorageTracker = (FluidStorageTracker) API.instance().getStorageTrackerManager((ServerWorld) world).getOrCreate(fluidStorageTrackerId, StorageType.FLUID); + this.fluidStorageTracker = (FluidStorageTracker) API.instance().getStorageTrackerManager(ServerLifecycleHooks.getCurrentServer().func_241755_D_()).getOrCreate(fluidStorageTrackerId, StorageType.FLUID); } return fluidStorageTracker;