From 478d400627188456da00d8dd641d682e120d2581 Mon Sep 17 00:00:00 2001 From: yueh Date: Sun, 29 Nov 2015 18:21:05 +0100 Subject: [PATCH] Fixes 2027: TinyTNT not triggered by flint&steel. --- .../java/appeng/block/misc/BlockTinyTNT.java | 29 +++++++++---------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/src/main/java/appeng/block/misc/BlockTinyTNT.java b/src/main/java/appeng/block/misc/BlockTinyTNT.java index b3b7c5ab..8190597d 100644 --- a/src/main/java/appeng/block/misc/BlockTinyTNT.java +++ b/src/main/java/appeng/block/misc/BlockTinyTNT.java @@ -89,19 +89,18 @@ public class BlockTinyTNT extends AEBaseBlock implements ICustomCollision } @Override - public boolean onActivated( final World w, final int x, final int y, final int z, final EntityPlayer player, final int side, final float hitX, final float hitY, final float hitZ ) + public boolean onBlockActivated( World w, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ ) { if( player.getCurrentEquippedItem() != null && player.getCurrentEquippedItem().getItem() == Items.flint_and_steel ) { this.startFuse( w, x, y, z, player ); w.setBlockToAir( x, y, z ); player.getCurrentEquippedItem().damageItem( 1, player ); + return true; } - else - { - return super.onActivated( w, x, y, z, player, side, hitX, hitY, hitZ ); - } + + return super.onBlockActivated( w, x, y, z, player, side, hitX, hitY, hitZ ); } @Override @@ -110,16 +109,6 @@ public class BlockTinyTNT extends AEBaseBlock implements ICustomCollision // no images required. } - public void startFuse( final World w, final int x, final int y, final int z, final EntityLivingBase igniter ) - { - if( !w.isRemote ) - { - final EntityTinyTNTPrimed primedTinyTNTEntity = new EntityTinyTNTPrimed( w, x + 0.5F, y + 0.5F, z + 0.5F, igniter ); - w.spawnEntityInWorld( primedTinyTNTEntity ); - w.playSoundAtEntity( primedTinyTNTEntity, "game.tnt.primed", 1.0F, 1.0F ); - } - } - @Override public void onBlockAdded( final World w, final int x, final int y, final int z ) { @@ -185,4 +174,14 @@ public class BlockTinyTNT extends AEBaseBlock implements ICustomCollision { out.add( AxisAlignedBB.getBoundingBox( 0.25, 0, 0.25, 0.75, 0.5, 0.75 ) ); } + + public void startFuse( final World w, final int x, final int y, final int z, final EntityLivingBase igniter ) + { + if( !w.isRemote ) + { + final EntityTinyTNTPrimed primedTinyTNTEntity = new EntityTinyTNTPrimed( w, x + 0.5F, y + 0.5F, z + 0.5F, igniter ); + w.spawnEntityInWorld( primedTinyTNTEntity ); + w.playSoundAtEntity( primedTinyTNTEntity, "game.tnt.primed", 1.0F, 1.0F ); + } + } }