diff --git a/commands/about.js b/commands/about.js index 96a5e9d..b17c541 100644 --- a/commands/about.js +++ b/commands/about.js @@ -61,7 +61,7 @@ const os2 = function (o2, l) { const version = cp.execSync('getprop ro.build.version.release').toString('UTF-8').split('\n')[0] return getMessage(l, 'command.about.serverInfo.os.android', [version]) } catch (e) { - getMessage(l, 'command.about.serverInfo.os.android.noVersion') + return getMessage(l, 'command.about.serverInfo.os.android.noVersion') } } case 'linux': diff --git a/plugins/!chat.js b/plugins/!chat.js index 347013b..a5ec289 100755 --- a/plugins/!chat.js +++ b/plugins/!chat.js @@ -119,10 +119,10 @@ module.exports = { uuid = b.findUUID(username) } else { // Servers with Extras chat, such as Kaboom const split = parsed.split(': ') - message = split.join(': ') - uuid = b.findUUID(username) chatName = split.splice(0, 1)[0] username = b.findRealName(chatName) + uuid = b.findUUID(username) + message = split.join(': ') } b.emit('chat', { json, type: 'legacy', uuid: data.uuid ? data.uuid : uuid, message, username }) }) diff --git a/plugins/commandblock.js b/plugins/commandblock.js index 725e65d..0d5f3ce 100755 --- a/plugins/commandblock.js +++ b/plugins/commandblock.js @@ -19,7 +19,7 @@ module.exports = { b.advanceccq = function () { if (b.ccq[0] && b.ccq[0].length !== 0) { b._client.write('update_command_block', { - command: b.ccq[0], + command: "/", location: { x: b.commandPos.x + b.blocknoX, y: b.commandPos.y + b.blocknoY, @@ -29,7 +29,7 @@ module.exports = { flags: 1 }) b._client.write('update_command_block', { - command: b.ccq[0], + command: b.ccq[0].substr(0,32767), location: { x: b.commandPos.x + b.blocknoX, y: b.commandPos.y + b.blocknoY, diff --git a/plugins/selfcare.js b/plugins/selfcare.js index da83d1d..ed07ba4 100755 --- a/plugins/selfcare.js +++ b/plugins/selfcare.js @@ -76,7 +76,8 @@ module.exports = { b.sc_tasks.respawn.failed = 0 }) b.on('chat', (data) => { - if (data.json.translate === 'chat.disabled.options' || (data.json.extra && data.json.extra[0] && data.json.extra[0].translate === 'chat.disabled.options')) { + if (data.json.translate === 'chat.disabled.options' || (data.json.extra && data.json.extra[0] && data.json.extra[0].translate === 'chat.disabled.options') || + data.json.translate === 'Chat disabled in client options' || (data.json.extra && data.json.extra[0] && data.json.extra[0].translate === 'Chat disabled in client options')) { b.sc_tasks.respawn.failed = 1 } })