From 19434979bd5e242d59a38fd3a55ed14d3ba7860c Mon Sep 17 00:00:00 2001 From: roblabla Date: Sun, 13 Apr 2014 14:25:45 +0200 Subject: [PATCH] Fix couple in protocol --- lib/protocol.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/protocol.js b/lib/protocol.js index c6a4739..827b35a 100644 --- a/lib/protocol.js +++ b/lib/protocol.js @@ -214,7 +214,7 @@ var packets = { { name: "velocityZ", type: "short" } ]}, entity_destroy: {id: 0x13, fields: [ - { name: "count", type: "byte" }, + { name: "count", type: "count", typeArgs: { type: "byte", countFor: "entityIds" } }, { name: "entityIds", type: "array", typeArgs: { type: "int", count: "count" } } ]}, entity: {id: 0x14, fields: [ @@ -519,9 +519,12 @@ var packets = { { name: "friendlyFire", type: "byte", condition: function(field_values) { return field_values['mode'] == 0 || field_values['mode'] == 2; } }, - { name: "players", type: "stringArray", condition: function(field_values) { + { name: "playerCount", type: "count", condition: function(field_values) { return field_values['mode'] == 0 || field_values['mode'] == 3 || field_values['mode'] == 4; - } } + }, typeArgs: { type: "short", countFor: "players" } }, + { name: "players", type: "array", condition: function(field_values) { + return field_values['mode'] == 0 || field_values['mode'] == 3 || field_values['mode'] == 4; + }, typeArgs: { type: "string", count: "playerCount" } } ]}, custom_payload: {id: 0x3f, fields: [ { name: "channel", type: "string" },