From ed9fa79a796dfab1f3e11b9d0382587fdb288de3 Mon Sep 17 00:00:00 2001
From: Marco <mgross@sw-gross.de>
Date: Sun, 19 May 2024 21:44:05 +0200
Subject: [PATCH] fix bug where chessbloc had wrong colors

---
 lib/chess_bloc/chess_bloc.dart    | 11 ++++++++---
 lib/chess_bloc/chess_events.dart  |  4 ++--
 lib/connection/ws_connection.dart |  2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/lib/chess_bloc/chess_bloc.dart b/lib/chess_bloc/chess_bloc.dart
index 43ec3d6..e9d1682 100644
--- a/lib/chess_bloc/chess_bloc.dart
+++ b/lib/chess_bloc/chess_bloc.dart
@@ -51,10 +51,12 @@ class ChessBloc extends Bloc<ChessEvent, ChessBoardState> {
 
   void flipBoard(ColorDetermined event, Emitter<ChessBoardState> emit) {
     log("My Color is $myColor");
-    myColor = event.myColor;
+
+    myColor = event.playerColor;
+
     emit(
       ChessBoardState(
-        event.myColor,
+        event.playerColor,
         state.newTurnColor,
         state.position,
         ChessMove.none(),
@@ -74,9 +76,12 @@ class ChessBloc extends Bloc<ChessEvent, ChessBoardState> {
           .recordMove(event.startSquare, event.endSquare, event.position);
     }
 
+    myColor = event.playerColor;
+    turnColor = event.turnColor;
+
     emit(
       ChessBoardState(
-        event.playerColor,
+        myColor,
         event.turnColor,
         event.position,
         move,
diff --git a/lib/chess_bloc/chess_events.dart b/lib/chess_bloc/chess_events.dart
index 2b8d873..c5a3e00 100644
--- a/lib/chess_bloc/chess_events.dart
+++ b/lib/chess_bloc/chess_events.dart
@@ -40,9 +40,9 @@ class InitBoard extends ChessEvent {
 }
 
 class ColorDetermined extends ChessEvent {
-  final ChessColor myColor;
+  final ChessColor playerColor;
 
-  ColorDetermined({required this.myColor});
+  ColorDetermined({required this.playerColor});
 }
 
 class InvalidMovePlayed extends ChessEvent {
diff --git a/lib/connection/ws_connection.dart b/lib/connection/ws_connection.dart
index bd94c71..33eaac8 100644
--- a/lib/connection/ws_connection.dart
+++ b/lib/connection/ws_connection.dart
@@ -119,7 +119,7 @@ class ServerConnection {
     ConnectionCubit.getInstance().opponentConnected();
     ChessBloc.getInstance().add(InitBoard());
     ChessBloc.getInstance().add(ColorDetermined(
-        myColor: ChessColor.fromApiColor(apiMessage.playerColor!)));
+        playerColor: ChessColor.fromApiColor(apiMessage.playerColor!)));
   }
 
   void handleInvalidMoveMessage(ApiWebsocketMessage apiMessage) {