Skip to content

Commit 9b46eb5

Browse files
authored
Merge branch 'main' into text-area-resizable
2 parents 02469d2 + 602cfdd commit 9b46eb5

File tree

2 files changed

+14
-13
lines changed

2 files changed

+14
-13
lines changed

client/src/game/messageListener.tsx

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -422,19 +422,20 @@ export default function messageListener(packet: ToClientPacket){
422422
if(GAME_MANAGER.state.stateType === "game" && GAME_MANAGER.state.clientState.type === "player"){
423423
GAME_MANAGER.state.clientState.notes = packet.notes;
424424

425-
if(GAME_MANAGER.state.clientState.notes.length === 0){
426-
const myIndex = GAME_MANAGER.state.clientState.myIndex;
427-
const myRoleKey = `role.${GAME_MANAGER.state.clientState.roleState.type}.name`;
425+
// old default notes
426+
// if(GAME_MANAGER.state.clientState.notes.length === 0){
427+
// const myIndex = GAME_MANAGER.state.clientState.myIndex;
428+
// const myRoleKey = `role.${GAME_MANAGER.state.clientState.roleState.type}.name`;
428429

429-
GAME_MANAGER.sendSaveNotesPacket([
430-
"Claims\n" +
431-
GAME_MANAGER.state.players
432-
.map(player =>
433-
`@${player.index + 1} - ${player.index === myIndex ? translate(myRoleKey) : ''}\n`
434-
)
435-
.join('')
436-
]);
437-
}
430+
// GAME_MANAGER.sendSaveNotesPacket([
431+
// "Claims\n" +
432+
// GAME_MANAGER.state.players
433+
// .map(player =>
434+
// `@${player.index + 1} - ${player.index === myIndex ? translate(myRoleKey) : ''}\n`
435+
// )
436+
// .join('')
437+
// ]);
438+
// }
438439
}
439440
break;
440441
case "yourCrossedOutOutlines":

client/src/menu/game/gameScreenContent/WillMenu.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ export default function WillMenu(): ReactElement {
5656
GAME_MANAGER.sendSaveWillPacket(text);
5757
}}
5858
/>
59-
{notes.map((note, i) => {
59+
{(notes.length === 0 ? [""] : notes).map((note, i) => {
6060
const title = note.split('\n')[0] || translate("menu.will.notes");
6161
return <TextDropdownArea
6262
key={title + i}

0 commit comments

Comments
 (0)