mirror of
https://github.com/burrow-dev/burrow-server.git
synced 2026-11-19 01:27:51 -05:00
Merge origin/main into moderator-tools
The built client is main's here; it is rebuilt from the merged sources. Co-Authored-By: Claude Opus 5.5 <[email protected]>
This commit is contained in:
commit
d09ee94e16
33 files changed
+649
-230
No files matched your search
+12
-12
@@ -82,7 +82,7 @@ module.exports = ({findOnline, players, watchers, sendItemList, blocks, setHideB
|
||||
item.on.push(avatar.avInvId);
|
||||
}
|
||||
}
|
||||
accounts.save();
|
||||
accounts.save(account);
|
||||
// ItemXtCommManager.itemsChangedListResponse, "3" = what is worn
|
||||
// changed: [3, inUse, perUserAvId, username, colour, onCount,
|
||||
// offCount, (invIdx, defId)..., offInvIdx...]
|
||||
@@ -134,7 +134,7 @@ module.exports = ({findOnline, players, watchers, sendItemList, blocks, setHideB
|
||||
}
|
||||
const items = wornItems(account, avatar).map(item => item.inv);
|
||||
account.outfits = [...account.outfits.filter(entry => entry !== existing), {name, items}];
|
||||
accounts.save();
|
||||
accounts.save(account);
|
||||
tell(session, `Outfit ${name} saved (${items.length} items).`);
|
||||
return;
|
||||
}
|
||||
@@ -155,7 +155,7 @@ module.exports = ({findOnline, players, watchers, sendItemList, blocks, setHideB
|
||||
return;
|
||||
}
|
||||
account.outfits = account.outfits.filter(entry => entry.name !== name);
|
||||
accounts.save();
|
||||
accounts.save(account);
|
||||
tell(session, `Outfit ${name} deleted.`);
|
||||
return;
|
||||
case "list":
|
||||
@@ -197,7 +197,7 @@ module.exports = ({findOnline, players, watchers, sendItemList, blocks, setHideB
|
||||
item.spots = item.spots || {};
|
||||
item.spots[account.activeDen] = {cat: spot.cat || 1, x: spot.x, y: spot.y, flip: spot.flip};
|
||||
}
|
||||
accounts.save();
|
||||
accounts.save(account);
|
||||
dens.sendDenItems(session);
|
||||
const room = session.room && session.room.denOwner === account ? session.room : null;
|
||||
for (const occupant of room ? room.sessions : []) {
|
||||
@@ -220,7 +220,7 @@ module.exports = ({findOnline, players, watchers, sendItemList, blocks, setHideB
|
||||
}
|
||||
const items = layoutOf(account);
|
||||
account.denLayouts = [...account.denLayouts.filter(entry => entry !== existing), {name, den: activeDenDef(account), items}];
|
||||
accounts.save();
|
||||
accounts.save(account);
|
||||
tell(session, `Den layout ${name} saved (${items.length} items).`);
|
||||
return;
|
||||
}
|
||||
@@ -269,7 +269,7 @@ module.exports = ({findOnline, players, watchers, sendItemList, blocks, setHideB
|
||||
}
|
||||
const missing = applyLayout(session, undo.items, false);
|
||||
account.denUndo = null;
|
||||
accounts.save();
|
||||
accounts.save(account);
|
||||
tell(session, missing ? `Your den is back as it was, apart from ${missing} items that are no longer yours.` : "Your den is back as it was.");
|
||||
return;
|
||||
}
|
||||
@@ -279,7 +279,7 @@ module.exports = ({findOnline, players, watchers, sendItemList, blocks, setHideB
|
||||
return;
|
||||
}
|
||||
account.denLayouts = account.denLayouts.filter(entry => entry.name !== name);
|
||||
accounts.save();
|
||||
accounts.save(account);
|
||||
tell(session, `Den layout ${name} deleted.`);
|
||||
return;
|
||||
case "list":
|
||||
@@ -376,7 +376,7 @@ module.exports = ({findOnline, players, watchers, sendItemList, blocks, setHideB
|
||||
const themes = require("../config.js").themes;
|
||||
if (action === "random" && (choice === "on" || choice === "off")) {
|
||||
account.randomTheme = choice === "on";
|
||||
accounts.save();
|
||||
accounts.save(account);
|
||||
tell(session, account.randomTheme ? "The lands get a look picked at random each time you log in." : "The lands keep the look you choose.");
|
||||
}
|
||||
else if (action === "here" && session.room && !session.room.denOwner && (choice === "off" || Object.hasOwn(themes, choice))) {
|
||||
@@ -386,7 +386,7 @@ module.exports = ({findOnline, players, watchers, sendItemList, blocks, setHideB
|
||||
else {
|
||||
account.roomThemes[session.room.base] = choice;
|
||||
}
|
||||
accounts.save();
|
||||
accounts.save(account);
|
||||
reloadRoom(session);
|
||||
}
|
||||
else if (action === "list") {
|
||||
@@ -406,7 +406,7 @@ module.exports = ({findOnline, players, watchers, sendItemList, blocks, setHideB
|
||||
}
|
||||
const before = account.ecards.length;
|
||||
account.ecards = account.ecards.filter(card => !card.read || card.gift);
|
||||
accounts.save();
|
||||
accounts.save(account);
|
||||
tell(session, `${before - account.ecards.length} read Jam-A-Grams deleted. Open your mail again to see.`);
|
||||
},
|
||||
|
||||
@@ -485,7 +485,7 @@ module.exports = ({findOnline, players, watchers, sendItemList, blocks, setHideB
|
||||
}
|
||||
else if (wanted.toLowerCase() === "off") {
|
||||
delete account.denNames[account.activeDen];
|
||||
accounts.save();
|
||||
accounts.save(account);
|
||||
tell(session, "This den has its usual name again.");
|
||||
}
|
||||
else if (isSilenced(account)) {
|
||||
@@ -496,7 +496,7 @@ module.exports = ({findOnline, players, watchers, sendItemList, blocks, setHideB
|
||||
}
|
||||
else {
|
||||
account.denNames[account.activeDen] = wanted;
|
||||
accounts.save();
|
||||
accounts.save(account);
|
||||
tell(session, `This den is now called ${wanted}. It shows the next time someone walks in.`);
|
||||
}
|
||||
},
|
||||
|
||||
Reference in new issue
Block a user