diff --git a/lib/avatars.js b/lib/avatars.js index 1493a4f..ff4e112 100644 --- a/lib/avatars.js +++ b/lib/avatars.js @@ -25,7 +25,7 @@ const validNameBarData = (value, account) => Number.isInteger(value) && value >= && badges.mayWear(account, defpacks.badgeIds()[value >> 8 & 0xFF]) // the ones the admin gives: lib/badges.js && (value >> 16) <= 1; -module.exports = ({others, findOnline, findBySfsId, refreshForOthers, petFields}) => { +module.exports = ({others, findOnline, findBySfsId, refreshForOthers, petFields, sendAvatarData, sendItemList}) => { // A player's card: who they are, the animal they are using and what it // wears. AvatarXtCommManager.avatarGetResponse reads [username, uuid, // status, accountType, isGuide, daysSinceLogin, perUserAvId, avInvId, @@ -97,6 +97,13 @@ module.exports = ({others, findOnline, findBySfsId, refreshForOthers, petFields} const messageRoom = session.room ? session.room.id : -1; const common = [1, session.id, avatar.perUserAvId, avatar.avInvId, avatar.customAvId, avatar.type, ...avatar.colors, avatar.name]; session.sendXt("as", messageRoom, ...common, avatar.petInvId, avatar.questLevel || 0); + // Switching changes the active animal, but the client keeps a separate + // editor model for each avatar. Refresh both parts of that model here: + // otherwise a newly bought animal can be shown in the switcher while its + // clothing inventory was never populated, leaving the editor unable to + // open until the player signs in again. + sendAvatarData(session, session, avatar.perUserAvId); + sendItemList(session, session, true, avatar.perUserAvId); if (session.pos) { for (const other of others(session)) { other.sendXt("as", messageRoom, ...common, ...petFields(activePet(account)), avatar.questLevel || 0); diff --git a/lib/world.js b/lib/world.js index e42c6e8..296695f 100644 --- a/lib/world.js +++ b/lib/world.js @@ -1314,6 +1314,7 @@ const context = { findOnline, findBySfsId, sendItemList, + sendAvatarData, sendAvatarCreate, refreshForOthers, petFields, diff --git a/test/smoke.js b/test/smoke.js index c67d11c..54acf5c 100644 --- a/test/smoke.js +++ b/test/smoke.js @@ -336,6 +336,10 @@ const run = async () => { assert.deepStrictEqual(switched.slice(2, 4).concat(switched.slice(4, 8)), ["1", String(aliceId), aa[3], aa[4], "-1", "4"]); assert.strictEqual(switched[11], "15136|15224|15299"); assert.strictEqual((await c.nextXt("as")).length, switched.length + 7); + // The switch is followed by the animal's data and its full item list, so + // that the editor can open on the new animal (lib/avatars.js "as"). + assert.strictEqual((await a.nextXt("ad"))[2], "Alice"); + assert.strictEqual((await a.nextXt("il"))[2], "0"); a.xt("al", denId, "Alice"); assert.deepStrictEqual((await a.nextXt("al")).slice(5, 7), ["2", aa[3]]); a.xt("ak", denId, aa[3]); // cannot remove the animal in use