Merge branch 'generate-fix' of https://github.com/HagenSR/byte_le_roy…

…ale_2022 into generate-fix
HagenSR · Jul 31, 2021 · 2436153 · 2436153
2 parents d0808ca + 2469345
commit 2436153
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/game/common/player.py b/game/common/player.py
@@ -46,4 +46,4 @@ def __str__(self):
             Team name: {self.team_name}
             Action: {self.action}
             """
-        return p
+        return p
diff --git a/game/engine.py b/game/engine.py
@@ -88,16 +88,14 @@ def boot(self):
                 # Add players one and two
                 ar = GameStats.player_stats["hitbox"][0]
                 hit = Hitbox(ar[0], ar[1], (ar[2], ar[3]))
-                player = Player(shooter = Shooter(hitbox=hit))
+                player = Player(shooter=Shooter(hitbox=hit))
                 self.clients.append(player)
             else:
                 ar = GameStats.player_stats["hitbox"][1]
                 hit = Hitbox(ar[0], ar[1], (ar[2], ar[3]))
                 player = Player(shooter=Shooter(hitbox=hit))
                 self.clients.append(player)
 
-
-
             # Verify client isn't using invalid imports or opening anything
             imports, opening = verify_code(filename + '.py')
             if len(imports) != 0:
@@ -178,7 +176,6 @@ def load(self):
         gameBoard = GameBoard()
         game_map = gameBoard.from_json(world['game_map'])
 
-
         # add game map object to dictionary
         world.pop("game_map", None)
         self.world["game_map"] = game_map