mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-11-17 21:55:12 +00:00
Code Issues Releases Wiki Activity

Merge branch 'mc-1.16.x' into mc-1.17.x

Browse Source
This commit is contained in:
Jonathan Coates
2021-12-11 07:49:33 +00:00
parent 92fd93c0e0 92a0ef2b75
commit 6196aae488
25 changed files with 611 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/dan200/computercraft/shared/peripheral/monitor/Expander.java
View File

@@ -94,9 +94,12 @@ class Expander
if( !isPositive )
{
BlockEntity otherOrigin = level.getBlockEntity( otherMonitor.toWorldPos( 0, 0 ) );
if( otherOrigin == null || !origin.isCompatible( (TileMonitor) otherOrigin ) ) return false;
if( !(otherOrigin instanceof TileMonitor originMonitor) || !origin.isCompatible( originMonitor ) )
{
return false;
}
origin = (TileMonitor) otherOrigin;
origin = originMonitor;
}
this.width = width;