summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/Blocks/BlockButton.h1
-rw-r--r--src/Entities/Entity.cpp2
-rw-r--r--src/Entities/Minecart.cpp4
-rw-r--r--src/Protocol/Protocol_1_8.cpp1
4 files changed, 3 insertions, 5 deletions
diff --git a/src/Blocks/BlockButton.h b/src/Blocks/BlockButton.h
index 3a31b774e..f4994f193 100644
--- a/src/Blocks/BlockButton.h
+++ b/src/Blocks/BlockButton.h
@@ -276,5 +276,6 @@ private:
return { 0, 0, 0 };
}
}
+ UNREACHABLE(!"Unhandled block face!");
}
} ;
diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp
index 8c2b6fea8..55df8b834 100644
--- a/src/Entities/Entity.cpp
+++ b/src/Entities/Entity.cpp
@@ -282,7 +282,7 @@ void cEntity::TakeDamage(cEntity & a_Attacker)
void cEntity::TakeDamage(eDamageType a_DamageType, cEntity * a_Attacker, int a_RawDamage, double a_KnockbackAmount)
{
- float FinalDamage = a_RawDamage;
+ float FinalDamage = static_cast<float>(a_RawDamage);
float ArmorCover = GetArmorCoverAgainst(a_Attacker, a_DamageType, a_RawDamage);
ApplyArmorDamage(static_cast<int>(ArmorCover));
diff --git a/src/Entities/Minecart.cpp b/src/Entities/Minecart.cpp
index 2463200c7..59d369c5b 100644
--- a/src/Entities/Minecart.cpp
+++ b/src/Entities/Minecart.cpp
@@ -952,7 +952,6 @@ bool cMinecart::TestBlockCollision(NIBBLETYPE a_RailMeta)
}
break;
- UNREACHABLE("Invalid minecart movement");
}
case E_META_RAIL_CURVED_ZP_XM:
{
@@ -970,7 +969,6 @@ bool cMinecart::TestBlockCollision(NIBBLETYPE a_RailMeta)
}
break;
- UNREACHABLE("Invalid minecart movement");
}
case E_META_RAIL_CURVED_ZM_XM:
{
@@ -988,7 +986,6 @@ bool cMinecart::TestBlockCollision(NIBBLETYPE a_RailMeta)
}
break;
- UNREACHABLE("Invalid minecart movement");
}
case E_META_RAIL_CURVED_ZM_XP:
{
@@ -1006,7 +1003,6 @@ bool cMinecart::TestBlockCollision(NIBBLETYPE a_RailMeta)
}
break;
- UNREACHABLE("Invalid minecart movement");
}
}
diff --git a/src/Protocol/Protocol_1_8.cpp b/src/Protocol/Protocol_1_8.cpp
index fe2f80146..cc108fb69 100644
--- a/src/Protocol/Protocol_1_8.cpp
+++ b/src/Protocol/Protocol_1_8.cpp
@@ -3909,4 +3909,5 @@ UInt8 cProtocol_1_8_0::GetProtocolEntityType(const cEntity & a_Entity)
case Type::etExpOrb:
case Type::etPainting: UNREACHABLE("Tried to spawn an unhandled entity");
}
+ UNREACHABLE("Unhandled entity kind");
}