diff options
| author | HaoTNN <haotnn@gmail.com> | 2015-05-23 23:06:37 +0200 |
|---|---|---|
| committer | HaoTNN <haotnn@gmail.com> | 2015-05-23 23:06:37 +0200 |
| commit | 2578afb2449ac27defb3ac9dcc3d140e980d0d1a (patch) | |
| tree | 4f8e0f52f39c1eb3189680b0395134d4b72a2228 /src/Blocks | |
| parent | Merge remote-tracking branch 'upstream/master' (diff) | |
| parent | Merge pull request #2107 from mc-server/cow-waterspawn (diff) | |
| download | cuberite-2578afb2449ac27defb3ac9dcc3d140e980d0d1a.tar cuberite-2578afb2449ac27defb3ac9dcc3d140e980d0d1a.tar.gz cuberite-2578afb2449ac27defb3ac9dcc3d140e980d0d1a.tar.bz2 cuberite-2578afb2449ac27defb3ac9dcc3d140e980d0d1a.tar.lz cuberite-2578afb2449ac27defb3ac9dcc3d140e980d0d1a.tar.xz cuberite-2578afb2449ac27defb3ac9dcc3d140e980d0d1a.tar.zst cuberite-2578afb2449ac27defb3ac9dcc3d140e980d0d1a.zip | |
Diffstat (limited to 'src/Blocks')
| -rw-r--r-- | src/Blocks/BlockDoor.cpp | 20 | ||||
| -rw-r--r-- | src/Blocks/BlockTorch.h | 5 | ||||
| -rw-r--r-- | src/Blocks/BlockVine.h | 2 |
3 files changed, 23 insertions, 4 deletions
diff --git a/src/Blocks/BlockDoor.cpp b/src/Blocks/BlockDoor.cpp index d13c8d657..a4e375cf0 100644 --- a/src/Blocks/BlockDoor.cpp +++ b/src/Blocks/BlockDoor.cpp @@ -50,10 +50,24 @@ void cBlockDoorHandler::OnUse(cChunkInterface & a_ChunkInterface, cWorldInterfac UNUSED(a_CursorY); UNUSED(a_CursorZ); - if (a_ChunkInterface.GetBlock(a_BlockX, a_BlockY, a_BlockZ) == E_BLOCK_WOODEN_DOOR) + switch (a_ChunkInterface.GetBlock(a_BlockX, a_BlockY, a_BlockZ)) { - ChangeDoor(a_ChunkInterface, a_BlockX, a_BlockY, a_BlockZ); - a_Player->GetWorld()->BroadcastSoundParticleEffect(1003, a_BlockX, a_BlockY, a_BlockZ, 0, a_Player->GetClientHandle()); + default: + { + ASSERT(!"Unhandled door block type"); + } + case E_BLOCK_ACACIA_DOOR: + case E_BLOCK_BIRCH_DOOR: + case E_BLOCK_DARK_OAK_DOOR: + case E_BLOCK_JUNGLE_DOOR: + case E_BLOCK_SPRUCE_DOOR: + case E_BLOCK_IRON_DOOR: + case E_BLOCK_WOODEN_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; + } } } diff --git a/src/Blocks/BlockTorch.h b/src/Blocks/BlockTorch.h index d63df94cf..3abc572f3 100644 --- a/src/Blocks/BlockTorch.h +++ b/src/Blocks/BlockTorch.h @@ -103,6 +103,11 @@ public: case E_BLOCK_STAINED_GLASS: case E_BLOCK_FENCE: case E_BLOCK_NETHER_BRICK_FENCE: + case E_BLOCK_SPRUCE_FENCE: + case E_BLOCK_BIRCH_FENCE: + case E_BLOCK_JUNGLE_FENCE: + case E_BLOCK_DARK_OAK_FENCE: + case E_BLOCK_ACACIA_FENCE: case E_BLOCK_COBBLESTONE_WALL: { // Torches can only be placed on top of these blocks diff --git a/src/Blocks/BlockVine.h b/src/Blocks/BlockVine.h index 00d7a69b8..3d06a8223 100644 --- a/src/Blocks/BlockVine.h +++ b/src/Blocks/BlockVine.h @@ -177,7 +177,7 @@ public: } - virtual void OnUpdate(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cBlockPluginInterface & a_BlockPluginInterface, cChunk & a_Chunk, int a_RelX, int a_RelY, int a_RelZ) + virtual void OnUpdate(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cBlockPluginInterface & a_BlockPluginInterface, cChunk & a_Chunk, int a_RelX, int a_RelY, int a_RelZ) override { UNUSED(a_ChunkInterface); UNUSED(a_WorldInterface); |