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

Fixed exception being thrown when placing last item of a stack of parts.

Browse Source
This commit is contained in:
Gunther De Wachter
2017-06-28 06:19:17 +02:00
parent e022c23c8f
commit bce500616c
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/parts/PartPlacement.java
+5 -5
View File
@@ -78,7 +78,7 @@ public class PartPlacement
return EnumActionResult.FAIL; return EnumActionResult.FAIL;
} }
if( held != null && Platform.isWrench( player, held, pos ) && player.isSneaking() ) if( !held.isEmpty() && Platform.isWrench( player, held, pos ) && player.isSneaking() )
{ {
if( !Platform.hasPermissions( new DimensionalCoord( world, pos ), player ) ) if( !Platform.hasPermissions( new DimensionalCoord( world, pos ), player ) )
{ {
@@ -151,7 +151,7 @@ public class PartPlacement
host = (IPartHost) tile; host = (IPartHost) tile;
} }
if( held != null ) if( !held.isEmpty() )
{ {
final IFacadePart fp = isFacade( held, AEPartLocation.fromFacing( side ) ); final IFacadePart fp = isFacade( held, AEPartLocation.fromFacing( side ) );
if( fp != null ) if( fp != null )
@@ -177,7 +177,7 @@ public class PartPlacement
; ;
if( held.getCount() == 0 ) if( held.getCount() == 0 )
{ {
player.inventory.mainInventory.add( player.inventory.currentItem, null ); player.inventory.mainInventory.set(player.inventory.currentItem, ItemStack.EMPTY);
MinecraftForge.EVENT_BUS.post( new PlayerDestroyItemEvent( player, held, hand ) ); MinecraftForge.EVENT_BUS.post( new PlayerDestroyItemEvent( player, held, hand ) );
} }
} }
@@ -223,7 +223,7 @@ public class PartPlacement
} }
} }
if( held == null || !( held.getItem() instanceof IPartItem ) ) if( held.isEmpty() || !( held.getItem() instanceof IPartItem ) )
{ {
return EnumActionResult.PASS; return EnumActionResult.PASS;
} }
@@ -352,7 +352,7 @@ public class PartPlacement
; ;
if( held.getCount() == 0 ) if( held.getCount() == 0 )
{ {
player.inventory.mainInventory.add( player.inventory.currentItem, null ); player.inventory.mainInventory.set(player.inventory.currentItem, ItemStack.EMPTY);
MinecraftForge.EVENT_BUS.post( new PlayerDestroyItemEvent( player, held, hand ) ); MinecraftForge.EVENT_BUS.post( new PlayerDestroyItemEvent( player, held, hand ) );
} }
} }