Lily/ClonesPlus, Lily/LooksPlus, Skyhigh173/json: editingTarget can b…

…e null (#1727) for example, extensions can be loaded while the project is still loading should resolve https://discordapp.com/channels/837024174865776680/1285154510527922186
TurboWarp · Oct 16, 2024 · 93983a2 · 93983a2
1 parent 33afff0
commit 93983a2
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/extensions/Lily/ClonesPlus.js b/extensions/Lily/ClonesPlus.js
@@ -643,11 +643,11 @@
     getSprites() {
       let spriteNames = [];
       const targets = Scratch.vm.runtime.targets;
-      const myself = Scratch.vm.runtime.getEditingTarget().sprite.name;
+      const editingTarget = Scratch.vm.runtime.getEditingTarget();
       for (let index = 1; index < targets.length; index++) {
-        const curTarget = targets[index].sprite;
-        let display = curTarget.name;
-        if (myself === curTarget.name) {
+        const curTarget = targets[index];
+        let display = curTarget.getName();
+        if (editingTarget === curTarget) {
           display = Scratch.translate({
             default: "myself",
             description: "Item in a dropdown that refers to the current sprite",
@@ -656,7 +656,7 @@
         if (targets[index].isOriginal) {
           const jsonOBJ = {
             text: display,
-            value: curTarget.name,
+            value: curTarget.getName(),
           };
           spriteNames.push(jsonOBJ);
         }

diff --git a/extensions/Lily/LooksPlus.js b/extensions/Lily/LooksPlus.js
@@ -583,12 +583,12 @@
     getSprites() {
       const spriteNames = [];
       const targets = Scratch.vm.runtime.targets;
-      const myself = Scratch.vm.runtime.getEditingTarget().getName();
+      const editingTarget = Scratch.vm.runtime.getEditingTarget();
       for (let index = 1; index < targets.length; index++) {
         const target = targets[index];
         if (target.isOriginal) {
           const targetName = target.getName();
-          if (targetName === myself) {
+          if (target === editingTarget) {
             spriteNames.unshift({
               text: "this sprite",
               value: targetName,

diff --git a/extensions/Skyhigh173/json.js b/extensions/Skyhigh173/json.js
@@ -565,10 +565,12 @@
     getLists() {
       const globalLists = Object.values(
         vm.runtime.getTargetForStage().variables
-      ).filter((x) => x.type == "list");
-      const localLists = Object.values(vm.editingTarget.variables).filter(
-        (x) => x.type == "list"
-      );
+      ).filter((x) => x.type === "list");
+      const localLists = vm.editingTarget
+        ? Object.values(vm.editingTarget.variables).filter(
+            (x) => x.type === "list"
+          )
+        : [];
       const uniqueLists = [...new Set([...globalLists, ...localLists])];
       if (uniqueLists.length === 0) {
         return [