Merge branch 'hotfix/3.0.2'

[rbdr/serpentity] / lib / serpentity / entity.js

diff --git a/lib/serpentity/entity.js b/lib/serpentity/entity.js
index add823e422fdf1a831ff40759e5dcaa686f6b14d..e84b0cc43187e87b87eda92704bcd0d00e00e043 100644 (file)
--- a/lib/serpentity/entity.js
+++ b/lib/serpentity/entity.js
@@ -1,18 +1,15 @@
-'use strict';
-
-/* global Serpentity */
-
 /*
  * The entity gives the entity framework its name. It exists only
  * to hold components.
  */
 
-let Entity = class Entity {
-  constructor (config) {
+export class Entity {
+  constructor(config) {
+
     this._componentKeys = [];
     this._components = [];
 
-    Object.assign(this, config || {});
+    Object.assign(this, config);
   }
 
   /*
@@ -20,10 +17,12 @@ let Entity = class Entity {
    *
    * returns true if added, false if already present
    */
-  addComponent (component) {
+  addComponent(component) {
+
     if (this._componentKeys.indexOf(component.constructor) >= 0) {
       return false;
     }
+
     this._componentKeys.push(component.constructor);
     this._components.push(component);
     return true;
@@ -32,26 +31,23 @@ let Entity = class Entity {
   /*
    * returns true if component is included, false otherwise
    */
-  hasComponent (componentClass) {
+  hasComponent(componentClass) {
+
     if (this._componentKeys.indexOf(componentClass) >= 0) {
       return true;
     }
+
     return false;
   }
 
   /*
    * returns the component associated with that key
    */
-  getComponent (componentClass) {
-    let position = this._componentKeys.indexOf(componentClass);
+  getComponent(componentClass) {
+
+    const position = this._componentKeys.indexOf(componentClass);
     if (position >= 0) {
       return this._components[position];
     }
   }
-};
-
-if (typeof module !== 'undefined' && this.module !== module) {
-  module.exports = Entity;
-} else {
-  Serpentity.Entity = Entity;
 }