Fix merge (#46)

* Fix Merge
JeanAEckelberg · May 27, 2023 · 90ca0d2 · 90ca0d2
1 parent 812176f
commit 90ca0d2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/game/controllers/master_controller.py b/game/controllers/master_controller.py
@@ -118,10 +118,7 @@ def turn_logic(self, clients: list[Player], turn):
                     self.movement_controller.handle_actions(client.actions[i], client, self.current_world_data["game_board"])
                 except IndexError:
                     pass
-                try:
-                    self.interact_controller.handle_actions(client.actions[i], client, self.current_world_data["game_board"])
-                except IndexError:
-                    pass
+
         # checks event logic at the end of round
         # self.handle_events(clients)
 

diff --git a/requirements.txt b/requirements.txt
@@ -0,0 +1,4 @@
+tqdm~=4.65.0
+pygame~=2.3.0
+numpy~=1.24.2
+Pillow~=9.5.0