Merge branch 'develop' into release

2018-10-11 16:01:56 -05:00
parent 998621cefe 67bb179c25
commit 6fe73d431e
23 changed files with 470 additions and 248 deletions
@@ -188,8 +188,7 @@ shops.getMarketGearCategories = function getMarketGear (user, language) {
  };

  let specialNonClassGear = filter(content.gear.flat, (gear) => {
-    return user.items.gear.owned[gear.key] === false ||
-      !user.items.gear.owned[gear.key] &&
+    return !user.items.gear.owned[gear.key] &&
      content.classes.indexOf(gear.klass) === -1 &&
      content.classes.indexOf(gear.specialClass) === -1 &&
      (gear.canOwn && gear.canOwn(user));