mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-08-08 06:43:51 +00:00
Code Issues Releases Wiki Activity

Merge pull request #562 from SquidDev-CC/ComputerCraft/hotfix/turtle-sign-place

Browse Source 
Be a little smarter about our detection of the placed sign
This commit is contained in:
SquidDev 2018-07-09 20:57:42 +01:00
commit 17dace979a
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/dan200/computercraft/shared/turtle/core/TurtlePlaceCommand.java
View File

@ -382,7 +382,7 @@ public class TurtlePlaceCommand implements ITurtleCommand
// Do the deploying (put everything in the players inventory) // Do the deploying (put everything in the players inventory)
boolean placed = false; boolean placed = false;
TileEntity existingTile = turtle.getWorld().getTileEntity( position );
// See PlayerInteractionManager.processRightClickBlock // See PlayerInteractionManager.processRightClickBlock
PlayerInteractEvent.RightClickBlock event = ForgeHooks.onRightClickBlock( turtlePlayer, EnumHand.MAIN_HAND, position, side, new Vec3d( hitX, hitY, hitZ ) ); PlayerInteractEvent.RightClickBlock event = ForgeHooks.onRightClickBlock( turtlePlayer, EnumHand.MAIN_HAND, position, side, new Vec3d( hitX, hitY, hitZ ) );
@ -426,12 +426,11 @@ public class TurtlePlaceCommand implements ITurtleCommand
{ {
World world = turtle.getWorld(); World world = turtle.getWorld();
TileEntity tile = world.getTileEntity( position ); TileEntity tile = world.getTileEntity( position );
if( tile == null ) if( tile == null || tile == existingTile )
{ {
BlockPos newPosition = WorldUtil.moveCoords( position, side ); tile = world.getTileEntity( WorldUtil.moveCoords( position, side ) );
tile = world.getTileEntity( newPosition );
} }
if( tile != null && tile instanceof TileEntitySign ) if( tile instanceof TileEntitySign )
{ {
TileEntitySign signTile = (TileEntitySign) tile; TileEntitySign signTile = (TileEntitySign) tile;
String s = (String)extraArguments[0]; String s = (String)extraArguments[0];