Merge pull request #2038 from ktbee/cast-sprite-names-to-string

Cast sprite name to string before getSpriteTargetByName
scratchfoundation · Mar 8, 2019 · 19a4329 · 19a4329
2 parents fa3771b + c37745e
commit 19a4329
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 0 deletions.
diff --git a/src/blocks/scratch3_motion.js b/src/blocks/scratch3_motion.js
@@ -87,6 +87,7 @@ class Scratch3MotionBlocks {
             targetX = Math.round(stageWidth * (Math.random() - 0.5));
             targetY = Math.round(stageHeight * (Math.random() - 0.5));
         } else {
+            targetName = Cast.toString(targetName);
             const goToTarget = this.runtime.getSpriteTargetByName(targetName);
             if (!goToTarget) return;
             targetX = goToTarget.x;
@@ -127,6 +128,7 @@ class Scratch3MotionBlocks {
             util.target.setDirection(Math.round(Math.random() * 360) - 180);
             return;
         } else {
+            args.TOWARDS = Cast.toString(args.TOWARDS);
             const pointTarget = this.runtime.getSpriteTargetByName(args.TOWARDS);
             if (!pointTarget) return;
             targetX = pointTarget.x;

diff --git a/src/blocks/scratch3_sensing.js b/src/blocks/scratch3_sensing.js
@@ -191,6 +191,7 @@ class Scratch3SensingBlocks {
             targetX = util.ioQuery('mouse', 'getScratchX');
             targetY = util.ioQuery('mouse', 'getScratchY');
         } else {
+            args.DISTANCETOMENU = Cast.toString(args.DISTANCETOMENU);
             const distTarget = this.runtime.getSpriteTargetByName(
                 args.DISTANCETOMENU
             );
@@ -282,6 +283,7 @@ class Scratch3SensingBlocks {
         if (args.OBJECT === '_stage_') {
             attrTarget = this.runtime.getTargetForStage();
         } else {
+            args.OBJECT = Cast.toString(args.OBJECT);
             attrTarget = this.runtime.getSpriteTargetByName(args.OBJECT);
         }
 

diff --git a/src/sprites/rendered-target.js b/src/sprites/rendered-target.js
@@ -1,6 +1,7 @@
 const log = require('../util/log');
 const MathUtil = require('../util/math-util');
 const StringUtil = require('../util/string-util');
+const Cast = require('../util/cast');
 const Clone = require('../util/clone');
 const Target = require('../engine/target');
 const StageLayering = require('../engine/stage-layering');
@@ -840,6 +841,7 @@ class RenderedTarget extends Target {
      * @return {boolean} True iff touching a clone of the sprite.
      */
     isTouchingSprite (spriteName) {
+        spriteName = Cast.toString(spriteName);
         const firstClone = this.runtime.getSpriteTargetByName(spriteName);
         if (!firstClone || !this.renderer) {
             return false;

diff --git a/test/fixtures/execute/sprite-number-name.sb2 b/test/fixtures/execute/sprite-number-name.sb2