diff --git a/source/D2Common/src/Units/Units.cpp b/source/D2Common/src/Units/Units.cpp index d1346b73a..e0a34e968 100644 --- a/source/D2Common/src/Units/Units.cpp +++ b/source/D2Common/src/Units/Units.cpp @@ -1330,7 +1330,13 @@ BOOL UNITS_CanAnimModeUseAttackRate(int nUnitType, int nAnimMode, D2UnitStrc* pU if (pAnimModeModulators->bCanUseSkillAttackRate) { - D2SkillsTxt* pSkillsRecord = DATATBLS_GetSkillsTxtRecord(UNITS_GetUsedSkill(pUnit)->pSkillsTxt->nSkillId); + D2SkillStrc* pUsedSkill = UNITS_GetUsedSkill(pUnit); + if (!pUsedSkill) + { + return FALSE; + } + + D2SkillsTxt* pSkillsRecord = DATATBLS_GetSkillsTxtRecord(pUsedSkill->pSkillsTxt->nSkillId); return (pSkillsRecord->dwFlags[0] & SKILLSFLAG_USEATTACKRATE) != 0; }