From a7a65ae39d145b13575d8eadb54141b3d101191f Mon Sep 17 00:00:00 2001 From: yueh Date: Sun, 31 Dec 2017 13:06:18 +0100 Subject: [PATCH] Fixes #3296: Prevent invalid TileEntites from updating their block. (#3301) Updating the blockstate of invalid TEs will cause Forge to restore the block including the TE leading to invalid TEs sticking around after being moved. --- src/main/java/appeng/tile/crafting/TileCraftingStorageTile.java | 2 +- src/main/java/appeng/tile/crafting/TileCraftingTile.java | 2 +- src/main/java/appeng/tile/networking/TileEnergyCell.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/appeng/tile/crafting/TileCraftingStorageTile.java b/src/main/java/appeng/tile/crafting/TileCraftingStorageTile.java index c48a885c9..b4581f808 100644 --- a/src/main/java/appeng/tile/crafting/TileCraftingStorageTile.java +++ b/src/main/java/appeng/tile/crafting/TileCraftingStorageTile.java @@ -74,7 +74,7 @@ public class TileCraftingStorageTile extends TileCraftingTile @Override public int getStorageBytes() { - if( this.world == null || this.notLoaded() ) + if( this.world == null || this.notLoaded() || this.isInvalid() ) { return 0; } diff --git a/src/main/java/appeng/tile/crafting/TileCraftingTile.java b/src/main/java/appeng/tile/crafting/TileCraftingTile.java index 1a2f81b56..ef6278e31 100644 --- a/src/main/java/appeng/tile/crafting/TileCraftingTile.java +++ b/src/main/java/appeng/tile/crafting/TileCraftingTile.java @@ -143,7 +143,7 @@ public class TileCraftingTile extends AENetworkTile implements IAEMultiBlock, IP public void updateMeta( final boolean updateFormed ) { - if( this.world == null || this.notLoaded() ) + if( this.world == null || this.notLoaded() || this.isInvalid() ) { return; } diff --git a/src/main/java/appeng/tile/networking/TileEnergyCell.java b/src/main/java/appeng/tile/networking/TileEnergyCell.java index fa90876e9..525ef0cce 100644 --- a/src/main/java/appeng/tile/networking/TileEnergyCell.java +++ b/src/main/java/appeng/tile/networking/TileEnergyCell.java @@ -84,7 +84,7 @@ public class TileEnergyCell extends AENetworkTile implements IAEPowerStorage private void changePowerLevel() { - if( this.notLoaded() ) + if( this.notLoaded() || this.isInvalid() ) { return; }