From 123a4de7f04ec81a2f990c7cda3d4ca423bccfcd Mon Sep 17 00:00:00 2001
From: Umeboshi <kuroi_neko91@live.com>
Date: Sat, 18 Apr 2026 11:08:48 -0700
Subject: [PATCH] [core] Set EVA Rank fallback for jobs with no subjob.

---
 src/map/utils/mobutils.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/map/utils/mobutils.cpp b/src/map/utils/mobutils.cpp
index c31bf07987a..5e6a89612f9 100644
--- a/src/map/utils/mobutils.cpp
+++ b/src/map/utils/mobutils.cpp
@@ -1279,6 +1279,11 @@ uint8 JobSkillRankToBaseEvaRank(JOBTYPE mjob, JOBTYPE sjob)
     uint8 mainEvasionSkillRank = battleutils::GetSkillRank(SKILL_EVASION, mjob);
     uint8 subEvasionSkillRank  = battleutils::GetSkillRank(SKILL_EVASION, sjob);
 
+    if (sjob == JOB_NON)
+    {
+        subEvasionSkillRank = mainEvasionSkillRank;
+    }
+
     switch (std::min(mainEvasionSkillRank, subEvasionSkillRank))
     {
         case 1: