From 8f1af835c56739c19b691b488ce74426be3d024b Mon Sep 17 00:00:00 2001 From: Big Bad Waffle Date: Mon, 18 Sep 2017 21:20:24 +0200 Subject: [PATCH] Fixes #67 --- src/client/js/components/inventory.js | 16 ++++++++++------ src/server/components/equipment.js | 3 +++ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/client/js/components/inventory.js b/src/client/js/components/inventory.js index 4cca5287..3faeb9a8 100644 --- a/src/client/js/components/inventory.js +++ b/src/client/js/components/inventory.js @@ -40,12 +40,16 @@ define([ return (item.id == nId); }); if (findItem) { - if (!nItem.eq) - delete findItem.eq; - if (nItem.stats) - delete findItem.stats; - if (!nItem.power) - delete findItem.power; + [ + 'eq', + 'stats', + 'power', + 'pos' + ].forEach(function(s) { + if (!nItem[s]) + delete findItem[s]; + }); + $.extend(true, findItem, nItem); newItems.splice(i, 1); diff --git a/src/server/components/equipment.js b/src/server/components/equipment.js index df76e348..0e0b2205 100644 --- a/src/server/components/equipment.js +++ b/src/server/components/equipment.js @@ -84,6 +84,9 @@ define([ return; } + delete item.pos; + this.obj.syncer.setArray(true, 'inventory', 'getItems', item); + var spellId = null; var currentEqId = this.eq[item.slot]; var currentEq = this.obj.inventory.findItem(currentEqId);