Parker2991/node-minecraft-protocol
1
0
Fork 0
mirror of https://github.com/PrismarineJS/node-minecraft-protocol.git synced 2025-05-22 11:10:23 -04:00
Code Issues Projects Releases Packages Wiki Activity

Changed if(typeof var === undefined) to if(var). Made errors error objects.

Browse source
This commit is contained in:
Robin Lambertz 2013-01-29 08:53:23 +00:00
parent 866e489914
commit 997071ef41
2 changed files with 8 additions and 8 deletions

2
lib/client.js
View file

@ -29,7 +29,7 @@ Client.prototype.setSocket = function(socket) {
while (true) { while (true) {
parsed = parsePacket(incomingBuffer, self.isServer); parsed = parsePacket(incomingBuffer, self.isServer);
if (! parsed) break; if (! parsed) break;
if (typeof parsed.error !== "undefined") end(parsed.error); if (parsed.error) this.end(parsed.error);
packet = parsed.results; packet = parsed.results;
incomingBuffer = incomingBuffer.slice(parsed.size); incomingBuffer = incomingBuffer.slice(parsed.size);
self.emit(packet.id, packet); self.emit(packet.id, packet);

14
lib/protocol.js
View file

@ -729,13 +729,13 @@ function readEntityMetadata(buffer, offset) {
dataType = types[typeName]; dataType = types[typeName];
if (!dataType) { if (!dataType) {
return { return {
error: "unrecognized entity metadata type " + type error: new Error("unrecognized entity metadata type " + type)
} }
} }
reader = dataType[0]; reader = dataType[0];
if (!reader) { if (!reader) {
return { return {
error: "missing reader for entity metadata type " + type error: new Error("missing reader for entity metadata type " + type)
} }
} }
results = reader(buffer, cursor); results = reader(buffer, cursor);
@ -818,7 +818,7 @@ function readMapChunkBulk (buffer, offset) {
if (chunkColumnCount !== meta.length) { if (chunkColumnCount !== meta.length) {
return { return {
error: "ChunkColumnCount different from length of meta" error: new Error("ChunkColumnCount different from length of meta")
} }
} }
@ -1215,7 +1215,7 @@ function parsePacket(buffer, isServer) {
var packetInfo = get(packetId, isServer); var packetInfo = get(packetId, isServer);
if (packetInfo == null) { if (packetInfo == null) {
return { return {
error: "Unrecognized packetId: " + packetId error: new Error("Unrecognized packetId: " + packetId)
} }
} }
var i, fieldInfo, read, readResults; var i, fieldInfo, read, readResults;
@ -1224,15 +1224,15 @@ function parsePacket(buffer, isServer) {
read = types[fieldInfo.type][0]; read = types[fieldInfo.type][0];
if (!read) { if (!read) {
return { return {
error: "missing reader for data type: " + fieldInfo.type error: new Error("missing reader for data type: " + fieldInfo.type)
} }
} }
readResults = read(buffer, size); readResults = read(buffer, size);
if (readResults) { if (readResults) {
// if readResults.error is undef, error stays undef'd // if readResults.error is undef, error stays undef'd
if (typeof readResults.error !== "undefined") { if (readResults.error) {
return { return {
error: readResults.error error: new Error("reader failed : " + readResults.error)
} }
} }
results[fieldInfo.name] = readResults.value; results[fieldInfo.name] = readResults.value;