Skip to content

Commit a6bf9e9

Browse files
committed
Removed property result and straight goes to the main one
1 parent 8687c6a commit a6bf9e9

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

scripts/library/structures/classes/database.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ export default class Database {
3434
getTableData() {
3535
const data = Server.runCommand(`scoreboard players list`);
3636
if(data.error) return;
37-
const objectiveUsers = data.result.statusMessage.match(/(?<=\n).*/)[0];
37+
const objectiveUsers = data.statusMessage.match(/(?<=\n).*/)[0];
3838
const player = objectiveUsers.replace(/\\"/g, '"').match(new RegExp(`({"NOTBEER_DB_TABLE":"${this.table}","data":{.*?}}+$)|({"NOTBEER_DB_TABLE":"${this.table}","data":{.*?}}+(?=,\\s))`))
3939
if(player) return JSON.parse(player[0]);
4040
};

scripts/library/structures/classes/player.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ class PlayerBuilder {
55
let itemCount = [];
66
const data = Server.runCommand(`clear ${player ? `"${player}"` : '@a'} ${itemIdentifier} ${itemData ? itemData : '0'} 0`);
77
if(data.error) return itemCount;
8-
data.result.playerTest.forEach(element => {
8+
data.playerTest.forEach(element => {
99
const count = element.match(/(?<=.*?\().+?(?=\))/)[0];
1010
const player = element.match(/^.*(?= \(\d+\))/)[0];
1111
itemCount.push({ player, count });

scripts/library/structures/classes/server.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class ServerBuilder {
1212
};
1313
getPlayers() {
1414
let data = [];
15-
data = this.runCommand(`list`).result.players.split(', ');
15+
data = this.runCommand(`list`).players.split(', ');
1616
return data;
1717
};
1818
getEntityAtPos([x, y, z], { dimension, ignoreType } = {}) {
@@ -27,9 +27,9 @@ class ServerBuilder {
2727
};
2828
runCommand(command) {
2929
try {
30-
return { error: false, result: Minecraft.Commands.run(command) };
30+
return { error: false, ...Minecraft.Commands.run(command) };
3131
} catch(error) {
32-
return { error: true, result: error };
32+
return { error: true };
3333
};
3434
};
3535
runCommands(commands) {

scripts/library/utils/miscellaneous.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { compressNumber, formatNumber } from './formatter.js';
88
* @param {beforeChat} chatmsg Object that is passed down after a chat event is fired. Make it has the property 'message'
99
*/
1010
function displayRank(chatmsg) {
11-
const data = Server.runCommand(`tag ${chatmsg.sender.nameTag} list`).result;
11+
const data = Server.runCommand(`tag ${chatmsg.sender.nameTag} list`);
1212
const allRanks = data.statusMessage.match(/(?<=\$\(ChatRank{Rank-Name: ).+?(?=}\))/g);
1313
if(!allRanks) return;
1414
chatmsg.canceled = true;

scripts/minecraft/commands/misc/home.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const registerInformation = {
1414
};
1515

1616
Command.register(registerInformation, (chatmsg, args) => {
17-
const data = Server.runCommand(`tag "${chatmsg.sender.nameTag}" list`).result;
17+
const data = Server.runCommand(`tag "${chatmsg.sender.nameTag}" list`);
1818
const coordFormat = /(?<=[x-zX-Z]: )(-\d+|\d+)/g;
1919
const homeName = args.slice(1).join(' ').toLowerCase();
2020
const homeRegex = new RegExp(`\\$\\(Home{Home-Name: ${homeName}, X: (-\\d+|\\d+), Y: (-\\d+|\\d+), Z: (-\\d+|\\d+)(.*)}\\)`);

0 commit comments

Comments
 (0)