From 9c32706f3ab5936637571b358ce7911b735646df Mon Sep 17 00:00:00 2001 From: Big Bad Waffle Date: Fri, 24 Aug 2018 22:12:27 +0200 Subject: [PATCH] fixes #787 --- src/client/js/components/inventory.js | 2 +- src/client/ui/templates/hud/hud.js | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/client/js/components/inventory.js b/src/client/js/components/inventory.js index a35f447a..fcc0c7f5 100644 --- a/src/client/js/components/inventory.js +++ b/src/client/js/components/inventory.js @@ -16,7 +16,7 @@ define([ if (blueprint.destroyItems) { rerender = true; - events.emit('onDestroyItems', blueprint.destroyItems); + events.emit('onDestroyItems', blueprint.destroyItems, this.items); } if (blueprint.getItems) { diff --git a/src/client/ui/templates/hud/hud.js b/src/client/ui/templates/hud/hud.js index de485d09..caf12bfd 100644 --- a/src/client/ui/templates/hud/hud.js +++ b/src/client/ui/templates/hud/hud.js @@ -19,7 +19,7 @@ define([ this.onEvent('onGetStats', this.events.onGetStats.bind(this)); this.onEvent('onGetPortrait', this.events.onGetPortrait.bind(this)); this.onEvent('onGetItems', this.events.onGetItems.bind(this)); - this.onEvent('onDestroyItems', this.events.onGetItems.bind(this)); + this.onEvent('onDestroyItems', this.events.onDestroyItems.bind(this)); this.onEvent('onKeyDown', this.events.onKeyDown.bind(this)); }, @@ -74,6 +74,16 @@ define([ }); }, + onDestroyItems: function (itemIds) { + const quickItem = this.items.find(f => f.has('quickSlot')); + if (!quickItem || itemIds.includes(quickItem.id)) { + this.find('.quickItem') + .hide() + .find('.icon') + .css('background', ''); + } + }, + onGetItems: function (items) { this.items = items;