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

Interface names work on the server again. Derp

Browse source
This commit is contained in:
AlgorithmX2 2014-08-08 20:21:31 -05:00
parent 5a14cf563c
commit 79d684bc92
1 changed files with 22 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
helpers/DualityInterface.java
View file

@ -1043,10 +1043,6 @@ public class DualityInterface implements IGridTickable, ISegmentedInventory, ISt
ItemStack what = new ItemStack( item, 1, blk.getDamageValue( w, tile.xCoord + s.offsetX, tile.yCoord + s.offsetY, tile.zCoord + s.offsetZ ) ); ItemStack what = new ItemStack( item, 1, blk.getDamageValue( w, tile.xCoord + s.offsetX, tile.yCoord + s.offsetY, tile.zCoord + s.offsetZ ) );
try
{
if ( mop != null && !badBlocks.contains( blk ) )
{
if ( te instanceof ICraftingMachine || InventoryAdaptor.getAdaptor( te, s.getOpposite() ) != null ) if ( te instanceof ICraftingMachine || InventoryAdaptor.getAdaptor( te, s.getOpposite() ) != null )
{ {
if ( te instanceof IInventory && ((IInventory) te).getSizeInventory() == 0 ) if ( te instanceof IInventory && ((IInventory) te).getSizeInventory() == 0 )
@ -1060,22 +1056,27 @@ public class DualityInterface implements IGridTickable, ISegmentedInventory, ISt
continue; continue;
} }
try
{
if ( mop != null && !badBlocks.contains( blk ) )
{
if ( mop.blockX == te.xCoord && mop.blockY == te.yCoord && mop.blockZ == te.zCoord ) if ( mop.blockX == te.xCoord && mop.blockY == te.yCoord && mop.blockZ == te.zCoord )
{ {
ItemStack g = blk.getPickBlock( mop, w, te.xCoord, te.yCoord, te.zCoord ); ItemStack g = blk.getPickBlock( mop, w, te.xCoord, te.yCoord, te.zCoord );
if ( g != null ) if ( g != null )
what = g; what = g;
} }
if ( what.getItem() != null )
return what.getUnlocalizedName();
}
} }
} }
catch (Throwable t) catch (Throwable t)
{ {
badBlocks.add( blk ); // nope! badBlocks.add( blk ); // nope!
} }
if ( what.getItem() != null )
return what.getUnlocalizedName();
}
} }
return "Nothing"; return "Nothing";