7cc5c4f330d47060/owobot
1
0
Fork 0
Code Issues Pull requests Projects Releases 11 Packages Wiki Activity Actions

Merge branch '10_0_0-beta_2' of code.chipmunk.land:7cc5c4f330d47060/botvX into 10_0_0-beta_2

Browse source
This commit is contained in:
7cc5c4f330d47060 2024-08-18 13:38:49 -04:00
commit a276f2db6e
Signed by: 7cc5c4f330d47060
SSH key fingerprint: SHA256:e+4tcZut1nBpe10PqjaO+Rvie0Q7W4qIvFzcUw+7riA
4 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
commands/about.js
View file

@ -61,7 +61,7 @@ const os2 = function (o2, l) {
const version = cp.execSync('getprop ro.build.version.release').toString('UTF-8').split('\n')[0] const version = cp.execSync('getprop ro.build.version.release').toString('UTF-8').split('\n')[0]
return getMessage(l, 'command.about.serverInfo.os.android', [version]) return getMessage(l, 'command.about.serverInfo.os.android', [version])
} catch (e) { } catch (e) {
getMessage(l, 'command.about.serverInfo.os.android.noVersion') return getMessage(l, 'command.about.serverInfo.os.android.noVersion')
} }
} }
case 'linux': case 'linux':

4
plugins/!chat.js
View file

@ -119,10 +119,10 @@ module.exports = {
uuid = b.findUUID(username) uuid = b.findUUID(username)
} else { // Servers with Extras chat, such as Kaboom } else { // Servers with Extras chat, such as Kaboom
const split = parsed.split(': ') const split = parsed.split(': ')
message = split.join(': ')
uuid = b.findUUID(username)
chatName = split.splice(0, 1)[0] chatName = split.splice(0, 1)[0]
username = b.findRealName(chatName) 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 }) b.emit('chat', { json, type: 'legacy', uuid: data.uuid ? data.uuid : uuid, message, username })
}) })

4
plugins/commandblock.js
View file

@ -19,7 +19,7 @@ module.exports = {
b.advanceccq = function () { b.advanceccq = function () {
if (b.ccq[0] && b.ccq[0].length !== 0) { if (b.ccq[0] && b.ccq[0].length !== 0) {
b._client.write('update_command_block', { b._client.write('update_command_block', {
command: b.ccq[0], command: "/",
location: { location: {
x: b.commandPos.x + b.blocknoX, x: b.commandPos.x + b.blocknoX,
y: b.commandPos.y + b.blocknoY, y: b.commandPos.y + b.blocknoY,
@ -29,7 +29,7 @@ module.exports = {
flags: 1 flags: 1
}) })
b._client.write('update_command_block', { b._client.write('update_command_block', {
command: b.ccq[0], command: b.ccq[0].substr(0,32767),
location: { location: {
x: b.commandPos.x + b.blocknoX, x: b.commandPos.x + b.blocknoX,
y: b.commandPos.y + b.blocknoY, y: b.commandPos.y + b.blocknoY,

3
plugins/selfcare.js
View file

@ -76,7 +76,8 @@ module.exports = {
b.sc_tasks.respawn.failed = 0 b.sc_tasks.respawn.failed = 0
}) })
b.on('chat', (data) => { 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 b.sc_tasks.respawn.failed = 1
} }
}) })