Browse Source

fixes edge case for #1367 and provides better fix for #790

tags/v0.5
Big Bad Waffle 4 years ago
parent
commit
529ff4ab15
2 changed files with 2 additions and 2 deletions
  1. +0
    -1
      src/client/js/components/inventory.js
  2. +2
    -1
      src/server/components/inventory.js

+ 0
- 1
src/client/js/components/inventory.js View File

@@ -22,7 +22,6 @@ define([
if (blueprint.getItems) {
let items = this.items;
let newItems = blueprint.getItems || [];
newItems.spliceWhere(n => (blueprint.destroyItems || []).includes(n.id));
let nLen = newItems.length;

for (let i = 0; i < nLen; i++) {


+ 2
- 1
src/server/components/inventory.js View File

@@ -389,7 +389,7 @@ module.exports = {

destroyItem: function (id, amount, force) {
let item = this.findItem(id);
if ((!item) || ((item.noDestroy) && (!force)))
if (!item || (item.noDestroy && !force))
return;

amount = amount || item.quantity;
@@ -407,6 +407,7 @@ module.exports = {
} else {
this.items.spliceWhere(i => i.id === id);
this.obj.syncer.setArray(true, 'inventory', 'destroyItems', id);
this.obj.syncer.deleteFromArray(true, 'inventory', 'getItems', i => i.id === id);
}

this.obj.fireEvent('afterDestroyItem', item, amount);


Loading…
Cancel
Save