From 047a21b4bbfe40212c04361f00abc5480fdc229e Mon Sep 17 00:00:00 2001 From: Cekis Date: Fri, 20 Jan 2017 17:42:58 +0000 Subject: [PATCH] Fixed null pointer issue occurring on manufactured objects by a player that had no crafting skills. --- .../game/script/library/craftinglib.java | 61 +++++++++---------- 1 file changed, 30 insertions(+), 31 deletions(-) diff --git a/sku.0/sys.server/compiled/game/script/library/craftinglib.java b/sku.0/sys.server/compiled/game/script/library/craftinglib.java index 4fa0c8cec..31cd503c7 100755 --- a/sku.0/sys.server/compiled/game/script/library/craftinglib.java +++ b/sku.0/sys.server/compiled/game/script/library/craftinglib.java @@ -1551,37 +1551,36 @@ public class craftinglib extends script.base_script public static String getCraftingSubskill(String[] craftingSkills) throws InterruptedException { String strSkill = "artisan"; - String[] skillFragment = - { - "crafting_artisan", - "crafting_armorsmith", - "crafting_architect", - "crafting_chef", - "crafting_droid", - "crafting_shipwright", - "crafting_tailor", - "crafting_weaponsmith", - "crafting_cybernetic" - }; - String[] skillList = - { - "artisan", - "armorsmith", - "architect", - "chef", - "droid", - "shipwright", - "tailor", - "weaponsmith", - "cybernetic" - }; - for (int i = 0; i < craftingSkills.length; i++) - { - for (int j = 0; j < skillFragment.length; j++) - { - if (craftingSkills[i].startsWith(skillFragment[j])) - { - return skillList[j]; + if(craftingSkills != null) { + String[] skillFragment = + { + "crafting_artisan", + "crafting_armorsmith", + "crafting_architect", + "crafting_chef", + "crafting_droid", + "crafting_shipwright", + "crafting_tailor", + "crafting_weaponsmith", + "crafting_cybernetic" + }; + String[] skillList = + { + "artisan", + "armorsmith", + "architect", + "chef", + "droid", + "shipwright", + "tailor", + "weaponsmith", + "cybernetic" + }; + for (int i = 0; i < craftingSkills.length; i++) { + for (int j = 0; j < skillFragment.length; j++) { + if (craftingSkills[i].startsWith(skillFragment[j])) { + return skillList[j]; + } } } }