Merge branch 'quality_assurance' of bitbucket.org:projectswg/holocore into quality_assurance

This commit is contained in:
Obique PSWG
2016-10-31 09:50:15 -05:00
8 changed files with 88 additions and 9 deletions
+4 -5
View File
@@ -311,7 +311,6 @@ public final class StaticItemService extends Service {
public final String getIffTemplate() {
return iffTemplate;
}
}
private static class WearableAttributes extends ObjectAttributes {
@@ -347,15 +346,15 @@ public final class StaticItemService extends Service {
} else {
requiredFaction = "@pvp_factions:" + requiredFaction;
}
// Load mods
String modsString = resultSet.getString("skill_mods");
// If this wearable is supposed to have mods, then load 'em!
mods = parseSkillMods(modsString);
String buffNameCell = resultSet.getString("buff_name");
if(!buffNameCell.equals("-")) {
buffName = "@ui_buff:" + buffNameCell;
}
@@ -368,7 +367,7 @@ public final class StaticItemService extends Service {
object.addAttribute("class_required", requiredProfession);
object.addAttribute("required_combat_level", requiredLevel);
object.addAttribute("faction_restriction", requiredFaction);
// Apply the mods!
for(Map.Entry<String, String> modEntry : mods.entrySet())
object.addAttribute(modEntry.getKey(), modEntry.getValue());