tilera/Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull requests Releases 1 Wiki Activity

Tiny TNT is more like TNT and less like an Item Eating Wombat.

Browse source
This commit is contained in:
AlgorithmX2 2014-02-14 21:17:22 -06:00
parent dcf23f4c03
commit ae35411d33
1 changed files with 25 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
entity/EntityTinyTNTPrimed.java
View file

@ -5,16 +5,18 @@ import io.netty.buffer.ByteBuf;
import java.io.IOException; import java.io.IOException;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.item.EntityTNTPrimed; import net.minecraft.entity.item.EntityTNTPrimed;
import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.DamageSource; import net.minecraft.util.DamageSource;
import net.minecraft.world.Explosion;
import net.minecraft.world.World; import net.minecraft.world.World;
import appeng.api.AEApi; import appeng.api.AEApi;
import appeng.core.CommonHelper;
import appeng.core.AEConfig; import appeng.core.AEConfig;
import appeng.core.CommonHelper;
import appeng.core.features.AEFeature; import appeng.core.features.AEFeature;
import appeng.core.sync.packets.PacketMockExplosion; import appeng.core.sync.packets.PacketMockExplosion;
import appeng.util.Platform; import appeng.util.Platform;
@ -97,9 +99,20 @@ final public class EntityTinyTNTPrimed extends EntityTNTPrimed implements IEntit
return; return;
} }
for (Object e : this.worldObj.getEntitiesWithinAABBExcludingEntity( this,
AxisAlignedBB.getBoundingBox( this.posX - 1.5, this.posY - 1.5f, this.posZ - 1.5, this.posX + 1.5, this.posY + 1.5, this.posZ + 1.5 ) ))
{
if ( e instanceof Entity )
{
((Entity) e).attackEntityFrom( DamageSource.setExplosionSource( null ), 6 );
}
}
if ( AEConfig.instance.isFeatureEnabled( AEFeature.TinyTNTBlockDamage ) ) if ( AEConfig.instance.isFeatureEnabled( AEFeature.TinyTNTBlockDamage ) )
{ {
posY -= 0.25; posY -= 0.25;
Explosion ex = new Explosion( worldObj, this, posX, posY, posZ, 0.2f );
for (int x = (int) (posX - 2); x <= posX + 2; x++) for (int x = (int) (posX - 2); x <= posX + 2; x++)
{ {
@ -115,11 +128,20 @@ final public class EntityTinyTNTPrimed extends EntityTNTPrimed implements IEntit
float resistance = block.getExplosionResistance( this, worldObj, x, y, z, posX, posY, posZ ); float resistance = block.getExplosionResistance( this, worldObj, x, y, z, posX, posY, posZ );
strength -= (resistance + 0.3F) * 0.11f; strength -= (resistance + 0.3F) * 0.11f;
if ( strength > 0.01 ) if ( strength > 0.01 )
{ {
worldObj.func_147480_a( x, y, z, true ); if ( block.getMaterial() != Material.air )
// worldObj.destroyBlock( x, y, z, true ); {
if ( block.canDropFromExplosion( ex ) )
{
block.dropBlockAsItemWithChance( this.worldObj, x, y, z, this.worldObj.getBlockMetadata( x, y, z ), 1.0F / 1.0f, 0 );
}
block.onBlockExploded( this.worldObj, x, y, z, ex );
}
} }
} }
} }
} }
@ -133,16 +155,6 @@ final public class EntityTinyTNTPrimed extends EntityTNTPrimed implements IEntit
catch (IOException e1) catch (IOException e1)
{ {
} }
for (Object e : this.worldObj.getEntitiesWithinAABBExcludingEntity( this,
AxisAlignedBB.getBoundingBox( this.posX - 1.5, this.posY - 1.5f, this.posZ - 1.5, this.posX + 1.5, this.posY + 1.5, this.posZ + 1.5 ) ))
{
if ( e instanceof Entity )
{
((Entity) e).attackEntityFrom( DamageSource.setExplosionSource( null ), 6 );
}
}
} }
@Override @Override