# Conflicts: # src/server/world/instancer.jstags/v0.12.0.21^2
@@ -1,6 +1,6 @@ | |||||
{ | { | ||||
"name": "isleward_client", | "name": "isleward_client", | ||||
"version": "0.11.0", | |||||
"version": "0.12.0", | |||||
"description": "isleward", | "description": "isleward", | ||||
"dependencies": { | "dependencies": { | ||||
}, | }, | ||||
@@ -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.11.0-Release-Notes">[ Latest Release Notes ]</div> | |||||
<div class="news" location="https://gitlab.com/Isleward/play.isleward.com/-/wikis/v0.12.0-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.11.0-Release-Notes">v0.11.0</div> | |||||
<div class="version" location="https://gitlab.com/Isleward/play.isleward.com/-/wikis/v0.12.0-Release-Notes">v0.12.0</div> | |||||
</div> | </div> |
@@ -263,6 +263,20 @@ module.exports = { | |||||
let itemId = eq[slot]; | let itemId = eq[slot]; | ||||
let item = inventory.findItem(itemId); | let item = inventory.findItem(itemId); | ||||
if (!item) { | |||||
console.log({ | |||||
error: 'item not found', | |||||
itemId, | |||||
slot, | |||||
factionId, | |||||
tier, | |||||
character: this.obj.name, | |||||
eq: this.eq | |||||
}); | |||||
return; | |||||
} | |||||
let factions = item.factions; | let factions = item.factions; | ||||
if (!factions) | if (!factions) | ||||
return; | return; | ||||
@@ -1,7 +1,7 @@ | |||||
/* eslint-disable no-process-env */ | /* eslint-disable no-process-env */ | ||||
module.exports = { | module.exports = { | ||||
version: '0.11.0', | |||||
version: '0.12.0', | |||||
port: 4000, | port: 4000, | ||||
startupMessage: 'Server: ready', | startupMessage: 'Server: ready', | ||||
@@ -10,7 +10,7 @@ module.exports = { | |||||
//Options: | //Options: | ||||
// sqlite | // sqlite | ||||
// rethink | // rethink | ||||
db: process.env.IWD_DB || 'rethink', | |||||
db: process.env.IWD_DB || 'sqlite', | |||||
dbHost: process.env.IWD_DB_HOST || 'localhost', | dbHost: process.env.IWD_DB_HOST || 'localhost', | ||||
dbPort: process.env.IWD_DB_PORT || 28015, | dbPort: process.env.IWD_DB_PORT || 28015, | ||||
dbName: process.env.IWD_DB_NAME || 'live', | dbName: process.env.IWD_DB_NAME || 'live', | ||||
@@ -1,6 +1,6 @@ | |||||
{ | { | ||||
"name": "isleward_server", | "name": "isleward_server", | ||||
"version": "0.11.0", | |||||
"version": "0.12.0", | |||||
"description": "isleward", | "description": "isleward", | ||||
"dependencies": { | "dependencies": { | ||||
"axios": "^0.22.0", | "axios": "^0.22.0", | ||||
@@ -44,9 +44,11 @@ module.exports = { | |||||
}] | }] | ||||
}); | }); | ||||
//Rezoning is set to true while rezoning so we don't try to remove objects | |||||
//If the player doesn't have a 'social' component, they are no longer in a threat | |||||
// Likely due to unzoning (character select screen) | |||||
// Also, rezoning is set to true while rezoning so we don't try to remove objects | |||||
// from zones if they are currently rezoning | // from zones if they are currently rezoning | ||||
if (player.rezoning !== true) { | |||||
if (player.components.some(c => c.type === 'social') && player.rezoning !== true) { | |||||
await new Promise(res => { | await new Promise(res => { | ||||
atlas.removeObject(player, false, res); | atlas.removeObject(player, false, res); | ||||
}); | }); | ||||
@@ -97,8 +99,11 @@ module.exports = { | |||||
keys.forEach(function (k) { | keys.forEach(function (k) { | ||||
let val = player[k]; | let val = player[k]; | ||||
if (val && val.type) { | if (val && val.type) { | ||||
if (['player', 'auth', 'syncer'].indexOf(val.type) === -1) | |||||
if (['player', 'auth', 'syncer'].indexOf(val.type) === -1) { | |||||
delete player[k]; | delete player[k]; | ||||
player.components.spliceWhere(c => c.type === val.type); | |||||
} | |||||
} | } | ||||
}); | }); | ||||