Merge pull request #6264 from ojeytonwilliams/two-handed-weapon-fix

Two-handed weapons no longer automatically equip unless desired. fixes #6231
2015-11-26 10:53:50 -06:00
parent 9cbe94c602 9bda5657d2
commit 5d02b70be1
2 changed files with 29 additions and 1 deletions
@@ -1392,9 +1392,9 @@ api.wrap = function(user, main) {
        } else {
          if (user.preferences.autoEquip) {
            user.items.gear.equipped[item.type] = item.key;
+            message = user.fns.handleTwoHanded(item, null, req);
          }
          user.items.gear.owned[item.key] = true;
-          message = user.fns.handleTwoHanded(item, null, req);
          if (message == null) {
            message = i18n.t('messageBought', {
              itemText: item.text(req.language)