Parker2991/node-minecraft-protocol
1
0
Fork 0
mirror of https://github.com/PrismarineJS/node-minecraft-protocol.git synced 2024-12-02 12:06:53 -05:00
Code Issues Projects Releases Packages Wiki Activity

Fix position andslot

Browse source
This commit is contained in:
roblabla 2015-03-03 12:36:26 +00:00
parent e37a820709
commit 77f702e9cb
1 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lib/protocol.js
View file

@ -1090,8 +1090,8 @@ function readBool(buffer, offset) {
function readPosition(buffer, offset) { function readPosition(buffer, offset) {
var longVal = readLong(buffer, offset).value; // I wish I could do destructuring... var longVal = readLong(buffer, offset).value; // I wish I could do destructuring...
var x = longVal[0] >> 6; var x = longVal[0] >> 6;
var y = ((longVal[0] & 0x3F) << 6) | (longVal[1] >> 26); var y = ((longVal[0] & 0x3F) << 6) | ((longVal[1] >> 26) & 0x3f);
var z = longVal[1] << 6 >> 6 var z = longVal[1] & 0x3FFFFFF;
return { return {
value: { x: x, y: y, z: z }, value: { x: x, y: y, z: z },
size: 8 size: 8
@ -1131,7 +1131,7 @@ function readSlot(buffer, offset) {
} }
function sizeOfSlot(value) { function sizeOfSlot(value) {
if (value.id === -1) if (value.blockId === -1)
return (2); return (2);
else if (!value.nbtData) { else if (!value.nbtData) {
return (6); return (6);
@ -1142,14 +1142,14 @@ function sizeOfSlot(value) {
function writePosition(value, buffer, offset) { function writePosition(value, buffer, offset) {
var longVal = []; var longVal = [];
longVal[0] = ((value.x & 0x3FFFFFF) << 6) | ((value.y & 0xFC0) >> 6); longVal[0] = ((value.x & 0x3FFFFFF) << 6) | ((value.y & 0xFFF) >> 6);
longVal[1] = ((value.y & 0x3F) << 26) | (value.z & 0x3FFFFFF); longVal[1] = ((value.y & 0x3F) << 26) | (value.z & 0x3FFFFFF);
return writeLong(longVal, buffer, offset); return writeLong(longVal, buffer, offset);
} }
function writeSlot(value, buffer, offset) { function writeSlot(value, buffer, offset) {
buffer.writeInt16BE(value.id, offset); buffer.writeInt16BE(value.blockId, offset);
if (value.id === -1) return offset + 2; if (value.blockId === -1) return offset + 2;
buffer.writeInt8(value.itemCount, offset + 2); buffer.writeInt8(value.itemCount, offset + 2);
buffer.writeInt16BE(value.itemDamage, offset + 3); buffer.writeInt16BE(value.itemDamage, offset + 3);
var nbtDataLen; var nbtDataLen;
@ -1409,13 +1409,7 @@ function read(buffer, cursor, fieldInfo, rootNodes) {
error: new Error("missing data type: " + fieldInfo.type) error: new Error("missing data type: " + fieldInfo.type)
}; };
} }
try {
var readResults = type[0](buffer, cursor, fieldInfo.typeArgs, rootNodes); var readResults = type[0](buffer, cursor, fieldInfo.typeArgs, rootNodes);
} catch (e) {
console.log("fieldInfo : " + JSON.stringify(fieldInfo));
console.log("rootNodes : " + JSON.stringify(rootNodes));
throw e;
}
if (readResults == null) { if (readResults == null) {
throw new Error("Reader returned null : " + JSON.stringify(fieldInfo)); throw new Error("Reader returned null : " + JSON.stringify(fieldInfo));
} }