Merge pull request #285 from rom1504/patch-1

use bufferEqual instead of buffertools
This commit is contained in:
Robin Lambertz 2015-10-13 19:04:43 +02:00
commit 971e442d88
3 changed files with 5 additions and 5 deletions

View File

@ -3,7 +3,7 @@
"version": "0.0.0", "version": "0.0.0",
"private": true, "private": true,
"dependencies": { "dependencies": {
"buffertools": "^2.1.2" "buffer-equal": "0.0.1"
}, },
"description": "A node-minecraft-protocol example" "description": "A node-minecraft-protocol example"
} }

View File

@ -128,13 +128,13 @@ srv.on('login', function(client) {
client.compressionThreshold = data.threshold; client.compressionThreshold = data.threshold;
} }
}); });
var buffertools = require('buffertools'); var bufferEqual = require('buffer-equal');
targetClient.on('raw', function(buffer, meta) { targetClient.on('raw', function(buffer, meta) {
if(client.state != states.PLAY || meta.state != states.PLAY) if(client.state != states.PLAY || meta.state != states.PLAY)
return; return;
var packetData = targetClient.deserializer.parsePacketData(buffer).data; var packetData = targetClient.deserializer.parsePacketData(buffer).data;
var packetBuff = client.serializer.createPacketBuffer(meta.name, packetData); var packetBuff = client.serializer.createPacketBuffer(meta.name, packetData);
if(buffertools.compare(buffer, packetBuff) != 0) { if(!bufferEqual(buffer, packetBuff)) {
console.log("client<-server: Error in packet " + state + "." + meta.name); console.log("client<-server: Error in packet " + state + "." + meta.name);
console.log(buffer.toString('hex')); console.log(buffer.toString('hex'));
console.log(packetBuff.toString('hex')); console.log(packetBuff.toString('hex'));
@ -154,7 +154,7 @@ srv.on('login', function(client) {
return; return;
var packetData = client.deserializer.parsePacketData(buffer).data; var packetData = client.deserializer.parsePacketData(buffer).data;
var packetBuff = targetClient.serializer.createPacketBuffer(meta.name, packetData); var packetBuff = targetClient.serializer.createPacketBuffer(meta.name, packetData);
if(buffertools.compare(buffer, packetBuff) != 0) { if(!bufferEqual(buffer, packetBuff)) {
console.log("client->server: Error in packet " + state + "." + meta.name); console.log("client->server: Error in packet " + state + "." + meta.name);
console.log(buffer.toString('hex')); console.log(buffer.toString('hex'));
console.log(packetBuff.toString('hex')); console.log(packetBuff.toString('hex'));

View File

@ -41,7 +41,7 @@
}, },
"dependencies": { "dependencies": {
"babel-runtime": "^5.4.4", "babel-runtime": "^5.4.4",
"buffer-equal": "0.0.0", "buffer-equal": "0.0.1",
"lodash.reduce": "^3.1.2", "lodash.reduce": "^3.1.2",
"minecraft-data": "^0.13.0", "minecraft-data": "^0.13.0",
"node-uuid": "~1.4.1", "node-uuid": "~1.4.1",