From 2c65adaaeeaee967cdfb761c98a765a9b8b9e9e0 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Tue, 22 Dec 2015 13:07:57 +0100 Subject: [PATCH] fix some tiles dropping stuff that can't be dropped --- src/main/java/storagecraft/block/BlockBase.java | 2 +- src/main/java/storagecraft/tile/TileBase.java | 5 +++++ src/main/java/storagecraft/tile/TileDetector.java | 6 ++++++ src/main/java/storagecraft/tile/TileExporter.java | 6 ++++++ src/main/java/storagecraft/tile/TileImporter.java | 6 ++++++ 5 files changed, 24 insertions(+), 1 deletion(-) diff --git a/src/main/java/storagecraft/block/BlockBase.java b/src/main/java/storagecraft/block/BlockBase.java index fe964e846..a4dc79c5d 100644 --- a/src/main/java/storagecraft/block/BlockBase.java +++ b/src/main/java/storagecraft/block/BlockBase.java @@ -83,7 +83,7 @@ public abstract class BlockBase extends Block { TileEntity tile = world.getTileEntity(x, y, z); - if (tile instanceof IInventory) + if (tile instanceof IInventory && tile instanceof TileBase && ((TileBase) tile).canDropInventory()) { InventoryUtils.dropInventory(world, (IInventory) tile, x, y, z); } diff --git a/src/main/java/storagecraft/tile/TileBase.java b/src/main/java/storagecraft/tile/TileBase.java index 6865177ab..8a24099a1 100644 --- a/src/main/java/storagecraft/tile/TileBase.java +++ b/src/main/java/storagecraft/tile/TileBase.java @@ -77,4 +77,9 @@ public abstract class TileBase extends TileEntity { direction = ForgeDirection.getOrientation(packet.func_148857_g().getInteger("Direction")); } + + public boolean canDropInventory() + { + return true; + } } diff --git a/src/main/java/storagecraft/tile/TileDetector.java b/src/main/java/storagecraft/tile/TileDetector.java index 0479bb697..0f439b4c9 100644 --- a/src/main/java/storagecraft/tile/TileDetector.java +++ b/src/main/java/storagecraft/tile/TileDetector.java @@ -290,4 +290,10 @@ public class TileDetector extends TileMachine implements IInventory, ISidedInven buf.writeInt(amount); buf.writeBoolean(providesPower); } + + @Override + public boolean canDropInventory() + { + return false; + } } diff --git a/src/main/java/storagecraft/tile/TileExporter.java b/src/main/java/storagecraft/tile/TileExporter.java index 0cf771cf4..cb8f7b316 100644 --- a/src/main/java/storagecraft/tile/TileExporter.java +++ b/src/main/java/storagecraft/tile/TileExporter.java @@ -232,4 +232,10 @@ public class TileExporter extends TileMachine implements IInventory, ISidedInven buf.writeInt(compare); } + + @Override + public boolean canDropInventory() + { + return false; + } } diff --git a/src/main/java/storagecraft/tile/TileImporter.java b/src/main/java/storagecraft/tile/TileImporter.java index a17f278e7..cc26c2918 100644 --- a/src/main/java/storagecraft/tile/TileImporter.java +++ b/src/main/java/storagecraft/tile/TileImporter.java @@ -280,4 +280,10 @@ public class TileImporter extends TileMachine implements IInventory, ISidedInven buf.writeInt(compare); buf.writeInt(mode); } + + @Override + public boolean canDropInventory() + { + return false; + } }