From 13144a08e496b89b34093ffd3d810d3442df3c44 Mon Sep 17 00:00:00 2001
From: peterbell10 <peterbell10@live.co.uk>
Date: Thu, 14 May 2020 23:15:35 +0100
Subject: Enable some more clang-tidy linter checks (#4738)

* Avoid inefficient AString -> c_str() -> AString round trip

* Avoid redundant string init expressions

* Avoid unnecessary return, continue, etc.

* Add .clang-format to help with clang-tidy fix-its

* Avoid unnecessary passing by value

* Avoid unnecessary local copying

* Avoid copying in range-for loops

* Avoid over-complicated boolean expressions

* Some violations missed by my local clang-tidy

* Allow unnecessary continue statements

* Add brackets

* Another expression missed locally

* Move BindingsProcessor call into clang-tidy.sh and add space

* Fix pushd not found error

* Different grouping of CheckBlockInteractionRate
---
 src/Mobs/Creeper.cpp        |  9 ++++-----
 src/Mobs/EnderDragon.cpp    |  2 +-
 src/Mobs/Monster.cpp        |  2 +-
 src/Mobs/PassiveMonster.cpp |  2 +-
 src/Mobs/Path.cpp           | 11 ++---------
 src/Mobs/PathFinder.cpp     |  7 ++-----
 6 files changed, 11 insertions(+), 22 deletions(-)

(limited to 'src/Mobs')

diff --git a/src/Mobs/Creeper.cpp b/src/Mobs/Creeper.cpp
index 29b402938..e824c7352 100644
--- a/src/Mobs/Creeper.cpp
+++ b/src/Mobs/Creeper.cpp
@@ -83,11 +83,10 @@ void cCreeper::GetDrops(cItems & a_Drops, cEntity * a_Killer)
 	{
 		auto ProjectileCreatorCallback = [](cEntity & a_Entity)
 			{
-				if (a_Entity.IsMob() && ((static_cast<cMonster &>(a_Entity)).GetMobType() == mtSkeleton))
-				{
-					return true;
-				}
-				return false;
+				return (
+					a_Entity.IsMob() &&
+					((static_cast<cMonster &>(a_Entity)).GetMobType() == mtSkeleton)
+				);
 			};
 
 		if (GetWorld()->DoWithEntityByID(static_cast<cProjectileEntity *>(a_Killer)->GetCreatorUniqueID(), ProjectileCreatorCallback))
diff --git a/src/Mobs/EnderDragon.cpp b/src/Mobs/EnderDragon.cpp
index d6b71552e..a3ba5f937 100644
--- a/src/Mobs/EnderDragon.cpp
+++ b/src/Mobs/EnderDragon.cpp
@@ -19,7 +19,7 @@ cEnderDragon::cEnderDragon(void) :
 
 void cEnderDragon::GetDrops(cItems & a_Drops, cEntity * a_Killer)
 {
-	return;
+	// No drops
 }
 
 
diff --git a/src/Mobs/Monster.cpp b/src/Mobs/Monster.cpp
index da09050cf..75bda197f 100644
--- a/src/Mobs/Monster.cpp
+++ b/src/Mobs/Monster.cpp
@@ -325,7 +325,7 @@ void cMonster::Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk)
 		else
 		{
 			// Note that m_NextWayPointPosition is actually returned by GetNextWayPoint)
-			switch (m_PathFinder.GetNextWayPoint(*Chunk, GetPosition(), &m_FinalDestination, &m_NextWayPointPosition, m_EMState == IDLE ? true : false))
+			switch (m_PathFinder.GetNextWayPoint(*Chunk, GetPosition(), &m_FinalDestination, &m_NextWayPointPosition, m_EMState == IDLE))
 			{
 				case ePathFinderStatus::PATH_FOUND:
 				{
diff --git a/src/Mobs/PassiveMonster.cpp b/src/Mobs/PassiveMonster.cpp
index fa2874dcf..f9d5e4ba4 100644
--- a/src/Mobs/PassiveMonster.cpp
+++ b/src/Mobs/PassiveMonster.cpp
@@ -138,7 +138,7 @@ void cPassiveMonster::Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk)
 		{
 			m_World->DoWithNearestPlayer(GetPosition(), static_cast<float>(m_SightDistance), [&](cPlayer & a_Player) -> bool
 			{
-				cItem EquippedItem = a_Player.GetEquippedItem();
+				const cItem & EquippedItem = a_Player.GetEquippedItem();
 				if (FollowedItems.ContainsType(EquippedItem))
 				{
 					Vector3d PlayerPos = a_Player.GetPosition();
diff --git a/src/Mobs/Path.cpp b/src/Mobs/Path.cpp
index a2a5cf51c..378051163 100644
--- a/src/Mobs/Path.cpp
+++ b/src/Mobs/Path.cpp
@@ -639,15 +639,8 @@ bool cPath::SpecialIsSolidFromThisDirection(BLOCKTYPE a_Type, NIBBLETYPE a_Meta,
 	// If there is a nonsolid above a fence
 	if (!cBlockInfo::IsSolid(a_Type))
 	{
-			// If we're coming from below
-			if (a_Direction.y > 0)
-			{
-				return true;  // treat the nonsolid as solid
-			}
-			else
-			{
-				return false;  // Treat it as a nonsolid because we are not coming from below
-			}
+		// Only treat as solid when we're coming from below
+		return (a_Direction.y > 0);
 	}
 
 	/* switch (a_Type)
diff --git a/src/Mobs/PathFinder.cpp b/src/Mobs/PathFinder.cpp
index f2542cebc..423c4a0c6 100644
--- a/src/Mobs/PathFinder.cpp
+++ b/src/Mobs/PathFinder.cpp
@@ -278,9 +278,6 @@ bool cPathFinder::PathIsTooOld() const
 	{
 		acceptableDeviation = 1;
 	}
-	if ((m_FinalDestination - m_DeviationOrigin).SqrLength() > acceptableDeviation * acceptableDeviation)
-	{
-		return true;
-	}
-	return false;
+	const auto DeviationSqr = (m_FinalDestination - m_DeviationOrigin).SqrLength();
+	return (DeviationSqr > (acceptableDeviation * acceptableDeviation));
 }
-- 
cgit v1.2.3