move code to inject section

src/lib/playerPlugins/commands.js

@@ -1,9 +1,10 @@
 var Vec3 = require('vec3');
 module.exports = inject;
 
-var hash = {};
+function inject(serv, player, options) {
+  var hash = {};
 
-class Command {
+  class Command {
     constructor(params, parent) {
       this.params = params;
       this.parent = parent;
@@ -29,7 +30,7 @@ class Command {
       return res;
     }
 
-  static use(command, serv, player, options) {
+    static use(command) {
       var res = this.find(command);
 
       if(res) {
@@ -48,7 +49,7 @@ class Command {
           res[1].shift();
         }
 
-      res = res[0].params.action(res[1], serv, player, options);
+        res = res[0].params.action(res[1]);
         if(res) player.chat('' + res);
       } else {
         player.chat('Command not found');
@@ -83,15 +84,15 @@ class Command {
       var first = !(this.parent && this.parent.parent);
       return this.params.merged || (!end && first) ? '' : ' ';
     }
-}
+  }
 
-var base = new Command({ basic: true });
+  var base = new Command({ basic: true });
 
-base.add({
+  base.add({
     base: 'help',
     info: 'for show all commands',
     usage: '/help [command]',
-  action(params, serv, player, options) {
+    action(params) {
       var c = params[0];
 
       if(c) {
@@ -116,9 +117,9 @@ base.add({
         }
       }
     }
-});
+  });
 
-base.add({
+  base.add({
     base: 'gamemode',
     aliases: ['gm'],
     info: 'for change game mode',
@@ -128,12 +129,12 @@ base.add({
       if(mode < 0 || mode > 3) return false;
       else return mode;
     },
-  action(mode, serv, player) {
+    action(mode) {
       player.setGameMode(mode);
     }
-});
+  });
 
-base.add({
+  base.add({
     base: 'setblock',
     info: 'for put block',
     usage: '/setblock <x> <y> <z> <id>',
@@ -143,7 +144,7 @@ base.add({
       if(!results) return false;
       else return results;
     },
-  action(params, serv, player) {
+    action(params) {
       var res = params.map(function (num, i) { // parseInt paramaters
         if (num.indexOf('~') == 0) {
           return (player.entity.position[['', 'x', 'y', 'z'][i]] >> 5) + parseInt(num.slice(1) || 0);
@@ -154,9 +155,9 @@ base.add({
 
       serv.setBlock(new Vec3(res[1], res[2], res[3]), res[4]);
     }
-});
+  });
 
-base.add({
+  base.add({
     base: 'kick',
     info: 'for kick a player',
     usage: '/kick <player> [reason]',
@@ -173,7 +174,7 @@ base.add({
 
       return res;
     },
-  action(params, serv, player) {
+    action(params) {
       var username = params[0];
       var reason = params[1];
 
@@ -185,9 +186,9 @@ base.add({
         kickPlayer.emit("kicked", player, reason);
       }
     }
-});
+  });
 
-base.add({
+  base.add({
     base: 'ban',
     info: 'for ban a player',
     usage: '/ban <player> [reason]',
@@ -204,7 +205,7 @@ base.add({
 
       return res;
     },
-  action(params, serv, player) {
+    action(params) {
       var username = params[0];
       var reason = params[1];
 
@@ -222,9 +223,9 @@ base.add({
         serv.emit("banned", player, username, reason);
       }
     }
-});
+  });
 
-base.add({
+  base.add({
     base: 'pardon',
     info: 'for pardon a player',
     usage: '/pardon <player>',
@@ -237,14 +238,14 @@ base.add({
 
       return res;
     },
-  action(nick, serv, player) {
+    action(nick) {
       serv.pardonUsername(nick)
       .then(()=> player.chat(nick + " is unbanned"))
       .catch(err => player.chat(nick + " is not banned"));
     }
-});
+  });
 
-base.add({
+  base.add({
     base: 'time',
     info: 'for change a time',
     usage: '/time <add|query|set> <value>',
@@ -258,7 +259,7 @@ base.add({
 
       return [data[1], data[2]];
     },
-  action(params, serv, player) {
+    action(params) {
       var action = params[0];
       var value = params[1] !== undefined ? parseInt(params[1]) : null;
 
@@ -277,22 +278,22 @@ base.add({
         serv.setTime(newTime);
       }
     }
-});
+  });
 
-base.add({
+  base.add({
     base: 'day',
     info: 'for change a time to day',
     usage: '/day',
-  action(params, serv, player) {
+    action(params) {
       player.handleCommand('time set day');
     }
-});
+  });
 
-base.add({
+  base.add({
     base: 'ping',
     info: 'for pong!',
     usage: '/ping [number]',
-  action(params, serv, player) {
+    action(params) {
       var num = params[0] * 1 + 1;
 
       var str = 'pong';
@@ -300,45 +301,44 @@ base.add({
 
       player.chat(str + '!');
     }
-});
+  });
 
-base.add({
+  base.add({
     base: 'night',
     info: 'for change a time to night',
     usage: '/night',
-  action(params, serv, player) {
+    action(params) {
       player.handleCommand('time set night');
     }
-});
+  });
 
-base.add({
+  base.add({
     base: 'modpe',
     info: 'for modpe commands',
     usage: '/modpe <params>',
     parse(str) { return str ? str : false },
-  action(str, serv, player) {
+    action(str) {
       player.emit("modpe", str);
     }
-});
+  });
 
-base.add({
+  base.add({
     base: 'version',
     info: 'for get version of the server',
     action() {
       return 'This server is running flying-squid version 0.1.0';
     }
-});
+  });
 
-base.add({
+  base.add({
     base: 'bug',
     info: 'for bug report',
     action() {
       return 'Report bugs / issues here: https://github.com/mhsjlw/flying-squid/issues';
     }
-});
+  });
 
-function inject(serv, player, options) {
+  serv.commands = base;
-  player.handleCommand = function(str) {
+
-    return Command.use(str, serv, player, options);
+  player.handleCommand = Command.use.bind(Command);
-  };
 }