From af3fd180ca5b505067aac16f533a952b81c86f86 Mon Sep 17 00:00:00 2001
From: Rares Bozga <darwj10011@gmail.com>
Date: Sun, 29 Mar 2026 23:29:43 +0300
Subject: [PATCH] Fix various Storyboard problems.

---
 .../liteprofilesutils/liteprofilesutils_world.dsc    |  2 +-
 scripts/misc/compatibility_check.dsc                 |  2 +-
 scripts/phones/phones_tasks.dsc                      | 12 ++++++++----
 scripts/storyboard/tasks/storyboard_npc_tasks.dsc    |  2 ++
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/scripts/liteprofilesutils/liteprofilesutils_world.dsc b/scripts/liteprofilesutils/liteprofilesutils_world.dsc
index 29963d9..e096deb 100644
--- a/scripts/liteprofilesutils/liteprofilesutils_world.dsc
+++ b/scripts/liteprofilesutils/liteprofilesutils_world.dsc
@@ -105,4 +105,4 @@ liteprofilesutils_world:
         - define master <proc[liteprofilesutils_get_master_uuid].context[<player[<[uuid]>]>]>
         - if <[master]> == <[uuid]>:
             - stop
-        - adjust <player[<[uuid]>]> whitelisted:<player[<[master]>].is_whitelisted>
+        - adjust <player[<[uuid]>]> whitelisted:<player[<[master]>].whitelisted>
diff --git a/scripts/misc/compatibility_check.dsc b/scripts/misc/compatibility_check.dsc
index 5fabea1..435c89f 100644
--- a/scripts/misc/compatibility_check.dsc
+++ b/scripts/misc/compatibility_check.dsc
@@ -22,7 +22,7 @@ compatibility_check_world:
         after player joins:
         - if <proc[settings_get].context[<player>|general_ignore_version_compatibility_check]>:
             - stop
-        - define player_version <player.viaversion_version>
+        - define player_version <player.viaversion_version.split[-].get[1].if_null[<player.viaversion_version>]>
         - define server_version <server.version.split[(].get[2].split[:].get[2].split[)].get[1].trim>
         - if <proc[compatibility_check_compare_versions].context[<[player_version]>|<[server_version]>]> == -1:
             - wait 5s
diff --git a/scripts/phones/phones_tasks.dsc b/scripts/phones/phones_tasks.dsc
index ca4b295..d585838 100644
--- a/scripts/phones/phones_tasks.dsc
+++ b/scripts/phones/phones_tasks.dsc
@@ -23,6 +23,8 @@ phones_has_phone:
     script:
     - if !<[player].is_online>:
         - determine false
+    - if <[player].inventory.title.contains[鄀].if_null[false]>:
+        - determine true
     - foreach <[player].inventory.map_slots> key:slot as:item:
         - if <[item].flag[phones].if_null[false]>:
             - determine true
@@ -262,7 +264,9 @@ phones_gui_texts:
     definitions: player|page
     script:
     - define inventory <inventory[generic[size=54;title=<&f>邑邑邑邑鄀<&1>邒]]>
-    - define textslist <util.list_files[data/phones/texts].filter[starts_with[<player.uuid>]].parse[split[_].get[2].split[.].get[1]].parse_tag[<player[<[parse_value]>]>].get[<[page].mul[16].add[1]>].to[<[page].add[1].mul[16]>].if_null[<list[]>]>
+    - define texts <util.list_files[data/phones/texts].filter[starts_with[<player.uuid>]].parse[split[_].get[2].split[.].get[1]].parse_tag[<player[<[parse_value]>]>].if_null[<list[]>]>
+    - define textslist <[texts].get[<[page].mul[15].add[1]>].to[<[page].add[1].mul[15]>].if_null[<list[]>]>
+    - define textssize <[texts].size>
     # show contacts/numbers
     - foreach <[textslist]> as:target:
         - define receiver <proc[phones_relative_name].context[<[player]>|<[target]>]>
@@ -289,7 +293,7 @@ phones_gui_texts:
         - define prevpage <item[ender_pearl]>
         - adjust def:prevpage "display:<&a>Previous Page"
         - inventory set destination:<[inventory]> slot:49 origin:<[prevpage]>
-    - if <[textslist].size> > <[page].add[1].mul[16]>:
+    - if <[textssize]> > <[page].add[1].mul[15]>:
         - define nextpage <item[ender_eye]>
         - adjust def:nextpage "display:<&a>Next Page"
         - inventory set destination:<[inventory]> slot:51 origin:<[nextpage]>
@@ -413,7 +417,7 @@ phones_gui_settings_blocked:
     definitions: player|page
     script:
     - define inventory <inventory[generic[size=54;title=<&f>邑邑邑邑鄀<&5>邒]]>
-    - define blockedlist <[player].flag[phones].get[blocked].get[<[page].mul[16].add[1]>].to[<[page].add[1].mul[16]>].if_null[<list[]>]>
+    - define blockedlist <[player].flag[phones].get[blocked].get[<[page].mul[15].add[1]>].to[<[page].add[1].mul[15]>].if_null[<list[]>]>
     # show blocked numbers
     - foreach <[blockedlist]> as:target:
         - define blockednumber <proc[phones_nicer_format].context[<[target].flag[phones].get[number]>]>
@@ -431,7 +435,7 @@ phones_gui_settings_blocked:
         - define prevpage <item[ender_pearl]>
         - adjust def:prevpage "display:<&a>Previous Page"
         - inventory set destination:<[inventory]> slot:49 origin:<[prevpage]>
-    - if <[blockedlist].size> > <[page].add[1].mul[16]>:
+    - if <[blockedlist].size> > <[page].add[1].mul[15]>:
         - define nextpage <item[ender_eye]>
         - adjust def:nextpage "display:<&a>Next Page"
         - inventory set destination:<[inventory]> slot:51 origin:<[nextpage]>
diff --git a/scripts/storyboard/tasks/storyboard_npc_tasks.dsc b/scripts/storyboard/tasks/storyboard_npc_tasks.dsc
index 04dfaa3..2e5615b 100644
--- a/scripts/storyboard/tasks/storyboard_npc_tasks.dsc
+++ b/scripts/storyboard/tasks/storyboard_npc_tasks.dsc
@@ -263,6 +263,8 @@ storyboard_npc_internal_auto_display_entities:
             - define registry registry_<[target].uuid>
             - define npcs <server.npcs[<[registry]>].if_null[<list[]>]>
             - foreach <[npcs]> as:npc:
+                - if !<[npc].is_spawned>:
+                    - foreach next
                 - adjust <player> hide_entity:<[npc]>
                 - foreach <[npc].hologram_npcs.if_null[<list[]>]> as:hologram:
                     - adjust <player> hide_entity:<[hologram]>