fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix dupe bug with shulker box (#3633)

Browse Source 
Fixes #3632
This commit is contained in:
fscan
2018-08-01 00:13:58 +02:00
committed by GitHub
parent 67584083c6
commit 9e252df8d9
1 changed files with 4 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/parts/automation/PartAnnihilationPlane.java
+4 -39
View File
@@ -376,34 +376,6 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab
return changed; return changed;
} }
/**
* Spawns an overflow item as new {@link EntityItem} into the {@link World}
*
* @param overflow the item to spawn
*/
private void spawnOverflow( final IAEItemStack overflow )
{
if( overflow == null )
{
return;
}
final TileEntity te = this.getTile();
final WorldServer w = (WorldServer) te.getWorld();
final BlockPos offset = te.getPos().offset( this.getSide().getFacing() );
final BlockPos add = offset.add( .5, .5, .5 );
final double x = add.getX();
final double y = add.getY();
final double z = add.getZ();
final EntityItem overflowEntity = new EntityItem( w, x, y, z, overflow.createItemStack() );
overflowEntity.motionX = 0;
overflowEntity.motionY = 0;
overflowEntity.motionZ = 0;
w.spawnEntity( overflowEntity );
}
protected boolean isAnnihilationPlane( final TileEntity blockTileEntity, final AEPartLocation side ) protected boolean isAnnihilationPlane( final TileEntity blockTileEntity, final AEPartLocation side )
{ {
if( blockTileEntity instanceof IPartHost ) if( blockTileEntity instanceof IPartHost )
@@ -455,7 +427,7 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab
if( modulate ) if( modulate )
{ {
energy.extractAEPower( requiredPower, Actionable.MODULATE, PowerMultiplier.CONFIG ); energy.extractAEPower( requiredPower, Actionable.MODULATE, PowerMultiplier.CONFIG );
this.breakBlockAndStoreItems( w, pos, items ); this.breakBlockAndStoreItems( w, pos );
AppEng.proxy.sendToAllNearExcept( null, pos.getX(), pos.getY(), pos.getZ(), 64, w, AppEng.proxy.sendToAllNearExcept( null, pos.getX(), pos.getY(), pos.getZ(), 64, w,
new PacketTransitionEffect( pos.getX(), pos.getY(), pos.getZ(), this.getSide(), true ) ); new PacketTransitionEffect( pos.getX(), pos.getY(), pos.getZ(), this.getSide(), true ) );
} }
@@ -573,12 +545,11 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab
return canStore; return canStore;
} }
private void breakBlockAndStoreItems( final WorldServer w, final BlockPos pos, final List<ItemStack> items ) private void breakBlockAndStoreItems( final WorldServer w, final BlockPos pos )
{ {
w.setBlockToAir( pos ); w.destroyBlock( pos, true );
final AxisAlignedBB box = new AxisAlignedBB( pos.getX() - 0.2, pos.getY() - 0.2, pos.getZ() - 0.2, pos.getX() + 1.2, pos.getY() + 1.2, pos final AxisAlignedBB box = new AxisAlignedBB( pos ).grow( 0.2 );
.getZ() + 1.2 );
for( final Object ei : w.getEntitiesWithinAABB( EntityItem.class, box ) ) for( final Object ei : w.getEntitiesWithinAABB( EntityItem.class, box ) )
{ {
if( ei instanceof EntityItem ) if( ei instanceof EntityItem )
@@ -587,12 +558,6 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab
this.storeEntityItem( entityItem ); this.storeEntityItem( entityItem );
} }
} }
for( final ItemStack snaggedItem : items )
{
final IAEItemStack overflow = this.storeItemStack( snaggedItem );
this.spawnOverflow( overflow );
}
} }
private void refresh() private void refresh()