From 8ee82f7a754d42b73e6bad0eb8acf3d03c6f3ab8 Mon Sep 17 00:00:00 2001 From: Waverunner Date: Tue, 22 Apr 2014 18:35:28 -0400 Subject: [PATCH] canEquip now accounts for multiple profs in class_required --- src/services/EquipmentService.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/services/EquipmentService.java b/src/services/EquipmentService.java index 380dae39..b0532168 100644 --- a/src/services/EquipmentService.java +++ b/src/services/EquipmentService.java @@ -82,8 +82,19 @@ public class EquipmentService implements INetworkDispatch { } if (item.getStringAttribute("class_required") != null) { + String classRequired = item.getStringAttribute("class_required"); String profession = ((PlayerObject) actor.getSlottedObject("ghost")).getProfession(); - if (item.getStringAttribute("class_required").contentEquals(core.playerService.getFormalProfessionName(profession)) || item.getStringAttribute("class_required").contentEquals("None")) + + if (classRequired.contains(",")) { + String[] classes = classRequired.split(","); + + for (int i = 0; i < classes.length; i++) { + if (classes[i].contains(core.playerService.getFormalProfessionName(profession))) { + return true; + } + } + } + if (classRequired.contentEquals(core.playerService.getFormalProfessionName(profession)) || classRequired.contentEquals("None")) result = true; else return false;