Kaynağa Gözat

fixes #1397

tags/v0.4.4.2
Big Bad Waffle 4 yıl önce
ebeveyn
işleme
dc300421a2
2 değiştirilmiş dosya ile 3 ekleme ve 60 silme
  1. +1
    -1
      src/server/components/inventory.js
  2. +2
    -59
      src/server/mail/mailRethinkDb.js

+ 1
- 1
src/server/components/inventory.js Dosyayı Görüntüle

@@ -713,7 +713,7 @@ module.exports = {
} return true;
},

getItem: function (item, hideMessage, noStack, hideAlert) {
getItem: function (item, hideMessage, noStack, hideAlert, smee) {
return getItem(this, item, hideMessage, noStack, hideAlert);
},



+ 2
- 59
src/server/mail/mailRethinkDb.js Dosyayı Görüntüle

@@ -71,65 +71,8 @@ module.exports = {
},

getMail: async function (playerName) {
let items = await io.getAsync({
key: playerName,
table: 'mail'
});

if (!items || !(items instanceof Array))
return;

let player = this.instance.objects.objects.find(o => (o.name === playerName));
if (!player)
return;

let inventory = player.inventory;
let stash = player.stash;

let sentMessages = [];

items.forEach(function (r) {
if (r.removeAll) {
for (let i = 0; i < inventory.items.length; i++) {
let item = inventory.items[i];
if ((r.nameLike) && (item.name.indexOf(r.nameLike) > -1)) {
inventory.destroyItem(item.id, item.quantity ? item.quantity : null);
i--;
}
}

if (stash) {
for (let i = 0; i < stash.items.length; i++) {
let item = stash.items[i];
if ((r.nameLike) && (item.name.indexOf(r.nameLike) > -1)) {
stash.destroyItem(item.id);
i--;
}
}
}
} else {
if ((r.msg) && (!sentMessages.some(s => (s === r.msg)))) {
player.instance.syncer.queue('onGetMessages', {
id: player.id,
messages: [{
class: 'color-greenB',
message: r.msg,
type: 'info'
}]
}, [player.serverId]);

sentMessages.push(r.msg);
delete r.msg;
}

inventory.getItem(r);
}
});

await io.deleteAsync({
key: playerName,
table: 'mail'
});
//This function is left here because SQLite has one and the server will crash if it's not here.
// That said, we don't need it because the listener sorts out acquisition.
},

sendMail: async function (playerName, items, callback) {


Yükleniyor…
İptal
Kaydet