From 5d742a4734d056376c148b81921b4c6b494ed56f Mon Sep 17 00:00:00 2001 From: AlexKvazos Date: Tue, 28 Apr 2015 22:48:21 -0500 Subject: [PATCH] Cleaner disconnect --- app/client/services/buffer.js | 7 ++++++- app/server/bot/events/index.js | 6 ------ app/server/sockets/events/connection.js | 1 + 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/client/services/buffer.js b/app/client/services/buffer.js index 039b1c0..8e1b35a 100644 --- a/app/client/services/buffer.js +++ b/app/client/services/buffer.js @@ -16,7 +16,7 @@ module.exports = function(socket) { socket.on('buffer:error', function(error) { if (typeof error === 'object') { error = JSON.stringify(error); } - $('#buffer').append('[i] ' + error + '
') + $('#buffer').append('[i] Error: ' + error + '
') $('#buffer').scrollTop($('#buffer').prop('scrollHeight')); }); @@ -35,6 +35,11 @@ module.exports = function(socket) { $('#buffer').scrollTop($('#buffer').prop('scrollHeight')); }); + socket.on('bot:disconnect', function() { + $('#buffer').append('> You have been disconnected from the Minecraft server.
') + $('#buffer').scrollTop($('#buffer').prop('scrollHeight')); + }); + // service exposes this return { append: function(string) { diff --git a/app/server/bot/events/index.js b/app/server/bot/events/index.js index 3fa814f..a3bd575 100644 --- a/app/server/bot/events/index.js +++ b/app/server/bot/events/index.js @@ -147,10 +147,4 @@ module.exports = function(socket) { socket.mcbot = null; }); - bot.on('kick', function(reason) { - console.log(reason); - socket.emit('buffer:error', 'Kicked for: ' + reason); - socket.mcbot = null; - }); - }; \ No newline at end of file diff --git a/app/server/sockets/events/connection.js b/app/server/sockets/events/connection.js index c248a41..498c1cc 100644 --- a/app/server/sockets/events/connection.js +++ b/app/server/sockets/events/connection.js @@ -22,6 +22,7 @@ module.exports = function(socket) { // prepare for errors socket.mcbot.on('error', function(error) { + if (error.toString() === 'Error: write after end') return; socket.emit('buffer:error', error); socket.mcbot = null; });