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

Simplified return

Browse Source
This commit is contained in:
thatsIch
2014-11-04 15:24:03 +01:00
parent 4584b5569d
commit 8c144b22cc
1 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/core/features/AEFeatureHandler.java
+17 -7
View File
@@ -162,7 +162,7 @@ public class AEFeatureHandler implements AEItemDefinition
{ {
if ( isFeatureAvailable() ) if ( isFeatureAvailable() )
{ {
ItemStack rv = null; ItemStack rv;
if ( ItemData != null ) if ( ItemData != null )
rv = new ItemStack( ItemData ); rv = new ItemStack( ItemData );
@@ -178,17 +178,27 @@ public class AEFeatureHandler implements AEItemDefinition
@Override @Override
public boolean sameAsStack(ItemStack is) public boolean sameAsStack(ItemStack is)
{ {
if ( isFeatureAvailable() ) return isFeatureAvailable() && Platform.isSameItemType( is, stack( 1 ) );
return Platform.isSameItemType( is, stack( 1 ) );
return false;
} }
/**
* block at xyz in world is same if:
*
* - the feature is available
* - the stored block data is not null
* - and the stored block data is equal
*
* @param world world of block
* @param x x pos of block
* @param y y pos of block
* @param z z pos of block
*
* @return true if feature is available and the blocks are equal
*/
@Override @Override
public boolean sameAsBlock(IBlockAccess world, int x, int y, int z) public boolean sameAsBlock(IBlockAccess world, int x, int y, int z)
{ {
if ( isFeatureAvailable() && BlockData != null ) return isFeatureAvailable() && BlockData != null && world.getBlock( x, y, z ) == BlockData;
return world.getBlock( x, y, z ) == block();
return false;
} }
} }