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

Removed All Incomplete Items From Build.

Browse Source 
Fixed Security GUI leaking into other Guis.
Fixed Bug in AE Fluid Stacks.
Fixed Power Drain in Matter Cannon if there is no ammo.
Fixed Not being able to store empty storage cells in Portable Cell.
Fixed Red Background on Upgrade Slots.
This commit is contained in:
AlgorithmX2
2014-02-01 12:13:12 -06:00
parent 97eaf35f6a
commit ee99dce791
8 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
items/tools/powered/ToolMassCannon.java
+14 -12
View File
@@ -79,20 +79,21 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell
if ( cu != null )
shots += cu.getInstalledUpgrades( Upgrades.SPEED );
for (int sh = 0; sh < shots; sh++)
IMEInventory inv = AEApi.instance().registries().cell().getCellInventory( item, StorageChannel.ITEMS );
if ( inv != null )
{
extractAEPower( item, 1600 );
if ( Platform.isClient() )
return item;
IMEInventory inv = AEApi.instance().registries().cell().getCellInventory( item, StorageChannel.ITEMS );
if ( inv != null )
IItemList itemList = inv.getAvailableItems( new ItemList() );
IAEStack aeammo = itemList.getFirstItem();
if ( aeammo instanceof IAEItemStack )
{
IItemList itemList = inv.getAvailableItems( new ItemList() );
IAEStack aeammo = itemList.getFirstItem();
if ( aeammo instanceof IAEItemStack )
shots = Math.min( shots, (int) aeammo.getStackSize() );
for (int sh = 0; sh < shots; sh++)
{
extractAEPower( item, 1600 );
if ( Platform.isClient() )
return item;
aeammo.setStackSize( 1 );
ItemStack ammo = ((IAEItemStack) aeammo).getItemStack();
if ( ammo == null )
@@ -250,7 +251,8 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell
}
else
{
p.sendChatToPlayer( PlayerMessages.AmmoDepleted.get() );
if ( Platform.isServer() )
p.sendChatToPlayer( PlayerMessages.AmmoDepleted.get() );
return item;
}
}