gah

Author: sunnniee

src/commands/fixgame.ts

@@ -75,6 +75,8 @@ export const cmd = {
             else if (Object.values(game.cards).some(c => Object.keys(cardArrayToCount(c)).length > 48)) {
                 const badPlayer = Object.entries(game.cards).find(c => Object.keys(cardArrayToCount(c[1])).length > 48)![0];
                 game.players.splice(game.players.indexOf(badPlayer), 1);
+                delete game.cards[badPlayer];
+                game.playersWhoLeft.push(badPlayer);
                 respond(msg, `Removed **${getUsername(badPlayer, true, msg.guild)}**`);
 
                 if (game.players.length <= 1) return;

src/components.ts

@@ -103,6 +103,9 @@ export function PickCardSelect(game: UnoGame<true>, id: string, canSkip = false)
 
     if (entries.length > 50) {
         game.players.splice(game.players.indexOf(id), 1);
+        delete game.cards[id];
+        game.playersWhoLeft.push(id);
+
         sendMessage(game.channelID, `Removed **${getUsername(id, true, client.guilds.get(game.guildID))}**`);
         if (game.players.length <= 1) return;
         if (game.currentPlayer === id) {

src/gameLogic/index.ts

@@ -28,6 +28,8 @@ export function onTimeout(game: UnoGame<true>, player: string) {
     game.currentPlayer = next(game.players, game.players.indexOf(player));
     if (game.settings.kickOnTimeout) {
         game.players.splice(game.players.indexOf(player), 1);
+        delete game.cards[player];
+        game.playersWhoLeft.push(player);
     }
 
     sendMessage(game.channelID,

src/gameLogic/notStarted.ts

@@ -115,8 +115,6 @@ export function startGame(game: UnoGame<false>, automatic: boolean) {
     const players = new Proxy(playerList, {
         deleteProperty(t, p: string) {
             delete t[p];
-            delete startedGame.cards[p];
-            startedGame.playersWhoLeft.push(p);
 
             startedGame._debug.pushState({
                 type: "delete-player",
@@ -140,6 +138,7 @@ won by default`,
                             .toJSON()
                     }), 50);
             }
+
             return true;
         },
     });

src/gameLogic/playedCards.ts

@@ -19,6 +19,8 @@ function isSabotage(ctx: ComponentInteraction<ComponentTypes.STRING_SELECT>, gam
 
     if (game.drawDuration >= maxDuration) {
         game.players.splice(game.players.indexOf(ctx.member.id), 1);
+        delete game.cards[ctx.member.id];
+        game.playersWhoLeft.push(ctx.member.id);
 
         sendMessage(ctx.channel.id, `Removed **${getUsername(game.lastPlayer.id, true, ctx.guild)}** for attempting to sabotage the game`);
         if (game.players.length <= 1) {
@@ -30,6 +32,7 @@ function isSabotage(ctx: ComponentInteraction<ComponentTypes.STRING_SELECT>, gam
 
         game.currentPlayer = next(game.players, game.players.indexOf(game.currentPlayer));
         game.lastPlayer.duration = 0;
+        sendGameMessage(game);
         return true;
     }
 

src/gameLogic/started.ts

@@ -14,6 +14,8 @@ import { makeDrawCardProxy } from "./notStarted.js";
 export function leaveGame(ctx: ComponentInteraction<ComponentTypes.BUTTON>, game: UnoGame<true>) {
     if (game.players.includes(ctx.member.id)) {
         game.players.splice(game.players.indexOf(ctx.member.id), 1);
+        delete game.cards[ctx.member.id];
+        game.playersWhoLeft.push(ctx.member.id);
         if (game.currentPlayer === ctx.member.id) game.currentPlayer = next(game.players, game.players.indexOf(game.currentPlayer));
 
         sendMessage(ctx.channel.id, `**${getUsername(ctx.member.id, true, ctx.guild)}** left the game.`);