From a9031b6bae742b333b1b390192fa590f2ecb07ea Mon Sep 17 00:00:00 2001 From: peterbell10 Date: Mon, 5 Oct 2020 11:27:14 +0100 Subject: Fix cmake not adding Werror on clang, and _lots_ of warnings (#4963) * Fix cmake not adding Werror on clang, and _lots_ of warnings * WIP: Build fixes * Cannot make intermediate blockhandler instance * Tiger's changes * Fix BitIndex check * Handle invalid NextState values in cMultiVersionProtocol Co-authored-by: Tiger Wang --- src/Protocol/Palettes/Palette_1_13.cpp | 2 +- src/Protocol/Palettes/Palette_1_13_1.cpp | 2 +- src/Protocol/Palettes/Palette_1_14.cpp | 2 +- src/Protocol/Palettes/Palette_1_15.cpp | 2 +- src/Protocol/Palettes/Palette_1_16.cpp | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/Protocol/Palettes') diff --git a/src/Protocol/Palettes/Palette_1_13.cpp b/src/Protocol/Palettes/Palette_1_13.cpp index 7950ee72e..b6a8bbc0a 100644 --- a/src/Protocol/Palettes/Palette_1_13.cpp +++ b/src/Protocol/Palettes/Palette_1_13.cpp @@ -7916,7 +7916,7 @@ namespace Palette_1_13 case Statistic::WalkOneCm: return 5; case Statistic::WalkOnWaterOneCm: return 18; case Statistic::WalkUnderWaterOneCm: return 12; - default: return -1; + default: return UInt32(-1); } } diff --git a/src/Protocol/Palettes/Palette_1_13_1.cpp b/src/Protocol/Palettes/Palette_1_13_1.cpp index 25f02e47b..0786cf4fe 100644 --- a/src/Protocol/Palettes/Palette_1_13_1.cpp +++ b/src/Protocol/Palettes/Palette_1_13_1.cpp @@ -7932,7 +7932,7 @@ namespace Palette_1_13_1 case Statistic::WalkOneCm: return 5; case Statistic::WalkOnWaterOneCm: return 18; case Statistic::WalkUnderWaterOneCm: return 12; - default: return -1; + default: return UInt32(-1); } } diff --git a/src/Protocol/Palettes/Palette_1_14.cpp b/src/Protocol/Palettes/Palette_1_14.cpp index e98234ff2..29e9fcef9 100644 --- a/src/Protocol/Palettes/Palette_1_14.cpp +++ b/src/Protocol/Palettes/Palette_1_14.cpp @@ -9578,7 +9578,7 @@ namespace Palette_1_14 case Statistic::WalkOneCm: return 5; case Statistic::WalkOnWaterOneCm: return 8; case Statistic::WalkUnderWaterOneCm: return 12; - default: return -1; + default: return static_cast(-1); } } diff --git a/src/Protocol/Palettes/Palette_1_15.cpp b/src/Protocol/Palettes/Palette_1_15.cpp index cb07523a6..6cc67a488 100644 --- a/src/Protocol/Palettes/Palette_1_15.cpp +++ b/src/Protocol/Palettes/Palette_1_15.cpp @@ -9653,7 +9653,7 @@ namespace Palette_1_15 case Statistic::WalkOnWaterOneCm: return 8; case Statistic::WalkOneCm: return 5; case Statistic::WalkUnderWaterOneCm: return 12; - default: return -1; + default: return UInt32(-1); } } diff --git a/src/Protocol/Palettes/Palette_1_16.cpp b/src/Protocol/Palettes/Palette_1_16.cpp index 4d0c6fa39..baef7dfd0 100644 --- a/src/Protocol/Palettes/Palette_1_16.cpp +++ b/src/Protocol/Palettes/Palette_1_16.cpp @@ -12758,8 +12758,8 @@ namespace Palette_1_16 case Item::ZombieSpawnEgg: return 818; case Item::ZombieVillagerSpawnEgg: return 820; case Item::ZombiePigmanSpawnEgg: return 821; - default: return 0; } + UNREACHABLE("Invalid item"); } UInt32 From(const Statistic ID) @@ -12840,7 +12840,7 @@ namespace Palette_1_16 case Statistic::WalkOnWaterOneCm: return 8; case Statistic::WalkOneCm: return 5; case Statistic::WalkUnderWaterOneCm: return 12; - default: return -1; + default: return UInt32(-1); } } -- cgit v1.2.3