From a02983c2bd861bfeac59658d46a1c134de0033fe Mon Sep 17 00:00:00 2001 From: DemiPixel Date: Thu, 19 Nov 2015 17:46:54 -0800 Subject: [PATCH] Fixing metadata, almost done! --- src/lib/plugins/animations.js | 8 ++++---- src/lib/plugins/digging.js | 1 - src/lib/plugins/entities.js | 8 ++++++-- src/lib/plugins/world.js | 2 +- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/lib/plugins/animations.js b/src/lib/plugins/animations.js index 35bc7a5..19f3a3f 100644 --- a/src/lib/plugins/animations.js +++ b/src/lib/plugins/animations.js @@ -8,14 +8,14 @@ module.exports.player=function(player) player._client.on("entity_action", ({actionId} = {}) => { if(actionId == 3) { - player.setMetadata([{"key":0,"type":0,"value": 0x08}]); + player.setAndUpdateMetadata([{"key":0,"type":0,"value": 0x08}]); } else if(actionId == 4) { - player.setMetadata([{"key":0,"type":0,"value": 0x00}]); + player.setAndUpdateMetadata([{"key":0,"type":0,"value": 0x00}]); } else if(actionId == 0) { - player.setMetadata([{"key":0,"type":0,"value": 0x02}]); + player.setAndUpdateMetadata([{"key":0,"type":0,"value": 0x02}]); player.crouching = true; } else if(actionId == 1) { - player.setMetadata([{"key":0,"type":0,"value": 0x00}]); + player.setAndUpdateMetadata([{"key":0,"type":0,"value": 0x00}]); player.crouching = false; } }); diff --git a/src/lib/plugins/digging.js b/src/lib/plugins/digging.js index 5e541e0..04dbce8 100644 --- a/src/lib/plugins/digging.js +++ b/src/lib/plugins/digging.js @@ -93,7 +93,6 @@ module.exports.player=function(player,serv) function creativeDigging(location) { - console.log('creative'); return player.changeBlock(location,0,0); } diff --git a/src/lib/plugins/entities.js b/src/lib/plugins/entities.js index 4cda009..c3ec18c 100644 --- a/src/lib/plugins/entities.js +++ b/src/lib/plugins/entities.js @@ -162,14 +162,18 @@ module.exports.entity=function(entity,serv){ entity.updateAndSpawn(); }); - entity.setMetadata = (data) => { + entity.sendMetadata = (data) => { serv._writeNearby('entity_metadata', { entityId: entity.id, metadata: data }, entity); - entity.metadata = data; }; + entity.setAndUpdateMetadata = (data) => { + entity.metadata = data; + entity.sendMetadata(data); + } + entity.destroy = () => { serv.destroyEntity(entity); }; diff --git a/src/lib/plugins/world.js b/src/lib/plugins/world.js index 3338c8c..041ec82 100644 --- a/src/lib/plugins/world.js +++ b/src/lib/plugins/world.js @@ -56,7 +56,7 @@ module.exports.player=function(player,serv) { player.spawnEntity = entity => { player._client.write(entity.spawnPacketName, entity.getSpawnPacket()); if (typeof entity.itemId != 'undefined') { - entity.setMetadata([{ + entity.sendMetadata([{ "key": 10, "type": 5, "value": {