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

Even more null fixes.

Browse Source
This commit is contained in:
Gunther De Wachter
2017-07-02 06:43:33 +02:00
parent 0a2f90d115
commit ee774cd3f8
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java
+5 -5
View File
@@ -74,7 +74,7 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT
final List<ItemStack> snowBalls = new ArrayList<ItemStack>(); final List<ItemStack> snowBalls = new ArrayList<ItemStack>();
snowBalls.add( new ItemStack( Items.SNOWBALL ) ); snowBalls.add( new ItemStack( Items.SNOWBALL ) );
this.coolDown.put( new InWorldToolOperationIngredient( Blocks.FLOWING_WATER, true ), new InWorldToolOperationResult( null, snowBalls ) ); this.coolDown.put( new InWorldToolOperationIngredient( Blocks.FLOWING_WATER, true ), new InWorldToolOperationResult( ItemStack.EMPTY, snowBalls ) );
this.coolDown.put( new InWorldToolOperationIngredient( Blocks.WATER, true ), new InWorldToolOperationResult( new ItemStack( Blocks.ICE ) ) ); this.coolDown.put( new InWorldToolOperationIngredient( Blocks.WATER, true ), new InWorldToolOperationResult( new ItemStack( Blocks.ICE ) ) );
this.heatUp.put( new InWorldToolOperationIngredient( Blocks.ICE.getDefaultState() ), new InWorldToolOperationResult( new ItemStack( Blocks.WATER ) ) ); this.heatUp.put( new InWorldToolOperationIngredient( Blocks.ICE.getDefaultState() ), new InWorldToolOperationResult( new ItemStack( Blocks.WATER ) ) );
@@ -131,7 +131,7 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT
r = this.heatUp.get( new InWorldToolOperationIngredient( state.getBlock(), true ) ); r = this.heatUp.get( new InWorldToolOperationIngredient( state.getBlock(), true ) );
} }
if( r.getBlockItem() != null ) if( !r.getBlockItem().isEmpty() )
{ {
final Block blk = Block.getBlockFromItem( r.getBlockItem().getItem() ); final Block blk = Block.getBlockFromItem( r.getBlockItem().getItem() );
w.setBlockState( pos, blk.getStateFromMeta( r.getBlockItem().getItemDamage() ), 3 ); w.setBlockState( pos, blk.getStateFromMeta( r.getBlockItem().getItemDamage() ), 3 );
@@ -168,7 +168,7 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT
r = this.coolDown.get( new InWorldToolOperationIngredient( state.getBlock(), true ) ); r = this.coolDown.get( new InWorldToolOperationIngredient( state.getBlock(), true ) );
} }
if( r.getBlockItem() != null ) if( !r.getBlockItem().isEmpty() )
{ {
final Block blk = Block.getBlockFromItem( r.getBlockItem().getItem() ); final Block blk = Block.getBlockFromItem( r.getBlockItem().getItem() );
w.setBlockState( pos, blk.getStateFromMeta( r.getBlockItem().getItemDamage() ), 3 ); w.setBlockState( pos, blk.getStateFromMeta( r.getBlockItem().getItemDamage() ), 3 );
@@ -178,7 +178,7 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT
w.setBlockToAir( pos ); w.setBlockToAir( pos );
} }
if( r.getDrops() != null ) if( !r.getDrops().isEmpty() )
{ {
Platform.spawnDrops( w, pos, r.getDrops() ); Platform.spawnDrops( w, pos, r.getDrops() );
} }
@@ -320,7 +320,7 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT
final InWorldToolOperationResult or = InWorldToolOperationResult.getBlockOperationResult( out.toArray( new ItemStack[out.size()] ) ); final InWorldToolOperationResult or = InWorldToolOperationResult.getBlockOperationResult( out.toArray( new ItemStack[out.size()] ) );
w.playSound( p, pos.getX() + 0.5D, pos.getY() + 0.5D, pos.getZ() + 0.5D, SoundEvents.ITEM_FLINTANDSTEEL_USE, SoundCategory.PLAYERS, 1.0F, itemRand.nextFloat() * 0.4F + 0.8F ); w.playSound( p, pos.getX() + 0.5D, pos.getY() + 0.5D, pos.getZ() + 0.5D, SoundEvents.ITEM_FLINTANDSTEEL_USE, SoundCategory.PLAYERS, 1.0F, itemRand.nextFloat() * 0.4F + 0.8F );
if( or.getBlockItem() == null ) if( or.getBlockItem().isEmpty() )
{ {
w.setBlockState( pos, Platform.AIR_BLOCK.getDefaultState(), 3 ); w.setBlockState( pos, Platform.AIR_BLOCK.getDefaultState(), 3 );
} }
src/main/java/appeng/util/InWorldToolOperationResult.java
+1 -1
View File
@@ -35,7 +35,7 @@ public class InWorldToolOperationResult
public InWorldToolOperationResult() public InWorldToolOperationResult()
{ {
this.BlockItem = null; this.BlockItem = ItemStack.EMPTY;
this.Drops = null; this.Drops = null;
} }