From 60cbb85ade595eed6e55430a8120c2d723a29f73 Mon Sep 17 00:00:00 2001
From: stonedDiscord <Tukz@gmx.de>
Date: Sun, 22 May 2022 12:58:21 +0200
Subject: fix female blips

---
 webAO/client.ts | 34 +++++++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 11 deletions(-)

(limited to 'webAO')

diff --git a/webAO/client.ts b/webAO/client.ts
index 12b4197..e9c413f 100644
--- a/webAO/client.ts
+++ b/webAO/client.ts
@@ -706,21 +706,33 @@ class Client extends EventEmitter {
       let char_chatbox = 'default';
       let char_muted = false;
 
+      if (this.chars[char_id].name !== char_name) {
+        console.info(`${this.chars[char_id].name} is iniediting to ${char_name}`);
+        const chargs = (`${char_name}&` + 'iniediter').split('&');
+        this.handleCharacterInfo(chargs, char_id);
+      }
+
+      try {
+        msg_nameplate = this.chars[char_id].showname;        
+      } catch (e) {
+        msg_nameplate = args[3];
+      }
+
       try {
-        msg_nameplate = this.chars[char_id].showname;
         msg_blips = this.chars[char_id].blips;
-        char_chatbox = this.chars[char_id].chat;
-        char_muted = this.chars[char_id].muted;
+      } catch (e) {
+        ;
+      }
 
-        if (this.chars[char_id].name !== char_name) {
-          console.info(`${this.chars[char_id].name} is iniediting to ${char_name}`);
-          const chargs = (`${char_name}&` + 'iniediter').split('&');
-          this.handleCharacterInfo(chargs, char_id);
-        }
+      try {
+        char_chatbox = this.chars[char_id].chat;
       } catch (e) {
-        msg_nameplate = args[3];
-        msg_blips = 'male';
         char_chatbox = 'default';
+      }
+
+      try {
+        char_muted = this.chars[char_id].muted;
+      } catch (e) {
         char_muted = false;
         console.error("we're still missing some character data");
       }
@@ -980,7 +992,7 @@ class Client extends EventEmitter {
         muted: false,
       };
 
-      if (this.chars[charid].blips === '') { this.chars[charid].blips = this.chars[charid].gender; }
+      if (this.chars[charid].blips === 'male' && this.chars[charid].gender !== 'male' && this.chars[charid].gender !== '') { this.chars[charid].blips = this.chars[charid].gender; }
 
       const iniedit_select = <HTMLSelectElement>document.getElementById('client_ininame');
       iniedit_select.add(new Option(safeTags(chargs[0])));
-- 
cgit