From d546a49927a50ef1dd6fcde3bd25f86cde51ebbb Mon Sep 17 00:00:00 2001 From: tpart Date: Sat, 27 Sep 2025 20:41:51 +0200 Subject: Fix crash when item message is cleared --- client/game.gd | 4 +++- client/player/player.gd | 11 +++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) (limited to 'client') diff --git a/client/game.gd b/client/game.gd index 9117be18..020c43db 100644 --- a/client/game.gd +++ b/client/game.gd @@ -270,7 +270,9 @@ func handle_packet(p): var player: Player = players[p.player] if player.is_customer and player.current_item_message != null: tutorial_queue.erase(player.current_item_message) - player.clear_message() + player.clear_text_message() + player.clear_item_message() + player.clear_effect() overlay_pinned_messages.clear_item(p.player) "effect": players[p.player].effect_message(p.name) diff --git a/client/player/player.gd b/client/player/player.gd index c5ee0d89..94034352 100644 --- a/client/player/player.gd +++ b/client/player/player.gd @@ -192,8 +192,9 @@ func item_message(item_name: String, timeout_initial: float, timeout_remaining: current_item_message = item_name func clear_item_message(): - current_item_message = null - item_bubble.queue_free() + if item_bubble != null: + current_item_message = null + item_bubble.queue_free() func text_message(message: Game.TextMessage): if chat_bubble != null: @@ -204,7 +205,8 @@ func text_message(message: Game.TextMessage): clear_chat_timer.start(message.timeout_remaining) func clear_text_message(): - chat_bubble.queue_free() + if chat_bubble != null: + chat_bubble.queue_free() func effect_message(effect_name: String): if effect != null: @@ -215,4 +217,5 @@ func effect_message(effect_name: String): clear_effect_timer.start(5) func clear_effect(): - effect.queue_free() + if effect != null: + effect.queue_free() -- cgit v1.2.3-70-g09d2