4 files changed, 12 insertions, 4 deletions

diff --git a/src/Entities/ArrowEntity.cpp b/src/Entities/ArrowEntity.cpp
index 380af101c..59d742f8d 100644
--- a/src/Entities/ArrowEntity.cpp
+++ b/src/Entities/ArrowEntity.cpp
@@ -67,7 +67,9 @@ bool cArrowEntity::CanPickup(const cPlayer & a_Player) const
 		case psInCreative:           return a_Player.IsGameModeCreative();
 	}
 	ASSERT(!"Unhandled pickup state");
-	return false;
+	#ifndef __clang__
+		return false;
+	#endif
 }
 
 
diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp
index 98be99a27..2adbc3142 100644
--- a/src/Entities/Entity.cpp
+++ b/src/Entities/Entity.cpp
@@ -741,7 +741,9 @@ bool cEntity::ArmorCoversAgainst(eDamageType a_DamageType)
 		}
 	}
 	ASSERT(!"Invalid damage type!");
-	return false;
+	#ifndef __clang__
+		return false;
+	#endif
 }
 
 
diff --git a/src/Entities/EntityEffect.cpp b/src/Entities/EntityEffect.cpp
index 9b80e6238..620be395b 100644
--- a/src/Entities/EntityEffect.cpp
+++ b/src/Entities/EntityEffect.cpp
@@ -217,7 +217,9 @@ cEntityEffect * cEntityEffect::CreateEntityEffect(cEntityEffect::eType a_EffectT
 	}
 
 	ASSERT(!"Unhandled entity effect type!");
-	return nullptr;
+	#ifndef __clang__
+		return nullptr;
+	#endif
 }
 
 
diff --git a/src/Entities/ProjectileEntity.cpp b/src/Entities/ProjectileEntity.cpp
index 72dccbfb4..c4f705668 100644
--- a/src/Entities/ProjectileEntity.cpp
+++ b/src/Entities/ProjectileEntity.cpp
@@ -357,7 +357,9 @@ AString cProjectileEntity::GetMCAClassName(void) const
 		case pkFishingFloat:  return "";  // Unknown, perhaps MC doesn't save this?
 	}
 	ASSERT(!"Unhandled projectile entity kind!");
-	return "";
+	#ifndef __clang__
+		return "";
+	#endif
 }