From c1fa77df518f250cb41f1899ec68be683b8fe941 Mon Sep 17 00:00:00 2001 From: yueh Date: Tue, 31 Oct 2017 16:12:08 +0100 Subject: [PATCH] Fixes #3189: Formation plane unable to place special items. (#3190) --- .../parts/automation/PartFormationPlane.java | 23 +++---------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/src/main/java/appeng/parts/automation/PartFormationPlane.java b/src/main/java/appeng/parts/automation/PartFormationPlane.java index 0b6dbf8c..8454c406 100644 --- a/src/main/java/appeng/parts/automation/PartFormationPlane.java +++ b/src/main/java/appeng/parts/automation/PartFormationPlane.java @@ -29,6 +29,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemBlockSpecial; import net.minecraft.item.ItemFirework; import net.minecraft.item.ItemSkull; import net.minecraft.item.ItemStack; @@ -452,32 +453,14 @@ public class PartFormationPlane extends PartUpgradeable implements ICellContaine if( w.getBlockState( tePos ).getBlock().isReplaceable( w, tePos ) ) { - if( placeBlock == YesNo.YES && ( i instanceof ItemBlock || i instanceof IPlantable || i instanceof ItemSkull || i instanceof ItemFirework || i instanceof IPartItem || i == Item - .getItemFromBlock( - Blocks.REEDS ) ) ) + if( placeBlock == YesNo.YES && ( i instanceof ItemBlock || i instanceof ItemBlockSpecial || i instanceof IPlantable || i instanceof ItemSkull || i instanceof ItemFirework || i instanceof IPartItem || i == Item + .getItemFromBlock( Blocks.REEDS ) ) ) { final EntityPlayer player = Platform.getPlayer( (WorldServer) w ); Platform.configurePlayer( player, side, this.getTile() ); EnumHand hand = player.getActiveHand(); player.setHeldItem( hand, is ); - // TODO: LIMIT FIREWORKS - /* - * if( i instanceof ItemFirework ) - * { - * Chunk c = w.getChunkFromBlockCoords( tePos ); - * int sum = 0; - * for( List Z : c.geten ) - * { - * sum += Z.size(); - * } - * if( sum > 32 ) - * { - * return input; - * } - * } - */ - maxStorage = is.getCount(); worked = true; if( type == Actionable.MODULATE )