monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix player-options and weighted-options failing to validate settings if a payer's name is entirely numeric (#2496)

This commit is contained in:
Chris Wilson 2023-11-24 16:50:32 -05:00 committed by GitHub
parent 15797175c7
commit e64c7b1cbb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
WebHostLib/static/assets/player-options.js
View File

@ -463,7 +463,7 @@ const exportOptions = () => {
options['description'] = `Generated by https://archipelago.gg with the ${preset} preset.`;
}
if (!options.name || options.name.trim().length === 0) {
if (!options.name || options.name.toString().trim().length === 0) {
return showUserMessage('You must enter a player name!');
}
const yamlText = jsyaml.safeDump(options, { noCompatMode: true }).replaceAll(/'(\d+)':/g, (x, y) => `${y}:`);

8
WebHostLib/static/assets/weighted-options.js
View File

@ -210,7 +210,11 @@ class WeightedSettings {
let errorMessage = null;
// User must choose a name for their file
if (!settings.name || settings.name.trim().length === 0 || settings.name.toLowerCase().trim() === 'player') {
if (
!settings.name ||
settings.name.toString().trim().length === 0 ||
settings.name.toString().toLowerCase().trim() === 'player'
) {
userMessage.innerText = 'You forgot to set your player name at the top of the page!';
userMessage.classList.add('visible');
userMessage.scrollIntoView({
@ -256,7 +260,7 @@ class WeightedSettings {
// Remove empty arrays
else if (
['exclude_locations', 'priority_locations', 'local_items',
['exclude_locations', 'priority_locations', 'local_items',
'non_local_items', 'start_hints', 'start_location_hints'].includes(setting) &&
settings[game][setting].length === 0
) {