From 61679928b2b6693e0b1dd93cdbf40a38a291dfec Mon Sep 17 00:00:00 2001 From: Matti Ruohonen Date: Tue, 7 Feb 2017 07:04:57 +0200 Subject: [PATCH 1/2] Fix the Pusher/Puller not dropping with correct metadata. Fixes #100. --- .../java/com/rwtema/funkylocomotion/blocks/BlockPusher.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/com/rwtema/funkylocomotion/blocks/BlockPusher.java b/src/main/java/com/rwtema/funkylocomotion/blocks/BlockPusher.java index a9eeecd..4dffe72 100644 --- a/src/main/java/com/rwtema/funkylocomotion/blocks/BlockPusher.java +++ b/src/main/java/com/rwtema/funkylocomotion/blocks/BlockPusher.java @@ -55,6 +55,11 @@ public void onBlockPlacedBy(World worldIn, BlockPos pos, IBlockState state, Enti } } + @Override + public int damageDropped(IBlockState state) { + return state.getValue(PUSH_PULL_TYPE) == PushPullType.PUSHER ? 0 : 1; + } + @Override public void getSubBlocks(@Nonnull Item itemIn, CreativeTabs tab, List list) { list.add(new ItemStack(itemIn, 1, 0)); From 55311be0ac057473583a0ef44bc1dcf0b40f7d1f Mon Sep 17 00:00:00 2001 From: Matti Ruohonen Date: Mon, 13 Mar 2017 02:00:30 +0200 Subject: [PATCH 2/2] Fix a crash in the Slider and Teleporter with getDamageDropped() --- .../java/com/rwtema/funkylocomotion/blocks/BlockSlider.java | 5 +++++ .../com/rwtema/funkylocomotion/blocks/BlockTeleport.java | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/src/main/java/com/rwtema/funkylocomotion/blocks/BlockSlider.java b/src/main/java/com/rwtema/funkylocomotion/blocks/BlockSlider.java index 122132f..7181efa 100644 --- a/src/main/java/com/rwtema/funkylocomotion/blocks/BlockSlider.java +++ b/src/main/java/com/rwtema/funkylocomotion/blocks/BlockSlider.java @@ -50,6 +50,11 @@ public void init() { }; } + @Override + public int damageDropped(IBlockState state) { + return 0; + } + @Nonnull @Override public IBlockState getActualState(@Nonnull IBlockState state, IBlockAccess worldIn, BlockPos pos) { diff --git a/src/main/java/com/rwtema/funkylocomotion/blocks/BlockTeleport.java b/src/main/java/com/rwtema/funkylocomotion/blocks/BlockTeleport.java index e94734a..74856a5 100644 --- a/src/main/java/com/rwtema/funkylocomotion/blocks/BlockTeleport.java +++ b/src/main/java/com/rwtema/funkylocomotion/blocks/BlockTeleport.java @@ -27,6 +27,11 @@ public BlockTeleport() { this.setUnlocalizedName("funkylocomotion:teleporter"); } + @Override + public int damageDropped(IBlockState state) { + return 0; + } + @Override public void getSubBlocks(@Nonnull Item itemIn, CreativeTabs tab, List list) { list.add(new ItemStack(itemIn, 1, 0));