Fix error when leaving and joining game after sending chat messages

3 files changed, 9 insertions, 10 deletions

diff --git a/client/game.gd b/client/game.gd
index 10e3fa0c..7a5e30db 100644
--- a/client/game.gd
+++ b/client/game.gd
@@ -219,8 +219,9 @@ func _ready():
 	mp.text_message.connect(func(player: int, text: String, timeout_initial: float, timeout_remaining: float):
 		var p: Player = players[player]
 		p.text_message(text, timeout_initial, timeout_remaining)
-		text_message.emit(player, text, timeout_initial, timeout_remaining)
-		text_message_history.append([player, text])
+		var username: String = players[player].username
+		text_message.emit(username, text, timeout_initial, timeout_remaining)
+		text_message_history.append([username, text])
 	)
 
 	mp.item_message.connect(func(player: int, item: int, timeout_initial: float, timeout_remaining: float):
diff --git a/client/menu/chat/chat_open.gd b/client/menu/chat/chat_open.gd
index f5b93adf..576568ee 100644
--- a/client/menu/chat/chat_open.gd
+++ b/client/menu/chat/chat_open.gd
@@ -29,8 +29,8 @@ func _ready() -> void:
 		add_message(i[0], i[1])
 	
 	game.text_message.connect(
-		func message(player: int, text: String, _timeout_initial: float, _timeout_remaining: float):
-			add_message(player, text)
+		func message(username: String, text: String, _timeout_initial: float, _timeout_remaining: float):
+			add_message(username, text)
 	)
 
 func _input(event: InputEvent) -> void:
@@ -40,8 +40,7 @@ func _input(event: InputEvent) -> void:
 		exit()
 	super(event)
 
-func add_message(player: int, message: String):
-	var username: String = game.players[player].username
+func add_message(username: String, message: String):
 	var chat_message: ChatMessage = CHAT_MESSAGE_SCENE.instantiate()
 	messages_container.add_child(chat_message)
 	chat_message.set_message("<%s>" % username, message)
diff --git a/client/menu/chat/chat_preview.gd b/client/menu/chat/chat_preview.gd
index 934af0b2..7f8212b5 100644
--- a/client/menu/chat/chat_preview.gd
+++ b/client/menu/chat/chat_preview.gd
@@ -23,12 +23,11 @@ const CHAT_MESSAGE_SCENE = preload("res://menu/chat/chat_message.tscn")
 
 func _ready():
 	game.text_message.connect(
-		func message(player: int, text: String, timeout_initial: float, timeout_remaining: float):
-			add_message(player, text, timeout_remaining)
+		func message(username: String, text: String, _timeout_initial: float, timeout_remaining: float):
+			add_message(username, text, timeout_remaining)
 	)
 
-func add_message(player: int, message: String, time: float):
-	var username: String = game.players[player].username
+func add_message(username: String, message: String, time: float):
 	var chat_message: ChatMessage = CHAT_MESSAGE_SCENE.instantiate()
 	messages_container.add_child(chat_message)
 	chat_message.set_message("<%s>" % username, message, true, time)