AstralTransRocketries/node-minecraft-protocol
1
0
Fork 0
mirror of https://github.com/unmojang/node-minecraft-protocol.git synced 2025-10-04 08:30:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

transform typeArgs function into object

Browse Source
This commit is contained in:
Romain Beaumont 2015-05-08 03:22:37 +02:00
parent bf8a7899ae
commit 9abe799715
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/protocol.js
View File

@ -591,14 +591,22 @@ function readRestBuffer(buffer, offset, typeArgs, rootNode) {
}; };
} }
function evalCount(count,fields)
{
if(fields[count["field"]] in count["map"])
return count["map"][fields[count["field"]]];
return count["default"];
}
function readArray(buffer, offset, typeArgs, rootNode) { function readArray(buffer, offset, typeArgs, rootNode) {
var results = { var results = {
value: [], value: [],
size: 0 size: 0
} }
var count; var count;
if (typeof typeArgs.count === "function") if (typeof typeArgs.count === "object") {
count = typeArgs.count(rootNode); count = evalCount(typeArgs.count,rootNode);
}
else else
count = getField(typeArgs.count, rootNode); count = getField(typeArgs.count, rootNode);
for (var i = 0; i < count; i++) { for (var i = 0; i < count; i++) {

11
src/protocol_def.js
View File

@ -358,14 +358,9 @@ module.exports= {
{ name: "offsetZ", type: "float" }, { name: "offsetZ", type: "float" },
{ name: "particleData", type: "float" }, { name: "particleData", type: "float" },
{ name: "particles", type: "int" }, { name: "particles", type: "int" },
{ name: "data", type: "array", typeArgs: { count: function(fields) { { name: "data", type: "array",
if (fields.particleId === 36) typeArgs: { count: {"field":"particleId","map":{"36":2,"37":1,"38":1},"default":0},
return 2; type: "varint" } }
else if (fields.particleId === 37 || fields.particleId === 38)
return 1;
else
return 0;
}, type: "varint" } }
]}, ]},
game_state_change: {id: 0x2b, fields: [ game_state_change: {id: 0x2b, fields: [
{ name: "reason", type: "ubyte" }, { name: "reason", type: "ubyte" },