From 903c3df5a34dbfc05c43b667c975b33dc03e7f6d Mon Sep 17 00:00:00 2001
From: timokoesters <timo@koesters.xyz>
Date: Thu, 19 Mar 2020 20:57:36 +0100
Subject: [PATCH] Fix weapon not updating after swapping to a weapon of the
 same type

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

diff --git a/voxygen/src/scene/figure/cache.rs b/voxygen/src/scene/figure/cache.rs
index 90af923e3e..85becab458 100644
--- a/voxygen/src/scene/figure/cache.rs
+++ b/voxygen/src/scene/figure/cache.rs
@@ -23,7 +23,7 @@ enum FigureKey {
 #[derive(PartialEq, Eq, Hash, Clone)]
 struct CharacterCacheKey {
     state: Option<Discriminant<CharacterState>>, // TODO: Can this be simplified?
-    active_tool: Option<Discriminant<ToolKind>>,
+    active_tool: Option<ToolKind>,
     shoulder: Option<Item>,
     chest: Option<Item>,
     belt: Option<Item>,
@@ -39,7 +39,7 @@ impl CharacterCacheKey {
             active_tool: if let Some(ItemKind::Tool(tool)) =
                 loadout.active_item.as_ref().map(|i| &i.item.kind)
             {
-                Some(discriminant(&tool.kind))
+                Some(tool.kind)
             } else {
                 None
             },