summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorworktycho <work.tycho@gmail.com>2015-05-21 08:50:30 +0200
committerworktycho <work.tycho@gmail.com>2015-05-21 08:50:30 +0200
commitc0d7b4d56988603bafccf63df065d0cd8b336afa (patch)
tree2932be33d80782c9f570e7d7b7987bd7eb6cc65f
parentMerge pull request #2084 from mc-server/patch-2050 (diff)
parentAdded beeduck to contributors (diff)
downloadcuberite-c0d7b4d56988603bafccf63df065d0cd8b336afa.tar
cuberite-c0d7b4d56988603bafccf63df065d0cd8b336afa.tar.gz
cuberite-c0d7b4d56988603bafccf63df065d0cd8b336afa.tar.bz2
cuberite-c0d7b4d56988603bafccf63df065d0cd8b336afa.tar.lz
cuberite-c0d7b4d56988603bafccf63df065d0cd8b336afa.tar.xz
cuberite-c0d7b4d56988603bafccf63df065d0cd8b336afa.tar.zst
cuberite-c0d7b4d56988603bafccf63df065d0cd8b336afa.zip
Diffstat (limited to '')
-rw-r--r--CONTRIBUTORS1
-rw-r--r--src/Blocks/BlockDoor.cpp20
-rw-r--r--src/World.cpp1
3 files changed, 19 insertions, 3 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 21654428f..9cc7f19fc 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -2,6 +2,7 @@ Many people have contributed to MCServer, and this list attempts to broadcast at
BasedDoge (Donated AlchemistVillage prefabs)
bearbin (Alexander Harkness)
+beeduck
derouinw
Diusrex
Duralex
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/World.cpp b/src/World.cpp
index e93d6bb26..7f0e3070a 100644
--- a/src/World.cpp
+++ b/src/World.cpp
@@ -362,6 +362,7 @@ cWorld::~cWorld()
void cWorld::CastThunderbolt (int a_BlockX, int a_BlockY, int a_BlockZ)
{
BroadcastThunderbolt(a_BlockX, a_BlockY, a_BlockZ);
+ BroadcastSoundEffect("ambient.weather.thunder", a_BlockX, a_BlockY, a_BlockZ, 50, 1);
}