diff --git a/src/client/package.json b/src/client/package.json index 2b01eb65..10dac59e 100644 --- a/src/client/package.json +++ b/src/client/package.json @@ -1,6 +1,6 @@ { "name": "isleward_client", - "version": "0.10.0", + "version": "0.10.1", "description": "isleward", "dependencies": {}, "devDependencies": { diff --git a/src/client/ui/templates/login/template.html b/src/client/ui/templates/login/template.html index a05a566c..116c0be8 100644 --- a/src/client/ui/templates/login/template.html +++ b/src/client/ui/templates/login/template.html @@ -11,11 +11,11 @@
-
[ Latest Release Notes ]
+
[ Latest Release Notes ]
Pledge on Patreon
Donate on Paypal
Access the Wiki
-
v0.10
+
v0.10.1
diff --git a/src/server/components/auth.js b/src/server/components/auth.js index e0aa7855..265a1cff 100644 --- a/src/server/components/auth.js +++ b/src/server/components/auth.js @@ -47,8 +47,6 @@ const getCreateLock = async () => { module.exports = { type: 'auth', - accountLevel: 1, - username: null, charname: null, characters: {}, @@ -178,7 +176,7 @@ module.exports = { await this.getCustomChannels(character); await this.getStash(); - this.verifySkin(character); + await this.verifySkin(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) return; @@ -225,7 +223,7 @@ module.exports = { character.sheetName = skins.getSpritesheet(defaultTo); }, - doesOwnSkin: function (skinId) { + doesOwnSkin: async function (skinId) { const allSkins = skins.getList(); const filteredSkins = allSkins.filter(({ default: isDefaultSkin }) => isDefaultSkin); @@ -235,7 +233,7 @@ module.exports = { filteredSkins }; - eventEmitter.emit('onBeforeGetAccountSkins', msgSkinList); + await eventEmitter.emit('onBeforeGetAccountSkins', msgSkinList); const result = filteredSkins.some(f => f.id === skinId); @@ -252,7 +250,7 @@ module.exports = { filteredSkins }; - eventEmitter.emit('onBeforeGetAccountSkins', msgSkinList); + await eventEmitter.emit('onBeforeGetAccountSkins', msgSkinList); callback(filteredSkins); }, @@ -445,7 +443,7 @@ module.exports = { let simple = this.obj.getSimple(true); - this.verifySkin(simple); + await this.verifySkin(simple); let prophecies = (data.prophecies || []).filter(p => p); diff --git a/src/server/components/trade.js b/src/server/components/trade.js index 4e01006a..4af96e40 100644 --- a/src/server/components/trade.js +++ b/src/server/components/trade.js @@ -152,7 +152,7 @@ module.exports = { this.buyback(msg); }, - buy: function (msg) { + buy: async function (msg) { let target = this.target; if (!target) return; @@ -191,7 +191,7 @@ module.exports = { } if (item.type === 'skin') { - let haveSkin = this.obj.auth.doesOwnSkin(item.skinId); + let haveSkin = await this.obj.auth.doesOwnSkin(item.skinId); if (haveSkin) { sendMessage(this.obj, 'color-redA', 'You have already unlocked that skin.'); diff --git a/src/server/config/serverConfig.js b/src/server/config/serverConfig.js index 7ee764b0..51e613ee 100644 --- a/src/server/config/serverConfig.js +++ b/src/server/config/serverConfig.js @@ -1,5 +1,5 @@ module.exports = { - version: '0.10.0', + version: '0.10.1', port: 4000, startupMessage: 'Server: ready', defaultZone: 'fjolarok', diff --git a/src/server/package.json b/src/server/package.json index 9d8e5702..c61f3b63 100644 --- a/src/server/package.json +++ b/src/server/package.json @@ -1,6 +1,6 @@ { "name": "isleward_server", - "version": "0.10.0", + "version": "0.10.1", "description": "isleward", "dependencies": { "axios": "^0.21.1",