Browse Source

Merge branch '1877-faction-item-vendor-fix' into 'master'

bug #1877: Move the canBuy check from factionVendor.js to trade.js

Closes #1877

See merge request Isleward/isleward!578
tags/v0.10.6^2
Vildravn 2 years ago
parent
commit
cb0202c427
2 changed files with 16 additions and 20 deletions
  1. +0
    -19
      src/server/components/extensions/factionVendor.js
  2. +16
    -1
      src/server/components/trade.js

+ 0
- 19
src/server/components/extensions/factionVendor.js View File

@@ -149,25 +149,6 @@ module.exports = {
}
},

canBuy: function (itemId, requestedBy, action) {
let item = null;
if (action === 'buy')
item = this.findItem(itemId, requestedBy.name);
else if (action === 'buyback')
item = this.findBuyback(itemId, requestedBy.name);

let result = true;
if (item.factions)
result = requestedBy.reputation.canEquipItem(item);

if (!result) {
const message = 'your reputation is too low to buy that item';
requestedBy.social.notifySelf({ message });
}

return result;
},

findItem: function (itemId, sourceName) {
let list = this.items[sourceName];
if (!list)


+ 16
- 1
src/server/components/trade.js View File

@@ -341,7 +341,22 @@ module.exports = {
},

canBuy: function (itemId, requestedBy, action) {
return true;
let item = null;
if (action === 'buy')
item = this.findItem(itemId, requestedBy.name);
else if (action === 'buyback')
item = this.findBuyback(itemId, requestedBy.name);

let result = true;
if (item.factions)
result = requestedBy.reputation.canEquipItem(item);

if (!result) {
const message = 'your reputation is too low to buy that item';
requestedBy.social.notifySelf({ message });
}

return result;
},

findItem: function (itemId, sourceName) {


Loading…
Cancel
Save