From 8b1d64a043de3af18ba048d5be57d00aa9d82b5e Mon Sep 17 00:00:00 2001
From: Alex King <89047260+Kinglykrab@users.noreply.github.com>
Date: Sun, 23 Apr 2023 15:08:50 -0400
Subject: [PATCH] [Cleanup] quest::createBot() unnecessary check against
 nullptr (#3302)

# Notes
- We initialize this variable, so it can never be a nullptr.
---
 zone/questmgr.cpp | 90 +++++++++++++++++++++++------------------------
 1 file changed, 44 insertions(+), 46 deletions(-)

diff --git a/zone/questmgr.cpp b/zone/questmgr.cpp
index 8d23be33c..be71aa995 100644
--- a/zone/questmgr.cpp
+++ b/zone/questmgr.cpp
@@ -2595,57 +2595,55 @@ bool QuestManager::createBot(const char *name, const char *lastname, uint8 level
 
 		Bot* new_bot = new Bot(Bot::CreateDefaultNPCTypeStructForBot(name, lastname, level, race, botclass, gender), initiator);
 
-		if (new_bot) {
-			if (!new_bot->IsValidRaceClassCombo()) {
-				initiator->Message(Chat::White, "That Race/Class combination cannot be created.");
-				return false;
-			}
+		if (!new_bot->IsValidRaceClassCombo()) {
+			initiator->Message(Chat::White, "That Race/Class combination cannot be created.");
+			return false;
+		}
 
-			if (!new_bot->IsValidName()) {
-				initiator->Message(
-					Chat::White,
-					fmt::format(
-						"{} has invalid characters. You can use only the A-Z, a-z and _ characters in a bot name.",
-						new_bot->GetCleanName()
-					).c_str()
-				);
-				return false;
-			}
+		if (!new_bot->IsValidName()) {
+			initiator->Message(
+				Chat::White,
+				fmt::format(
+					"{} has invalid characters. You can use only the A-Z, a-z and _ characters in a bot name.",
+					new_bot->GetCleanName()
+				).c_str()
+			);
+			return false;
+		}
 
-			// Now that all validation is complete, we can save our newly created bot
-			if (!new_bot->Save()) {
-				initiator->Message(
-					Chat::White,
-					fmt::format(
-						"Unable to save {} as a bot.",
-						new_bot->GetCleanName()
-					).c_str()
-				);
-			} else {
-				initiator->Message(
-					Chat::White,
-					fmt::format(
-						"{} saved as bot ID {}.",
-						new_bot->GetCleanName(),
-						new_bot->GetBotID()
-					).c_str()
+		// Now that all validation is complete, we can save our newly created bot
+		if (!new_bot->Save()) {
+			initiator->Message(
+				Chat::White,
+				fmt::format(
+					"Unable to save {} as a bot.",
+					new_bot->GetCleanName()
+				).c_str()
+			);
+		} else {
+			initiator->Message(
+				Chat::White,
+				fmt::format(
+					"{} saved as bot ID {}.",
+					new_bot->GetCleanName(),
+					new_bot->GetBotID()
+				).c_str()
+			);
+
+			if (parse->PlayerHasQuestSub(EVENT_BOT_CREATE)) {
+				const auto &export_string = fmt::format(
+					"{} {} {} {} {}",
+					name,
+					new_bot->GetBotID(),
+					race,
+					botclass,
+					gender
 				);
 
-				if (parse->PlayerHasQuestSub(EVENT_BOT_CREATE)) {
-					const auto& export_string = fmt::format(
-						"{} {} {} {} {}",
-						name,
-						new_bot->GetBotID(),
-						race,
-						botclass,
-						gender
-					);
-
-					parse->EventPlayer(EVENT_BOT_CREATE, initiator, export_string, 0);
-				}
-
-				return true;
+				parse->EventPlayer(EVENT_BOT_CREATE, initiator, export_string, 0);
 			}
+
+			return true;
 		}
 	}
 	return false;