repo: janusweb
action: commit
revision: 
path_from: 
revision_from: 4eb64b2cff8aa1273010c30f8098130b8dcf49b2:
path_to: 
revision_to: 

commit 4eb64b2cff8aa1273010c30f8098130b8dcf49b2
Author: James Baicoianu 
Date:   Wed Apr 1 11:16:06 2020 -0700

    Don't dispatch collide event for triggers

diff --git a/scripts/janusbase.js b/scripts/janusbase.js

--- a/scripts/janusbase.js
+++ b/scripts/janusbase.js
@@ -734,8 +734,10 @@ elation.require(['engine.things.generic', 'utils.template', 'janusweb.parts'], f
             this.dispatchEvent({type: 'trigger', data: { collision: ev.data, other: proxy }});
             ev.preventDefault();
             ev.stopPropagation();
-          } else {
+          } else if (this.collidable) {
             this.dispatchEvent({type: 'collision', data: { collision: ev.data, other: proxy }});
+          } else {
+            ev.preventDefault();
           }
         } else {
           console.error('Collided with unknown object', this, other);

-----END OF PAGE-----