summaryrefslogtreecommitdiffstats
path: root/src/ClientHandle.cpp
diff options
context:
space:
mode:
authorGargaj <gargaj@conspiracy.hu>2015-12-01 23:12:44 +0100
committerGargaj <gargaj@conspiracy.hu>2015-12-13 13:27:38 +0100
commitf9008a4860dc9af9ca2e2ceb643064745269dcec (patch)
treecf8f3e6ed33c7dc5e98baa6a530683749ae40e51 /src/ClientHandle.cpp
parentMerge pull request #2737 from Gargaj/snowgolem (diff)
downloadcuberite-f9008a4860dc9af9ca2e2ceb643064745269dcec.tar
cuberite-f9008a4860dc9af9ca2e2ceb643064745269dcec.tar.gz
cuberite-f9008a4860dc9af9ca2e2ceb643064745269dcec.tar.bz2
cuberite-f9008a4860dc9af9ca2e2ceb643064745269dcec.tar.lz
cuberite-f9008a4860dc9af9ca2e2ceb643064745269dcec.tar.xz
cuberite-f9008a4860dc9af9ca2e2ceb643064745269dcec.tar.zst
cuberite-f9008a4860dc9af9ca2e2ceb643064745269dcec.zip
Diffstat (limited to '')
-rw-r--r--src/ClientHandle.cpp15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/ClientHandle.cpp b/src/ClientHandle.cpp
index 28fc6756b..9062d8cab 100644
--- a/src/ClientHandle.cpp
+++ b/src/ClientHandle.cpp
@@ -1383,15 +1383,16 @@ void cClientHandle::HandleRightClick(int a_BlockX, int a_BlockY, int a_BlockZ, e
if (BlockHandler->IsUseable() && !m_Player->IsCrouched())
{
- if (PlgMgr->CallHookPlayerUsingBlock(*m_Player, a_BlockX, a_BlockY, a_BlockZ, a_BlockFace, a_CursorX, a_CursorY, a_CursorZ, BlockType, BlockMeta))
+ if (!PlgMgr->CallHookPlayerUsingBlock(*m_Player, a_BlockX, a_BlockY, a_BlockZ, a_BlockFace, a_CursorX, a_CursorY, a_CursorZ, BlockType, BlockMeta))
{
- // A plugin doesn't agree with using the block, abort
- return;
+ cChunkInterface ChunkInterface(World->GetChunkMap());
+ if (BlockHandler->OnUse(ChunkInterface, *World, m_Player, a_BlockX, a_BlockY, a_BlockZ, a_BlockFace, a_CursorX, a_CursorY, a_CursorZ))
+ {
+ // block use was successful, we're done
+ PlgMgr->CallHookPlayerUsedBlock(*m_Player, a_BlockX, a_BlockY, a_BlockZ, a_BlockFace, a_CursorX, a_CursorY, a_CursorZ, BlockType, BlockMeta);
+ return;
+ }
}
- cChunkInterface ChunkInterface(World->GetChunkMap());
- BlockHandler->OnUse(ChunkInterface, *World, m_Player, a_BlockX, a_BlockY, a_BlockZ, a_BlockFace, a_CursorX, a_CursorY, a_CursorZ);
- PlgMgr->CallHookPlayerUsedBlock(*m_Player, a_BlockX, a_BlockY, a_BlockZ, a_BlockFace, a_CursorX, a_CursorY, a_CursorZ, BlockType, BlockMeta);
- return;
}
}