Fix two bugs related to the witch

FreeFangGame · Jul 3, 2023 · 59f3275 · 59f3275
1 parent 7d0ec90
commit 59f3275
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/freefang/models.py b/freefang/models.py
@@ -129,15 +129,15 @@ def kill_player(self, player, reason=None):
 		if player.protected:
 			return 1
 		print(player.name + " died")
-		player.alive = False
 
 
 		# If the player died during the night we keep it in a list to notify the other players when the day rises
 		# Otherwise we just send the packet right away
 		if self.up != 0 and self.up != Hunter:
 			self.nightdeaths.append(player)
 			return 0
-
+		player.alive = False
+
 
 		# Notify everyone that player died
 		event = packets.Player_death(name=player.name, role=player.role.__name__, reason=reason)

diff --git a/freefang/roles.py b/freefang/roles.py
@@ -177,7 +177,8 @@ def revive(headers, game, connection):
 			return 1
 	@staticmethod
 	def onwakeup(game):
-		event = utils.obj_to_json(packets.Witch_send_dead(game.nightdeaths))
+		dead = [i.name for i in game.nightdeaths]
+		event = utils.obj_to_json(packets.Witch_send_dead(dead))
 		game.sendrole(event, Witch)
 
 class Vote: