diff options
| author | madmaxoft <github@xoft.cz> | 2014-09-17 23:32:14 +0200 |
|---|---|---|
| committer | madmaxoft <github@xoft.cz> | 2014-09-17 23:32:14 +0200 |
| commit | 95af3eb526dc8d3289d6b1ced6462283a6ebb6b3 (patch) | |
| tree | 2e6ef1053c1ec5c9e70bc594002db1eba491f267 /src | |
| parent | Voronoi biomegen: Added JitterSize and OddRowOffset. (diff) | |
| download | cuberite-95af3eb526dc8d3289d6b1ced6462283a6ebb6b3.tar cuberite-95af3eb526dc8d3289d6b1ced6462283a6ebb6b3.tar.gz cuberite-95af3eb526dc8d3289d6b1ced6462283a6ebb6b3.tar.bz2 cuberite-95af3eb526dc8d3289d6b1ced6462283a6ebb6b3.tar.lz cuberite-95af3eb526dc8d3289d6b1ced6462283a6ebb6b3.tar.xz cuberite-95af3eb526dc8d3289d6b1ced6462283a6ebb6b3.tar.zst cuberite-95af3eb526dc8d3289d6b1ced6462283a6ebb6b3.zip | |
Diffstat (limited to 'src')
| -rw-r--r-- | src/Blocks/BlockHandler.cpp | 2 | ||||
| -rw-r--r-- | src/Entities/Player.cpp | 4 | ||||
| -rw-r--r-- | src/Root.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/Blocks/BlockHandler.cpp b/src/Blocks/BlockHandler.cpp index cee2f4b99..30b303cfd 100644 --- a/src/Blocks/BlockHandler.cpp +++ b/src/Blocks/BlockHandler.cpp @@ -427,7 +427,7 @@ void cBlockHandler::DropBlock(cChunkInterface & a_ChunkInterface, cWorldInterfac if (a_CanDrop) { if ((a_Digger != NULL) && (a_Digger->GetEquippedWeapon().m_Enchantments.GetLevel(cEnchantments::enchSilkTouch) > 0)) - { + { switch (m_BlockType) { case E_BLOCK_CAKE: diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp index 3920bdb56..38d42be14 100644 --- a/src/Entities/Player.cpp +++ b/src/Entities/Player.cpp @@ -451,7 +451,7 @@ void cPlayer::CancelChargingBow(void) void cPlayer::SetTouchGround(bool a_bTouchGround) { - if (IsGameModeSpectator()) // You can fly through the ground in Spectator + if (IsGameModeSpectator()) // You can fly through the ground in Spectator { return; } @@ -1514,7 +1514,7 @@ void cPlayer::TossPickup(const cItem & a_Item) void cPlayer::TossItems(const cItems & a_Items) { - if (IsGameModeSpectator()) // Players can't toss items in spectator + if (IsGameModeSpectator()) // Players can't toss items in spectator { return; } diff --git a/src/Root.cpp b/src/Root.cpp index 86a497a76..966a9b4ba 100644 --- a/src/Root.cpp +++ b/src/Root.cpp @@ -113,8 +113,8 @@ void cRoot::Start(void) LOG("--- Started Log ---\n"); #ifdef BUILD_ID - LOG("MCServer " BUILD_SERIES_NAME " build id: " BUILD_ID ); - LOG("from commit id: " BUILD_COMMIT_ID " built at: " BUILD_DATETIME ); + LOG("MCServer " BUILD_SERIES_NAME " build id: " BUILD_ID); + LOG("from commit id: " BUILD_COMMIT_ID " built at: " BUILD_DATETIME); #endif cDeadlockDetect dd; |