From 73a985656eb2b7e4e84fe12febbd00f4cb14655e Mon Sep 17 00:00:00 2001
From: scott-c <xodster@gmail.com>
Date: Sun, 5 Jul 2020 23:11:45 +0800
Subject: [PATCH] fix 1h second item cache issue #661

---
 voxygen/src/scene/figure/cache.rs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/voxygen/src/scene/figure/cache.rs b/voxygen/src/scene/figure/cache.rs
index 68c2ac550f..a65d6fd31c 100644
--- a/voxygen/src/scene/figure/cache.rs
+++ b/voxygen/src/scene/figure/cache.rs
@@ -32,6 +32,7 @@ enum FigureKey {
 struct CharacterCacheKey {
     state: Option<Discriminant<CharacterState>>, // TODO: Can this be simplified?
     active_tool: Option<ToolKind>,
+    second_tool: Option<ToolKind>,
     shoulder: Option<Item>,
     chest: Option<Item>,
     belt: Option<Item>,
@@ -53,6 +54,13 @@ impl CharacterCacheKey {
             } else {
                 None
             },
+            second_tool: if let Some(ItemKind::Tool(tool)) =
+                loadout.second_item.as_ref().map(|i| &i.item.kind)
+            {
+                Some(tool.kind)
+            } else {
+                None
+            },
             shoulder: loadout.shoulder.clone(),
             chest: loadout.chest.clone(),
             belt: loadout.belt.clone(),