From 2f956252abf0e3f10d7bf2339cb493c8c661436e Mon Sep 17 00:00:00 2001
From: Julius Jung <juljun14@gmail.com>
Date: Tue, 5 Dec 2017 18:05:59 -0500
Subject: [PATCH] Don't show shield when previewing two-handed weapon (fixes
 #9495) (#9676)

* initial commit to not show shield when previewing two-hand weapon

* revert error made

* update to fix all combinations of equipping / trying two-handed weapons

* clarify conditional logic

* refactor to let avatar check for twoHanded display/hide logic

* add case when avatar doesn't have weapon equipped
---
 website/client/components/avatar.vue | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/website/client/components/avatar.vue b/website/client/components/avatar.vue
index 674216d4c5..d288bb0e80 100644
--- a/website/client/components/avatar.vue
+++ b/website/client/components/avatar.vue
@@ -187,6 +187,11 @@ export default {
     hideGear (gearType) {
       if (gearType === 'weapon') {
         let equippedWeapon = this.member.items.gear[this.costumeClass][gearType];
+
+        if (!equippedWeapon) {
+          return false;
+        }
+
         let equippedIsTwoHanded = this.flatGear[equippedWeapon].twoHanded;
         let hasOverrideShield = this.overrideAvatarGear && this.overrideAvatarGear.shield;