diff --git a/Plugins/WPSGardenSystem/garden_plugin_base.py b/Plugins/WPSGardenSystem/garden_plugin_base.py index 660ad96..4fbf80b 100644 --- a/Plugins/WPSGardenSystem/garden_plugin_base.py +++ b/Plugins/WPSGardenSystem/garden_plugin_base.py @@ -527,12 +527,14 @@ class WPSGardenBase(WPSAPI): remaining = plot["remaining_fruit"] theft_users = len(json.loads(plot["theft_users"])) if plot.get("theft_users") else 0 trap_info = "" - if show_trap and plot.get("trap_item_id"): - trap_durability = int(plot.get("trap_durability", 0)) - from .garden_models import GARDEN_TRAPS_DICT - trap = GARDEN_TRAPS_DICT.get(plot["trap_item_id"]) - if trap: - trap_info = f"|陷阱:{trap.display_name}({trap_durability}次)" + if show_trap: + trap_item_id = plot.get("trap_item_id") + if trap_item_id and isinstance(trap_item_id, str) and trap_item_id.strip(): + trap_durability = int(plot.get("trap_durability", 0)) + from .garden_models import GARDEN_TRAPS_DICT + trap = GARDEN_TRAPS_DICT.get(trap_item_id) + if trap: + trap_info = f"|陷阱:{trap.display_name}({trap_durability}次)" status = f"✅ 已成熟(成熟于 {formatted_time})" lines.append( f"- 地块 {idx}|{name}|{status}|剩余果实 {remaining}|被偷次数 {theft_users}{trap_info}"