From 6c54b3596b74c9b9ce0cfd5f27a3a697866dc544 Mon Sep 17 00:00:00 2001
From: PinkSwitch <52474902+PinkSwitch@users.noreply.github.com>
Date: Wed, 26 Jun 2024 06:19:16 -0500
Subject: [PATCH] Yoshi's Island: Fix client giving victory randomly (#3586)

* Create d

* Create d

* Delete worlds/mariomissing/d

* Delete mariomissing directory

* Create d

* Add files via upload

* Delete worlds/mariomissing/d

* Delete worlds/mariomissing directory

* Add files via upload

* Delete worlds/sai2 directory

* fix dumb client bug
---
 worlds/yoshisisland/Client.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/worlds/yoshisisland/Client.py b/worlds/yoshisisland/Client.py
index 98b0ff1a8c90..9b9e0ff52b87 100644
--- a/worlds/yoshisisland/Client.py
+++ b/worlds/yoshisisland/Client.py
@@ -87,9 +87,7 @@ async def game_watcher(self, ctx: "SNIContext") -> None:
 
         if game_mode is None:
             return
-        elif goal_flag[0] != 0x00:
-            await ctx.send_msgs([{"cmd": "StatusUpdate", "status": ClientStatus.CLIENT_GOAL}])
-            ctx.finished_game = True
+
         elif game_mode[0] not in VALID_GAME_STATES:
             return
         elif item_received[0] > 0x00:
@@ -101,6 +99,10 @@ async def game_watcher(self, ctx: "SNIContext") -> None:
             ctx.rom = None
             return
 
+        if goal_flag[0] != 0x00:
+            await ctx.send_msgs([{"cmd": "StatusUpdate", "status": ClientStatus.CLIENT_GOAL}])
+            ctx.finished_game = True
+
         new_checks = []
         from .Rom import location_table