diff options
| author | Technus <daniel112092@gmail.com> | 2016-09-22 23:07:35 +0200 |
|---|---|---|
| committer | Technus <daniel112092@gmail.com> | 2016-09-22 23:07:35 +0200 |
| commit | dbdc4f160a9eb955a101251d1b0235d63fbf951c (patch) | |
| tree | eda06d5a70b6423d3524577d3eb72ae61c89d811 /src/main/java/gregtech/api/interfaces/metatileentity | |
| parent | 6217c0a8f4526b92204d047db65b001862880dd7 (diff) | |
| parent | 41a91acd57f86d8e351dd6adb223d07498b11663 (diff) | |
| download | GT5-Unofficial-dbdc4f160a9eb955a101251d1b0235d63fbf951c.tar.gz GT5-Unofficial-dbdc4f160a9eb955a101251d1b0235d63fbf951c.tar.bz2 GT5-Unofficial-dbdc4f160a9eb955a101251d1b0235d63fbf951c.zip | |
Merge branch 'Loading-Times' into experimental
Diffstat (limited to 'src/main/java/gregtech/api/interfaces/metatileentity')
| -rw-r--r-- | src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntityItemPipe.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntityItemPipe.java b/src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntityItemPipe.java index 510f314d8c..54f1f484b7 100644 --- a/src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntityItemPipe.java +++ b/src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntityItemPipe.java @@ -65,9 +65,9 @@ public interface IMetaTileEntityItemPipe extends IMetaTileEntity { continue; } } - if (tItemPipe != null && tItemPipe instanceof BaseMetaPipeEntity) { + if (tItemPipe instanceof BaseMetaPipeEntity) { IMetaTileEntity tMetaTileEntity = tItemPipe.getMetaTileEntity(); - if (tMetaTileEntity != null && tMetaTileEntity instanceof IMetaTileEntityItemPipe && tItemPipe.getCoverBehaviorAtSide(j).letsItemsOut(j, tItemPipe.getCoverIDAtSide(j), tItemPipe.getCoverDataAtSide(j), -2, tItemPipe)) { + if (tMetaTileEntity instanceof IMetaTileEntityItemPipe && tItemPipe.getCoverBehaviorAtSide(j).letsItemsOut(j, tItemPipe.getCoverIDAtSide(j), tItemPipe.getCoverDataAtSide(j), -2, tItemPipe)) { scanPipes((IMetaTileEntityItemPipe) tMetaTileEntity, aMap, aStep, aSuckItems, aIgnoreCapacity); } } @@ -84,7 +84,7 @@ public interface IMetaTileEntityItemPipe extends IMetaTileEntity { } if (tItemPipe instanceof BaseMetaPipeEntity) { IMetaTileEntity tMetaTileEntity = tItemPipe.getMetaTileEntity(); - if (tMetaTileEntity != null && tMetaTileEntity instanceof IMetaTileEntityItemPipe && tItemPipe.getCoverBehaviorAtSide(j).letsItemsIn(j, tItemPipe.getCoverIDAtSide(j), tItemPipe.getCoverDataAtSide(j), -2, tItemPipe)) { + if (tMetaTileEntity instanceof IMetaTileEntityItemPipe && tItemPipe.getCoverBehaviorAtSide(j).letsItemsIn(j, tItemPipe.getCoverIDAtSide(j), tItemPipe.getCoverDataAtSide(j), -2, tItemPipe)) { scanPipes((IMetaTileEntityItemPipe) tMetaTileEntity, aMap, aStep, aSuckItems, aIgnoreCapacity); } } |