From 342a951a27250aecd316ae5437068e7bc2e9fe80 Mon Sep 17 00:00:00 2001 From: Xander Victory Date: Tue, 24 Apr 2018 17:32:27 +0800 Subject: [PATCH] Register ic2 in validate too, to circumvent nested chunkloading weirdness, closes #4974 --- .../tile/prefab/TileEntityElectricBlock.java | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/src/main/java/mekanism/common/tile/prefab/TileEntityElectricBlock.java b/src/main/java/mekanism/common/tile/prefab/TileEntityElectricBlock.java index f4576a866..bcf8a3413 100644 --- a/src/main/java/mekanism/common/tile/prefab/TileEntityElectricBlock.java +++ b/src/main/java/mekanism/common/tile/prefab/TileEntityElectricBlock.java @@ -38,6 +38,8 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i /** Actual maximum energy storage, including upgrades */ public double maxEnergy; + + private boolean ic2Registered = false; /** * The base of all blocks that deal with electricity. It has a facing state, initialized state, @@ -55,18 +57,20 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i @Method(modid = MekanismHooks.IC2_MOD_ID) public void register() { - if(!world.isRemote) + if(!world.isRemote && !ic2Registered) { MinecraftForge.EVENT_BUS.post(new EnergyTileLoadEvent(this)); + ic2Registered = true; } } @Method(modid = MekanismHooks.IC2_MOD_ID) public void deregister() { - if(!world.isRemote) + if(!world.isRemote && ic2Registered) { MinecraftForge.EVENT_BUS.post(new EnergyTileUnloadEvent(this)); + ic2Registered = false; } } @@ -167,7 +171,16 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i deregister(); } } - + + @Override + public void validate() { + boolean wasInvalid = this.tileEntityInvalid;//workaround for pending tile entity invalidate/revalidate cycle + super.validate(); + if (wasInvalid && MekanismUtils.useIC2()){//re-register if we got invalidated + register(); + } + } + @Override public void readFromNBT(NBTTagCompound nbtTags) {