Merge branch 'hotfix/2.20.3' into develop

HarmlessKey · Nov 25, 2023 · b88ce9b · b88ce9b
2 parents 312251b + cfedef8
commit b88ce9b
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/components/userContent/ImportUserContent.vue b/src/components/userContent/ImportUserContent.vue
@@ -510,7 +510,7 @@ export default {
 				const key = entry.harmless_key ?? `new_key-${++i}`;
 				if (entry.challenge_rating !== undefined) {
 					// Entry is NPC
-					if (Object.values(entry.custom_spells).length > 0) {
+					if (entry.custom_spells && Object.values(entry.custom_spells).length > 0) {
 						new_data.spells = { ...new_data.spells, ...entry.custom_spells };
 					}
 					delete entry.custom_spells;