From b2441ca177970eac1743d07daeb2daf42b5fed35 Mon Sep 17 00:00:00 2001
From: aleos <aleos89@users.noreply.github.com>
Date: Tue, 8 Aug 2023 18:46:39 -0400
Subject: [PATCH] Suggestion fixes Thanks to @Lemongrass3110!

---
 src/map/battle.cpp | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/map/battle.cpp b/src/map/battle.cpp
index 17782e86fa..ad38c08e91 100644
--- a/src/map/battle.cpp
+++ b/src/map/battle.cpp
@@ -3109,7 +3109,7 @@ static bool is_attack_hitting(struct Damage* wd, struct block_list *src, struct
 				uint16 cart_remodel_lv = pc_checkskill(sd, GN_REMODELING_CART);
 
 				if (sd && cart_remodel_lv > 0)
-					hitrate = hitrate * skill_get_hitrate(GN_REMODELING_CART, cart_remodel_lv) / 100;
+					hitrate = hitrate * static_cast<int16>(skill_get_hitrate(GN_REMODELING_CART, cart_remodel_lv)) / 100;
 			}
 			break;
 			case RL_SLUGSHOT:
@@ -3118,27 +3118,30 @@ static bool is_attack_hitting(struct Damage* wd, struct block_list *src, struct
 
 				if (dist > 3) {
 					// Reduce n hitrate for each cell after initial 3 cells.
-					hitrate -= (skill_get_hitrate(RL_SLUGSHOT, skill_lv) * (dist - 3));
+					hitrate -= (static_cast<int16>(skill_get_hitrate(RL_SLUGSHOT, skill_lv)) * (dist - 3));
 				}
 			}
 			break;
 			default:
 			{
-				struct s_skill_hitrate skill_hitrate = skill_db.find(skill_id)->hitrate;
+				s_skill_hitrate &skill_hitrate = skill_db.find(skill_id)->hitrate;
 
 				if (skill_hitrate.rate[skill_lv] != 100) { // Hit skill modifiers
 					bool req_fail = false;
 
 					// List of skills required to be learned before adjusting hitrate (players only).
-					for (const auto &skill_req : skill_hitrate.skills) {
-						if (sd && pc_checkskill(sd, skill_req.first) < skill_req.second) {
-							req_fail = true;
-							break;
+					if (sd) {
+						for (const auto &skill_req : skill_hitrate.skills) {
+							if (pc_checkskill(sd, skill_req.first) < skill_req.second) {
+								req_fail = true;
+								break;
+							}
 						}
 					}
 
+					// If there were no requirements or the requirements were fulfilled successfully, apply the changed hitrate
 					if (!req_fail)
-						hitrate = hitrate * skill_hitrate.rate[skill_lv] / 100;
+						hitrate = hitrate * static_cast<int16>(skill_hitrate.rate[skill_lv]) / 100;
 				}
 			}
 			break;