Leahnaya/pokemon-showdown
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown.git synced 2026-09-10 10:15:37 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix tour format reporting (#5609)

Browse Source
This commit is contained in:
whales
2019-07-15 16:22:14 +00:00
committed by Guangcong Luo
parent 551bc33b30
commit 82a666cc0e
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/tournaments/index.js
View File

@@ -124,6 +124,7 @@ class Tournament extends Rooms.RoomGame {
this.isEnded = false;
room.add(`|tournament|create|${this.name}|${generator.name}|${this.playerCap}`);
/** @type {{format: string, teambuilderFormat?: string, generator: string, playerCap: number, isStarted: boolean, isJoined: boolean}} */
const update = {
format: this.name,
generator: generator.name,
@@ -131,6 +132,7 @@ class Tournament extends Rooms.RoomGame {
isStarted: false,
isJoined: false,
};
if (this.name !== this.baseFormat) update.teambuilderFormat = this.baseFormat;
room.send(`|tournament|update|${JSON.stringify(update)}`);
this.update();
}
@@ -249,7 +251,7 @@ class Tournament extends Rooms.RoomGame {
return;
}
const isJoined = targetUser.userid in this.playerTable;
/** @type {{format: string, generator: string, isStarted: boolean, isJoined: boolean, bracketData: string, teambuilderFormat?: string}} */
/** @type {{format: string, teambuilderFormat?: string, generator: string, isStarted: boolean, isJoined: boolean, bracketData: AnyObject}} */
const update = {
format: this.name,
generator: this.generator.name,
@@ -1765,8 +1767,8 @@ const chatCommands = {
/** @type {Tournament | undefined} */
let tour = createTournament(room, params.shift(), params.shift(), params.shift(), Config.ratedtours, params.shift(), params.shift(), this);
if (tour) {
this.privateModAction(`(${user.name} created a tournament in ${tour.name} format.)`);
this.modlog('TOUR CREATE', null, tour.name);
this.privateModAction(`(${user.name} created a tournament in ${tour.baseFormat} format.)`);
this.modlog('TOUR CREATE', null, tour.baseFormat);
if (room.tourAnnouncements) {
let tourRoom = Rooms.search(Config.tourroom || 'tournaments');
if (tourRoom && tourRoom !== room) tourRoom.addRaw(`<div class="infobox"><a href="/${room.id}" class="ilink"><strong>${Chat.escapeHTML(Dex.getFormat(tour.name).name)}</strong> tournament created in <strong>${Chat.escapeHTML(room.title)}</strong>.</a></div>`).update();