mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-10-30 21:23:00 +00:00
Code Issues Releases Wiki Activity

Merge pull request #400 from SquidDev-CC/hotfix/redstone-propagation

Browse Source 
Fix redstone not being propagated through solid blocks
This commit is contained in:
Daniel Ratcliffe
2017-09-10 18:05:51 +01:00
committed by GitHub
parent 88b1124204 a2da6d9601
commit bde9ac9747
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/dan200/computercraft/shared/computer/blocks/TileComputerBase.java
View File

@@ -76,7 +76,7 @@ public abstract class TileComputerBase extends TileGeneric
unload(); unload();
for( EnumFacing dir : EnumFacing.VALUES ) for( EnumFacing dir : EnumFacing.VALUES )
{ {
RedstoneUtil.propogateRedstoneOutput( getWorld(), getPos(), dir ); RedstoneUtil.propagateRedstoneOutput( getWorld(), getPos(), dir );
} }
} }
@@ -380,7 +380,7 @@ public abstract class TileComputerBase extends TileGeneric
updateBlock(); updateBlock();
for( EnumFacing dir : EnumFacing.VALUES ) for( EnumFacing dir : EnumFacing.VALUES )
{ {
RedstoneUtil.propogateRedstoneOutput( getWorld(), getPos(), dir ); RedstoneUtil.propagateRedstoneOutput( getWorld(), getPos(), dir );
} }
} }

2
src/main/java/dan200/computercraft/shared/turtle/blocks/TileTurtle.java
View File

@@ -141,7 +141,7 @@ public class TileTurtle extends TileComputerBase
// Just turn off any redstone we had on // Just turn off any redstone we had on
for( EnumFacing dir : EnumFacing.VALUES ) for( EnumFacing dir : EnumFacing.VALUES )
{ {
RedstoneUtil.propogateRedstoneOutput( getWorld(), getPos(), dir ); RedstoneUtil.propagateRedstoneOutput( getWorld(), getPos(), dir );
} }
} }
} }

6
src/main/java/dan200/computercraft/shared/util/RedstoneUtil.java
View File

@@ -68,9 +68,9 @@ public class RedstoneUtil
return 0; return 0;
} }
public static void propogateRedstoneOutput( World world, BlockPos pos, EnumFacing side ) public static void propagateRedstoneOutput( World world, BlockPos pos, EnumFacing side )
{ {
// Propogate ordinary output // Propagate ordinary output
IBlockState block = world.getBlockState( pos ); IBlockState block = world.getBlockState( pos );
BlockPos neighbourPos = pos.offset( side ); BlockPos neighbourPos = pos.offset( side );
IBlockState neighbour = world.getBlockState( neighbourPos ); IBlockState neighbour = world.getBlockState( neighbourPos );
@@ -79,7 +79,7 @@ public class RedstoneUtil
world.neighborChanged( neighbourPos, block.getBlock(), pos ); world.neighborChanged( neighbourPos, block.getBlock(), pos );
if( neighbour.getBlock().isNormalCube( neighbour, world, neighbourPos ) ) if( neighbour.getBlock().isNormalCube( neighbour, world, neighbourPos ) )
{ {
world.notifyNeighborsOfStateExcept( neighbourPos, neighbour.getBlock(), side.getOpposite() ); world.notifyNeighborsOfStateExcept( neighbourPos, block.getBlock(), side.getOpposite() );
} }
} }
} }