Merge pull request #2028 from yueh/fix-2027
Fixes 2027: TinyTNT not triggered by flint&steel.
This commit is contained in:
commit
b252d1f269
|
@ -89,19 +89,18 @@ public class BlockTinyTNT extends AEBaseBlock implements ICustomCollision
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@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 )
|
if( player.getCurrentEquippedItem() != null && player.getCurrentEquippedItem().getItem() == Items.flint_and_steel )
|
||||||
{
|
{
|
||||||
this.startFuse( w, x, y, z, player );
|
this.startFuse( w, x, y, z, player );
|
||||||
w.setBlockToAir( x, y, z );
|
w.setBlockToAir( x, y, z );
|
||||||
player.getCurrentEquippedItem().damageItem( 1, player );
|
player.getCurrentEquippedItem().damageItem( 1, player );
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
else
|
|
||||||
{
|
return super.onBlockActivated( w, x, y, z, player, side, hitX, hitY, hitZ );
|
||||||
return super.onActivated( w, x, y, z, player, side, hitX, hitY, hitZ );
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -110,16 +109,6 @@ public class BlockTinyTNT extends AEBaseBlock implements ICustomCollision
|
||||||
// no images required.
|
// 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
|
@Override
|
||||||
public void onBlockAdded( final World w, final int x, final int y, final int z )
|
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 ) );
|
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 );
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue