Master See merge request Isleward/isleward!562tags/v0.10.1
@@ -1,6 +1,6 @@ | |||||
{ | { | ||||
"name": "isleward_client", | "name": "isleward_client", | ||||
"version": "0.10.0", | |||||
"version": "0.10.1", | |||||
"description": "isleward", | "description": "isleward", | ||||
"dependencies": {}, | "dependencies": {}, | ||||
"devDependencies": { | "devDependencies": { | ||||
@@ -11,11 +11,11 @@ | |||||
</div> | </div> | ||||
<div class="message"></div> | <div class="message"></div> | ||||
</div> | </div> | ||||
<div class="news" location="https://gitlab.com/Isleward/play.isleward.com/-/wikis/v0.10.0-Release-Notes">[ Latest Release Notes ]</div> | |||||
<div class="news" location="https://gitlab.com/Isleward/play.isleward.com/-/wikis/v0.10.1-Release-Notes">[ Latest Release Notes ]</div> | |||||
<div class="extra"> | <div class="extra"> | ||||
<div class="el btn btnPatreon monetization" location="https://patreon.com/bigbadwaffle">Pledge on Patreon</div> | <div class="el btn btnPatreon monetization" location="https://patreon.com/bigbadwaffle">Pledge on Patreon</div> | ||||
<div class="el btn btnPaypal monetization" location="https://www.paypal.com/donate?hosted_button_id=NEQAV3NG9PWXA">Donate on Paypal</div> | <div class="el btn btnPaypal monetization" location="https://www.paypal.com/donate?hosted_button_id=NEQAV3NG9PWXA">Donate on Paypal</div> | ||||
<div class="el btn btnWiki" location="http://wiki.isleward.com/Main_Page">Access the Wiki</div> | <div class="el btn btnWiki" location="http://wiki.isleward.com/Main_Page">Access the Wiki</div> | ||||
</div> | </div> | ||||
<div class="version" location="https://gitlab.com/Isleward/play.isleward.com/-/wikis/v0.10.0-Release-Notes">v0.10</div> | |||||
<div class="version" location="https://gitlab.com/Isleward/play.isleward.com/-/wikis/v0.10.1-Release-Notes">v0.10.1</div> | |||||
</div> | </div> |
@@ -47,8 +47,6 @@ const getCreateLock = async () => { | |||||
module.exports = { | module.exports = { | ||||
type: 'auth', | type: 'auth', | ||||
accountLevel: 1, | |||||
username: null, | username: null, | ||||
charname: null, | charname: null, | ||||
characters: {}, | characters: {}, | ||||
@@ -178,7 +176,7 @@ module.exports = { | |||||
await this.getCustomChannels(character); | await this.getCustomChannels(character); | ||||
await this.getStash(); | await this.getStash(); | ||||
this.verifySkin(character); | |||||
await this.verifySkin(character); | |||||
data.callback(character); | data.callback(character); | ||||
}, | }, | ||||
@@ -212,8 +210,8 @@ module.exports = { | |||||
}); | }); | ||||
}, | }, | ||||
verifySkin: function (character) { | |||||
const doesOwn = this.doesOwnSkin(character.skinId); | |||||
verifySkin: async function (character) { | |||||
const doesOwn = await this.doesOwnSkin(character.skinId); | |||||
if (doesOwn) | if (doesOwn) | ||||
return; | return; | ||||
@@ -225,7 +223,7 @@ module.exports = { | |||||
character.sheetName = skins.getSpritesheet(defaultTo); | character.sheetName = skins.getSpritesheet(defaultTo); | ||||
}, | }, | ||||
doesOwnSkin: function (skinId) { | |||||
doesOwnSkin: async function (skinId) { | |||||
const allSkins = skins.getList(); | const allSkins = skins.getList(); | ||||
const filteredSkins = allSkins.filter(({ default: isDefaultSkin }) => isDefaultSkin); | const filteredSkins = allSkins.filter(({ default: isDefaultSkin }) => isDefaultSkin); | ||||
@@ -235,7 +233,7 @@ module.exports = { | |||||
filteredSkins | filteredSkins | ||||
}; | }; | ||||
eventEmitter.emit('onBeforeGetAccountSkins', msgSkinList); | |||||
await eventEmitter.emit('onBeforeGetAccountSkins', msgSkinList); | |||||
const result = filteredSkins.some(f => f.id === skinId); | const result = filteredSkins.some(f => f.id === skinId); | ||||
@@ -252,7 +250,7 @@ module.exports = { | |||||
filteredSkins | filteredSkins | ||||
}; | }; | ||||
eventEmitter.emit('onBeforeGetAccountSkins', msgSkinList); | |||||
await eventEmitter.emit('onBeforeGetAccountSkins', msgSkinList); | |||||
callback(filteredSkins); | callback(filteredSkins); | ||||
}, | }, | ||||
@@ -445,7 +443,7 @@ module.exports = { | |||||
let simple = this.obj.getSimple(true); | let simple = this.obj.getSimple(true); | ||||
this.verifySkin(simple); | |||||
await this.verifySkin(simple); | |||||
let prophecies = (data.prophecies || []).filter(p => p); | let prophecies = (data.prophecies || []).filter(p => p); | ||||
@@ -152,7 +152,7 @@ module.exports = { | |||||
this.buyback(msg); | this.buyback(msg); | ||||
}, | }, | ||||
buy: function (msg) { | |||||
buy: async function (msg) { | |||||
let target = this.target; | let target = this.target; | ||||
if (!target) | if (!target) | ||||
return; | return; | ||||
@@ -191,7 +191,7 @@ module.exports = { | |||||
} | } | ||||
if (item.type === 'skin') { | if (item.type === 'skin') { | ||||
let haveSkin = this.obj.auth.doesOwnSkin(item.skinId); | |||||
let haveSkin = await this.obj.auth.doesOwnSkin(item.skinId); | |||||
if (haveSkin) { | if (haveSkin) { | ||||
sendMessage(this.obj, 'color-redA', 'You have already unlocked that skin.'); | sendMessage(this.obj, 'color-redA', 'You have already unlocked that skin.'); | ||||
@@ -1,5 +1,5 @@ | |||||
module.exports = { | module.exports = { | ||||
version: '0.10.0', | |||||
version: '0.10.1', | |||||
port: 4000, | port: 4000, | ||||
startupMessage: 'Server: ready', | startupMessage: 'Server: ready', | ||||
defaultZone: 'fjolarok', | defaultZone: 'fjolarok', | ||||
@@ -1,6 +1,6 @@ | |||||
{ | { | ||||
"name": "isleward_server", | "name": "isleward_server", | ||||
"version": "0.10.0", | |||||
"version": "0.10.1", | |||||
"description": "isleward", | "description": "isleward", | ||||
"dependencies": { | "dependencies": { | ||||
"axios": "^0.21.1", | "axios": "^0.21.1", | ||||