From 484870adcba089d14eb5b6f4d8e7583ea2134f74 Mon Sep 17 00:00:00 2001 From: WinterSolstice8 <60417494+wintersolstice8@users.noreply.github.com> Date: Thu, 2 Apr 2026 13:02:48 -0600 Subject: [PATCH] [core] Always fetch subjob when saving char to db --- src/map/entities/battleentity.cpp | 4 ++-- src/map/entities/battleentity.h | 2 +- src/map/utils/charutils.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/map/entities/battleentity.cpp b/src/map/entities/battleentity.cpp index 55d0e7a5d11..75f3efb0915 100644 --- a/src/map/entities/battleentity.cpp +++ b/src/map/entities/battleentity.cpp @@ -1540,9 +1540,9 @@ uint8 CBattleEntity::GetMLevel() const return m_mlvl; } -JOBTYPE CBattleEntity::GetSJob() const +JOBTYPE CBattleEntity::GetSJob(bool ignoreRestriction) const { - if (StatusEffectContainer->HasStatusEffect({ EFFECT_OBLIVISCENCE, EFFECT_SJ_RESTRICTION })) + if (!ignoreRestriction && StatusEffectContainer->HasStatusEffect({ EFFECT_OBLIVISCENCE, EFFECT_SJ_RESTRICTION })) { return JOB_NON; } diff --git a/src/map/entities/battleentity.h b/src/map/entities/battleentity.h index 0fabe068609..3d346fb5f59 100644 --- a/src/map/entities/battleentity.h +++ b/src/map/entities/battleentity.h @@ -359,7 +359,7 @@ class CBattleEntity : public CBaseEntity bool isSitting(); JOBTYPE GetMJob() const; - JOBTYPE GetSJob() const; + JOBTYPE GetSJob(bool ignoreRestriction = false) const; uint8 GetMLevel() const; uint8 GetSLevel() const; diff --git a/src/map/utils/charutils.cpp b/src/map/utils/charutils.cpp index 18f0b81fb4e..5d9b34fc7ec 100644 --- a/src/map/utils/charutils.cpp +++ b/src/map/utils/charutils.cpp @@ -6146,7 +6146,7 @@ void SaveCharStats(CCharEntity* PChar) PChar->health.mp, PChar->profile.mhflag, PChar->GetMJob(), - PChar->GetSJob(), + PChar->GetSJob(true), PChar->petZoningInfo.petID, static_cast(PChar->petZoningInfo.petType), PChar->petZoningInfo.petHP,