summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicholas W <nicholaslwallace@gmail.com>2015-08-01 15:47:55 +0200
committerNicholas W <nicholaslwallace@gmail.com>2015-08-01 15:47:55 +0200
commitfbbf27feea1d1598b6686321aed862f0e77eb01f (patch)
tree932063290adc1347bd59c4548af8cae0a988f6cd
parentMerge pull request #2412 from cuberite/UnifyComments (diff)
downloadcuberite-fbbf27feea1d1598b6686321aed862f0e77eb01f.tar
cuberite-fbbf27feea1d1598b6686321aed862f0e77eb01f.tar.gz
cuberite-fbbf27feea1d1598b6686321aed862f0e77eb01f.tar.bz2
cuberite-fbbf27feea1d1598b6686321aed862f0e77eb01f.tar.lz
cuberite-fbbf27feea1d1598b6686321aed862f0e77eb01f.tar.xz
cuberite-fbbf27feea1d1598b6686321aed862f0e77eb01f.tar.zst
cuberite-fbbf27feea1d1598b6686321aed862f0e77eb01f.zip
-rw-r--r--src/Blocks/BlockDoor.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/Blocks/BlockDoor.cpp b/src/Blocks/BlockDoor.cpp
index 3997441ab..af50834ef 100644
--- a/src/Blocks/BlockDoor.cpp
+++ b/src/Blocks/BlockDoor.cpp
@@ -61,13 +61,18 @@ void cBlockDoorHandler::OnUse(cChunkInterface & a_ChunkInterface, cWorldInterfac
case E_BLOCK_DARK_OAK_DOOR:
case E_BLOCK_JUNGLE_DOOR:
case E_BLOCK_SPRUCE_DOOR:
- case E_BLOCK_IRON_DOOR:
case E_BLOCK_OAK_DOOR:
{
ChangeDoor(a_ChunkInterface, a_BlockX, a_BlockY, a_BlockZ);
a_Player->GetWorld()->BroadcastSoundParticleEffect(1003, a_BlockX, a_BlockY, a_BlockZ, 0, a_Player->GetClientHandle());
break;
}
+ // Prevent iron door from opening on player click
+ case E_BLOCK_IRON_DOOR:
+ {
+ OnCancelRightClick(a_ChunkInterface, a_WorldInterface, a_Player, a_BlockX, a_BlockY, a_BlockZ, a_BlockFace);
+ break;
+ }
}
}