From 10c836fcbc4c124e79f3dc6cd6ebc546638324aa Mon Sep 17 00:00:00 2001
From: Cohee <titan0599@gmail.com>
Date: Mon, 19 Jun 2023 10:54:43 +0300
Subject: [PATCH] Fix removing world link from character

---
 public/script.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/public/script.js b/public/script.js
index 65ab8e5fb..da955d30a 100644
--- a/public/script.js
+++ b/public/script.js
@@ -4824,8 +4824,9 @@ export function select_selected_character(chid) {
     $("#renameCharButton").css("display", "");
     $('.open_alternate_greetings').data('chid', chid);
     $('#set_character_world').data('chid', chid);
-    const world = !!(characters[chid].data?.extensions?.world);
-    $('#set_character_world').toggleClass('world_set', world && world_names.includes(world));
+    const world = characters[chid]?.data?.extensions?.world;
+    const worldSet = world && world_names.includes(world);
+    $('#set_character_world').toggleClass('world_set', worldSet);
 
     $("#form_create").attr("actiontype", "editcharacter");
     saveSettingsDebounced();
@@ -5263,7 +5264,7 @@ function openCharacterWorldPopup() {
 
     function onSelectCharacterWorld() {
         const value = $(this).find('option:selected').val();
-        const worldIndex = Number(value);
+        const worldIndex = value !== '' ? Number(value) : NaN;
         const name = !isNaN(worldIndex) ? world_names[worldIndex] : '';
 
         $('#character_world').val(name);
@@ -7285,7 +7286,7 @@ $(document).ready(function () {
     });
 
     /*     $("#dupe_button").click(async function () {
-    
+
             const body = { avatar_url: characters[this_chid].avatar };
             const response = await fetch('/dupecharacter', {
                 method: 'POST',