From d81eb1fe2d7cb6543d6a8d081654a917c519bd66 Mon Sep 17 00:00:00 2001 From: thatsIch Date: Thu, 26 Mar 2015 11:22:31 +0100 Subject: [PATCH] Unnecessary null check before instanceof --- src/main/java/appeng/parts/AEBasePart.java | 4 ++-- src/main/java/appeng/parts/CableBusContainer.java | 4 ++-- src/main/java/appeng/parts/networking/PartCable.java | 2 +- src/main/java/appeng/tile/AEBaseTile.java | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/appeng/parts/AEBasePart.java b/src/main/java/appeng/parts/AEBasePart.java index af849f569..95105ed2f 100644 --- a/src/main/java/appeng/parts/AEBasePart.java +++ b/src/main/java/appeng/parts/AEBasePart.java @@ -331,7 +331,7 @@ public class AEBasePart implements IPart, IGridProxyable, IActionHost, IUpgradea } IInventory inv = this.getInventoryByName( "config" ); - if ( inv != null && inv instanceof AppEngInternalAEInventory ) + if ( inv instanceof AppEngInternalAEInventory ) { AppEngInternalAEInventory target = (AppEngInternalAEInventory) inv; AppEngInternalAEInventory tmp = new AppEngInternalAEInventory( null, target.getSizeInventory() ); @@ -362,7 +362,7 @@ public class AEBasePart implements IPart, IGridProxyable, IActionHost, IUpgradea } IInventory inv = this.getInventoryByName( "config" ); - if ( inv != null && inv instanceof AppEngInternalAEInventory ) + if ( inv instanceof AppEngInternalAEInventory ) { ((AppEngInternalAEInventory) inv).writeToNBT( output, "config" ); } diff --git a/src/main/java/appeng/parts/CableBusContainer.java b/src/main/java/appeng/parts/CableBusContainer.java index 55e87a8bb..386288568 100644 --- a/src/main/java/appeng/parts/CableBusContainer.java +++ b/src/main/java/appeng/parts/CableBusContainer.java @@ -796,7 +796,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I public AECableType getCableConnectionType(ForgeDirection dir) { IPart part = this.getPart( dir ); - if ( part != null && part instanceof IGridHost ) + if ( part instanceof IGridHost ) { AECableType t = ((IGridHost) part).getCableConnectionType( dir ); if ( t != null && t != AECableType.NONE ) @@ -1009,7 +1009,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I for (ForgeDirection d : ForgeDirection.values()) { IPart p = this.getPart( d ); - if ( p != null && p instanceof IGridHost ) + if ( p instanceof IGridHost ) ((IGridHost) p).securityBreak(); } } diff --git a/src/main/java/appeng/parts/networking/PartCable.java b/src/main/java/appeng/parts/networking/PartCable.java index 6843db67d..d7cb1bec7 100644 --- a/src/main/java/appeng/parts/networking/PartCable.java +++ b/src/main/java/appeng/parts/networking/PartCable.java @@ -880,7 +880,7 @@ public class PartCable extends AEBasePart implements IPartCable for ( ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS ) { IPart p = this.getHost().getPart( dir ); - if ( p != null && p instanceof IGridHost ) + if ( p instanceof IGridHost ) { IGridHost igh = ( IGridHost ) p; AECableType type = igh.getCableConnectionType( dir.getOpposite() ); diff --git a/src/main/java/appeng/tile/AEBaseTile.java b/src/main/java/appeng/tile/AEBaseTile.java index d22385134..c9b33f320 100644 --- a/src/main/java/appeng/tile/AEBaseTile.java +++ b/src/main/java/appeng/tile/AEBaseTile.java @@ -433,7 +433,7 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile, if ( this instanceof ISegmentedInventory ) { IInventory inv = ((ISegmentedInventory) this).getInventoryByName( "config" ); - if ( inv != null && inv instanceof AppEngInternalAEInventory ) + if ( inv instanceof AppEngInternalAEInventory ) { AppEngInternalAEInventory target = (AppEngInternalAEInventory) inv; AppEngInternalAEInventory tmp = new AppEngInternalAEInventory( null, target.getSizeInventory() ); @@ -477,7 +477,7 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile, if ( this instanceof ISegmentedInventory ) { IInventory inv = ((ISegmentedInventory) this).getInventoryByName( "config" ); - if ( inv != null && inv instanceof AppEngInternalAEInventory ) + if ( inv instanceof AppEngInternalAEInventory ) { ((AppEngInternalAEInventory) inv).writeToNBT( output, "config" ); }