make sentry happy

helpers/adminhelper.py

@@ -128,6 +128,9 @@ async def delete_player_from_game(game: Union[SM5Game, LaserballGame], codename:
 
     # go through all events and delete them
 
+    if entity_start is None:
+        return
+
     async for event in game.events:
         arguments = event.arguments
         for info in arguments:
@@ -139,19 +142,19 @@ async def delete_player_from_game(game: Union[SM5Game, LaserballGame], codename:
 
         logger.debug("Deleting sm5stats")
 
-        id_ = (await SM5Stats.filter(entity__entity_id=entity_start.entity_id).first()).id
+        sm5_stats = (await SM5Stats.filter(entity__entity_id=entity_start.entity_id).first())
         try:
-            await SM5Stats.filter(id=id_).delete()
+            await SM5Stats.filter(id=sm5_stats.id).delete()
         except Exception:
             logger.warning("Failed to delete sm5stats, continuing")
     elif mode == "laserball":
         # delete laserballstats
 
         logger.debug("Deleting laserballstats")
 
-        id_ = (await LaserballGame.filter(entity__entity_id=entity_start.entity_id).first()).id
+        sm5_stats = (await LaserballGame.filter(entity__entity_id=entity_start.entity_id).first())
         try:
-            await LaserballGame.filter(id=id_).delete()
+            await LaserballGame.filter(id=sm5_stats.id).delete()
         except Exception:
             logger.warning("Failed to delete laserballstats, continuing")
     else:

helpers/tdfhelper.py

@@ -242,13 +242,13 @@ async def parse_sm5_game(file_location: str) -> SM5Game:
             # update player name if we have a new one and we have entity_id
             elif await Player.filter(entity_id=e.entity_id).exists() and (await Player.filter(entity_id=e.entity_id).first()).codename != e.name:
                 player = await Player.filter(entity_id=e.entity_id).first()
-                player.name = e.name
+                player.codename = e.name
                 player.player_id = db_member_id
                 await player.save()
             # update player_id if we have entity_id and don't have player_id
             elif await Player.filter(entity_id=e.entity_id).exists() and (await Player.filter(entity_id=e.entity_id).first()).player_id == "":
                 player = await Player.filter(entity_id=e.entity_id).first()
-                player.player_id = member_id
+                player.player_id = db_member_id
                 await player.save()
             # create new player if we don't have a name or entity_id
             elif not await Player.filter(codename=e.name).exists() and not await Player.filter(entity_id=e.entity_id).exists():