[Client] Don't show our traps

2 files changed, 8 insertions, 1 deletions

@@ -312,6 +312,10 @@ func parse_printjson_for_textclient(message):
 func _process_location_scout(item_id, location_id, player, flags):
         _location_scouts[location_id] = {"item": item_id, "player": player, "flags": flags}
 
+        if player == client._slot and flags & 4 != 0:
+                # This is a trap for us, so let's not display it.
+                return
+
         var gamedata = global.get_node("Gamedata")
         var map_id = gamedata.map_id_by_name.get(global.map)
 
@@ -97,7 +97,10 @@ func _ready():
                         != ap.kLETTER_BEHAVIOR_VANILLA
                 ):
                         var scout = ap.scout_location(letter.get_ap_id())
-                        if scout != null:
+                        if (
+                                scout != null
+                                and not (scout["player"] == ap.client._slot and scout["flags"] & 4 != 0)
+                        ):
                                 var item_name = "Unknown"
                                 var item_player_game = ap.client._game_by_player[float(scout["player"])]
                                 if ap.client._item_id_to_name[item_player_game].has(scout["item"]):