From 888fa21b7bcbb7bb8e34eef0b645190a20e631c5 Mon Sep 17 00:00:00 2001 From: Romain Beaumont Date: Mon, 26 Oct 2015 02:40:23 +0100 Subject: [PATCH] some more es6 arrows --- src/lib/playerPlugins/blocks.js | 10 +++++----- src/lib/playerPlugins/chest.js | 2 +- src/lib/playerPlugins/commands.js | 2 +- src/lib/playerPlugins/digging.js | 2 +- src/lib/playerPlugins/login.js | 2 +- src/lib/playerPlugins/world.js | 6 +++--- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/lib/playerPlugins/blocks.js b/src/lib/playerPlugins/blocks.js index 778b435..c6dc6d3 100644 --- a/src/lib/playerPlugins/blocks.js +++ b/src/lib/playerPlugins/blocks.js @@ -4,18 +4,18 @@ function inject(serv,player) { player.changeBlock=async (position,blockType) => { - serv.players.filter(p => p.world==player.world).forEach(function(p) { - p.sendBlock(position, blockType); - }); + serv.players + .filter(p => p.world==player.world) + .forEach(p => p.sendBlock(position, blockType)); + return await player.world.setBlockType(position,blockType); }; - player.sendBlock = (position, blockType) => { // Call from player.setBlock unless you want "local" fake blocks + player.sendBlock = (position, blockType) => // Call from player.setBlock unless you want "local" fake blocks player._client.write("block_change",{ location:position, type:blockType<<4 }); - }; player.setBlock = (position,blockType) => serv.setBlock(player.world,position,blockType); } \ No newline at end of file diff --git a/src/lib/playerPlugins/chest.js b/src/lib/playerPlugins/chest.js index 4bf3373..ae9e0b8 100644 --- a/src/lib/playerPlugins/chest.js +++ b/src/lib/playerPlugins/chest.js @@ -23,7 +23,7 @@ function inject(serv, player) } } catch(err) { - setTimeout(function(){throw err;},0); + setTimeout(() =>{throw err;},0); } }); diff --git a/src/lib/playerPlugins/commands.js b/src/lib/playerPlugins/commands.js index 27f7eea..c8b7f58 100644 --- a/src/lib/playerPlugins/commands.js +++ b/src/lib/playerPlugins/commands.js @@ -65,7 +65,7 @@ function inject(serv, player) { else return results; }, action(params) { - var res = params.map(function (num, i) { // parseInt paramaters + var res = params.map((num, i) => { // parseInt paramaters if (num.indexOf('~') == 0) { return (player.entity.position[['', 'x', 'y', 'z'][i]] >> 5) + parseInt(num.slice(1) || 0); } else { diff --git a/src/lib/playerPlugins/digging.js b/src/lib/playerPlugins/digging.js index e9d0f86..93ddf9c 100644 --- a/src/lib/playerPlugins/digging.js +++ b/src/lib/playerPlugins/digging.js @@ -19,7 +19,7 @@ function inject(serv,player) else if(status==0 && player.gameMode==1) creativeDigging(pos); }) - .catch((err)=> setTimeout(function(){throw err;},0)); + .catch((err)=> setTimeout(() => {throw err;},0)); }); function diggingTime(location) diff --git a/src/lib/playerPlugins/login.js b/src/lib/playerPlugins/login.js index 5b25fe1..92bd149 100644 --- a/src/lib/playerPlugins/login.js +++ b/src/lib/playerPlugins/login.js @@ -148,6 +148,6 @@ function inject(serv,player) player.emit("spawned"); sendPlayersWhenMove(); - setTimeout(function(){player.sendRestMap();sendChunkWhenMove();},100); + setTimeout(() => {player.sendRestMap();sendChunkWhenMove();},100); }; } \ No newline at end of file diff --git a/src/lib/playerPlugins/world.js b/src/lib/playerPlugins/world.js index 84242b1..410fc2f 100644 --- a/src/lib/playerPlugins/world.js +++ b/src/lib/playerPlugins/world.js @@ -34,7 +34,7 @@ function inject(serv, player) { function spiral(arr) { var t=[]; - spiralloop(arr,function(x,z){ + spiralloop(arr,(x,z) => { t.push([x,z]); }); return t; @@ -72,7 +72,7 @@ function inject(serv, player) { player.sendMap = () => { return player.sendNearbyChunks(3) - .catch((err) => setTimeout(function() { throw err; }), 0); + .catch((err) => setTimeout(() => { throw err; }), 0); }; player.sendRestMap = () => @@ -80,7 +80,7 @@ function inject(serv, player) { player.sendingChunks=true; player.sendNearbyChunks(player.view) .then(() => player.sendingChunks=false) - .catch((err)=> setTimeout(function(){throw err;},0)); + .catch((err)=> setTimeout(() => {throw err;},0)); }; player.sendSpawnPosition = () =>