diff options
| author | Julian Laubstein <julianlaubstein@yahoo.de> | 2015-08-14 22:19:15 +0200 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2015-08-18 08:49:00 +0200 |
| commit | dd5201c29e4a9a889a70c81fa7a82bf0c8615d65 (patch) | |
| tree | b14ae581e0680c303466781cc356c2399a6c7990 /src/Blocks | |
| parent | Merge pull request #2436 from cuberite/UpdateCompileScript (diff) | |
| download | cuberite-dd5201c29e4a9a889a70c81fa7a82bf0c8615d65.tar cuberite-dd5201c29e4a9a889a70c81fa7a82bf0c8615d65.tar.gz cuberite-dd5201c29e4a9a889a70c81fa7a82bf0c8615d65.tar.bz2 cuberite-dd5201c29e4a9a889a70c81fa7a82bf0c8615d65.tar.lz cuberite-dd5201c29e4a9a889a70c81fa7a82bf0c8615d65.tar.xz cuberite-dd5201c29e4a9a889a70c81fa7a82bf0c8615d65.tar.zst cuberite-dd5201c29e4a9a889a70c81fa7a82bf0c8615d65.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/Blocks/BlockFarmland.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Blocks/BlockFarmland.h b/src/Blocks/BlockFarmland.h index 8d43632ff..886823ed6 100644 --- a/src/Blocks/BlockFarmland.h +++ b/src/Blocks/BlockFarmland.h @@ -45,7 +45,7 @@ public: } // Farmland too dry. If nothing is growing on top, turn back to dirt: - BLOCKTYPE UpperBlock = (a_RelY >= cChunkDef::Height - 1) ? E_BLOCK_AIR : a_Chunk.GetBlock(a_RelX, a_RelY + 1, a_RelZ); + BLOCKTYPE UpperBlock = (a_RelY >= cChunkDef::Height - 1) ? static_cast<BLOCKTYPE>(E_BLOCK_AIR) : a_Chunk.GetBlock(a_RelX, a_RelY + 1, a_RelZ); switch (UpperBlock) { case E_BLOCK_CROPS: |