Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
This commit is contained in:
commit
5f21711204
1 changed files with 1 additions and 1 deletions
|
@ -54,7 +54,7 @@ public class BlockCableBus extends AEBaseBlock
|
|||
if ( noTesrTile.isInstance( te ) )
|
||||
return (T) te;
|
||||
|
||||
if ( tesrTile.isInstance( te ) )
|
||||
if ( tesrTile != null && tesrTile.isInstance( te ) )
|
||||
return (T) te;
|
||||
|
||||
return null;
|
||||
|
|
Loading…
Reference in a new issue