From d342a1f368d3c55c5e606a0e1d6abaf3c535b6be Mon Sep 17 00:00:00 2001 From: SquidDev Date: Tue, 1 Oct 2019 20:06:38 +0100 Subject: [PATCH] Prevent wired modems dropping on block change Fixes #303 --- .../shared/peripheral/modem/wired/BlockCable.java | 2 +- .../computercraft/shared/peripheral/modem/wired/TileCable.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/BlockCable.java b/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/BlockCable.java index 7b3d2b7cc..bf4deb175 100644 --- a/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/BlockCable.java +++ b/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/BlockCable.java @@ -210,7 +210,7 @@ public boolean isValidPosition( BlockState state, IWorldReader world, BlockPos p BlockPos offsetPos = pos.offset( facing ); BlockState offsetState = world.getBlockState( offsetPos ); - return Block.hasSolidSide( offsetState, world, offsetPos, facing.getOpposite() ); + return hasSolidSide( offsetState, world, offsetPos, facing.getOpposite() ); } @Nullable diff --git a/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/TileCable.java b/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/TileCable.java index 9d69e2c72..d635bda98 100644 --- a/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/TileCable.java +++ b/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/TileCable.java @@ -201,8 +201,7 @@ private Direction getDirection() public void onNeighbourChange( @Nonnull BlockPos neighbour ) { Direction dir = getDirection(); - if( neighbour.equals( getPos().offset( dir ) ) && hasModem() - && getBlockState().isValidPosition( world, pos ) ) + if( neighbour.equals( getPos().offset( dir ) ) && hasModem() && !getBlockState().isValidPosition( getWorld(), getPos() ) ) { if( hasCable() ) {