Merge pull request #160 from entrylabs/issue/#1924

issue #1924 fix
entrylabs · Feb 2, 2016 · 066de2a · 066de2a
2 parents 177a2de + 58fcfbb
commit 066de2a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/dist/entry.js b/dist/entry.js
@@ -2779,7 +2779,7 @@ Entry.block.reach_something = function(a, b) {
       }
       for (var c = c.parent.clonedEntities, e = 0, g = c.length;e < g;e++) {
         var h = c[e];
-        if (h.getVisible() && !h.isStamp && Entry.checkCollisionRect(d, h.object.getTransformedBounds())) {
+        if (!h.isStamp && h.getVisible() && Entry.checkCollisionRect(d, h.object.getTransformedBounds())) {
           return !0;
         }
       }
@@ -2790,7 +2790,7 @@ Entry.block.reach_something = function(a, b) {
       c = c.parent.clonedEntities;
       e = 0;
       for (g = c.length;e < g;e++) {
-        if (h = c[e], h.getVisible() && !h.isStamp && f(d, h.object, .2, !0)) {
+        if (h = c[e], !h.isStamp && h.getVisible() && f(d, h.object, .2, !0)) {
           return !0;
         }
       }

diff --git a/dist/entry.min.js b/dist/entry.min.js
diff --git a/src/blocks/block_judgement.js b/src/blocks/block_judgement.js
@@ -102,7 +102,9 @@ Entry.block.reach_something = function (sprite, script) {
             var clonedEntities = targetSprite.parent.clonedEntities;
             for (var i=0, len=clonedEntities.length; i<len; i++) {
                 var entity = clonedEntities[i];
-                if (!entity.getVisible() || entity.isStamp)
+                if(entity.isStamp)
+                    continue;
+                if (!entity.getVisible())
                     continue;
                 if (Entry.checkCollisionRect(bound, entity.object.getTransformedBounds()))
                     return true;
@@ -114,7 +116,9 @@ Entry.block.reach_something = function (sprite, script) {
             var clonedEntities = targetSprite.parent.clonedEntities;
             for (var i=0, len=clonedEntities.length; i<len; i++) {
                 var entity = clonedEntities[i];
-                if (!entity.getVisible() || entity.isStamp)
+                if(entity.isStamp)
+                    continue;
+                if (!entity.getVisible())
                     continue;
                 if (collision(object,entity.object,ath,true))
                     return true;