diff options
| author | peterbell10 <peterbell10@live.co.uk> | 2017-09-14 10:48:57 +0200 |
|---|---|---|
| committer | Alexander Harkness <me@bearbin.net> | 2017-09-14 10:48:57 +0200 |
| commit | 307e7aaff5c454b703db4d536c40d5715d96032b (patch) | |
| tree | e217d6a073e6b87aaeb6618a933676d3251b9355 /src/Items | |
| parent | Updated compile.sh script (#4009) (diff) | |
| download | cuberite-307e7aaff5c454b703db4d536c40d5715d96032b.tar cuberite-307e7aaff5c454b703db4d536c40d5715d96032b.tar.gz cuberite-307e7aaff5c454b703db4d536c40d5715d96032b.tar.bz2 cuberite-307e7aaff5c454b703db4d536c40d5715d96032b.tar.lz cuberite-307e7aaff5c454b703db4d536c40d5715d96032b.tar.xz cuberite-307e7aaff5c454b703db4d536c40d5715d96032b.tar.zst cuberite-307e7aaff5c454b703db4d536c40d5715d96032b.zip | |
Diffstat (limited to 'src/Items')
| -rw-r--r-- | src/Items/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/Items/ItemHandler.cpp | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/src/Items/CMakeLists.txt b/src/Items/CMakeLists.txt index 72858591a..ba0e4ca9f 100644 --- a/src/Items/CMakeLists.txt +++ b/src/Items/CMakeLists.txt @@ -58,10 +58,6 @@ SET (HDRS ItemAxe.h ) -if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") - set_source_files_properties(ItemHandler.cpp PROPERTIES COMPILE_FLAGS "-Wno-error=switch-enum") -endif() - if(NOT MSVC) add_library(Items ${SRCS} ${HDRS}) endif() diff --git a/src/Items/ItemHandler.cpp b/src/Items/ItemHandler.cpp index e0c5bb56c..ae913f478 100644 --- a/src/Items/ItemHandler.cpp +++ b/src/Items/ItemHandler.cpp @@ -659,9 +659,9 @@ char cItemHandler::GetMaxStackSize(void) case E_ITEM_SUGAR_CANE: return 64; case E_ITEM_TIPPED_ARROW: return 64; case E_ITEM_WHEAT: return 64; + // By default items don't stack: + default: return 1; } - // By default items don't stack: - return 1; } |