4 files changed, 9 insertions, 11 deletions
diff --git a/lib/sumo.js b/lib/sumo.js
index f353fe0..603937b 100644
--- a/lib/sumo.js
+++ b/lib/sumo.js
@@ -1,5 +1,3 @@
-import 'babel-polyfill';
-
 import Config from './config';
 
 // Systems
diff --git a/lib/systems/detect_points_collision.js b/lib/systems/detect_points_collision.js
index 21e6dad..7b44ebd 100644
--- a/lib/systems/detect_points_collision.js
+++ b/lib/systems/detect_points_collision.js
@@ -1,5 +1,5 @@
 import { System } from '@serpentity/serpentity';
-import { SAT } from 'matter-js';
+import { Collision } from 'matter-js';
 
 import BodyComponent from '../components/body';
 import PointsColliderNode from '../nodes/points_collider';
@@ -84,8 +84,8 @@ export default class DetectPointsCollisionSystem extends System {
       const pointsTarget = collider.pointsCollider.pointsTarget;
 
       if (collisionTargetBody) {
-        const collision = SAT.collides(collider.body.body, collisionTargetBody.body);
-        if (collision.collided) {
+        const collision = Collision.collides(collider.body.body, collisionTargetBody.body);
+        if (collision && collision.collided) {
           points[pointsTarget] = (points[pointsTarget] || 0) + 1;
         }
       }
diff --git a/lib/systems/physics_world_control.js b/lib/systems/physics_world_control.js
index 88c60e4..4ba4ec1 100644
--- a/lib/systems/physics_world_control.js
+++ b/lib/systems/physics_world_control.js
@@ -59,20 +59,20 @@ export default class PhysicsWorldControlSystem extends System {
     this.physicalEntities = engine.getNodes(PhysicalNode);
     this.grabAreaEntities = engine.getNodes(GrabAreaNode);
 
-    this.physicalEntities.on('nodeAdded', (event) => {
+    this.physicalEntities.addEventListener('nodeAdded', (event) => {
 
       World.add(this.engine.world, [event.node.body.body]);
     });
-    this.physicalEntities.on('nodeRemoved', (event) => {
+    this.physicalEntities.addEventListener('nodeRemoved', (event) => {
 
       World.remove(this.engine.world, [event.node.body.body]);
     });
 
-    this.grabAreaEntities.on('nodeAdded', (event) => {
+    this.grabAreaEntities.addEventListener('nodeAdded', (event) => {
 
       World.add(this.engine.world, [event.node.grabArea.area]);
     });
-    this.grabAreaEntities.on('nodeRemoved', (event) => {
+    this.grabAreaEntities.addEventListener('nodeRemoved', (event) => {
 
       World.remove(this.engine.world, [event.node.grabArea.area]);
     });
diff --git a/lib/systems/render.js b/lib/systems/render.js
index 8bfa4bf..a0b4659 100644
--- a/lib/systems/render.js
+++ b/lib/systems/render.js
@@ -55,11 +55,11 @@ export default class RenderSystem extends System {
   added(engine) {
 
     this.renderables = engine.getNodes(RenderableNode);
-    this.renderables.on('nodeAdded', (event) => {
+    this.renderables.addEventListener('nodeAdded', (event) => {
 
       this.application.stage.addChild(event.node.container.container);
     });
-    this.renderables.on('nodeRemoved', (event) => {
+    this.renderables.addEventListener('nodeRemoved', (event) => {
 
       this.application.stage.removeChild(event.node.container.container);
     });