dan/flying-squid
1
0
Fork 0
mirror of https://github.com/danbulant/flying-squid synced 2026-07-05 03:00:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

use destructuring in more commands

Browse source
This commit is contained in:
Romain Beaumont 2015-11-06 19:07:05 +01:00
parent 41811c79b5
commit 010cda5c6e
1 changed files with 25 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
src/lib/playerPlugins/commands.js
View file

@ -60,9 +60,8 @@ function inject(serv, player) {
usage: '/setblock <x> <y> <z> <id> <data>', usage: '/setblock <x> <y> <z> <id> <data>',
parse(str) { parse(str) {
var results = str.match(/^(~|~?-?[0-9]*) (~|~?-?[0-9]*) (~|~?-?[0-9]*) ([0-9]{1,3}) ([0-9]{1,3})/); var results = str.match(/^(~|~?-?[0-9]*) (~|~?-?[0-9]*) (~|~?-?[0-9]*) ([0-9]{1,3}) ([0-9]{1,3})/);
if(!results) return false; if(!results) return false;
else return results; return results;
}, },
action(params) { action(params) {
var res = params.map((num, i) => { // parseInt paramaters var res = params.map((num, i) => { // parseInt paramaters
@ -82,22 +81,15 @@ function inject(serv, player) {
info: 'to kick a player', info: 'to kick a player',
usage: '/kick <player> [reason]', usage: '/kick <player> [reason]',
parse(str) { parse(str) {
var res = false; if(!str.match(/([a-zA-Z0-9_]+)(?: (.*))?/))
return false;
if(str.match(/([a-zA-Z0-9_]+)(?: (.*))/)) { var parts = str.split(' ');
str = str.split(' '); return {
var nick = str.shift(); username:parts.shift(),
var reason = str.join(' '); reason:parts.join(' ')
};
res = [nick, reason];
}
return res;
}, },
action(params) { action({username,reason}) {
var username = params[0];
var reason = params[1];
var kickPlayer = serv.getPlayer(username); var kickPlayer = serv.getPlayer(username);
if (!kickPlayer) { if (!kickPlayer) {
player.chat(username + " is not on this server!"); player.chat(username + " is not on this server!");
@ -113,22 +105,15 @@ function inject(serv, player) {
info: 'to ban a player', info: 'to ban a player',
usage: '/ban <player> [reason]', usage: '/ban <player> [reason]',
parse(str) { parse(str) {
var res = false; if(!str.match(/([a-zA-Z0-9_]+)(?: (.*))?/))
return false;
if(str.match(/([a-zA-Z0-9_]+)(?: (.*))/)) { var parts = str.split(' ');
str = str.split(' '); return {
var nick = str.shift(); username:parts.shift(),
var reason = str.join(' '); reason:parts.join(' ')
};
res = [nick, reason];
}
return res;
}, },
action(params) { action({username,reason}) {
var username = params[0];
var reason = params[1];
var banPlayer = serv.getPlayer(username); var banPlayer = serv.getPlayer(username);
if (!banPlayer) { if (!banPlayer) {
@ -150,13 +135,9 @@ function inject(serv, player) {
info: 'to pardon a player', info: 'to pardon a player',
usage: '/pardon <player>', usage: '/pardon <player>',
parse(str) { parse(str) {
var res = false; if(!str.match(/([a-zA-Z0-9_]+)/))
return false;
if(str.match(/([a-zA-Z0-9_]+)/)) { return str;
res = str;
}
return res;
}, },
action(nick) { action(nick) {
serv.pardonUsername(nick) serv.pardonUsername(nick)
@ -170,22 +151,14 @@ function inject(serv, player) {
info: 'to change a time', info: 'to change a time',
usage: '/time <add|query|set> <value>', usage: '/time <add|query|set> <value>',
parse(str) { parse(str) {
var res = false;
var data = str.match(/^(add|query|set)(?: ([0-9]+|day|night))?/); var data = str.match(/^(add|query|set)(?: ([0-9]+|day|night))?/);
if(!data) return false; if(!data) return false;
return {
if(data.length ==3) { action: data[1],
if (data[2] == 'day') data[2] = 1000; value: data[2] == 'day' ? 1000 : (data[2] == 'night' ? 13000 : parseInt(data[2]))
if (data[2] == 'night') data[2] = 13000; };
}
return [data[1], data[2]];
}, },
action(params) { action({action,value}) {
var action = params[0];
var value = params[1] !== undefined ? parseInt(params[1]) : null;
if(action == "query") { if(action == "query") {
player.chat("It is "+serv.time); player.chat("It is "+serv.time);
} else { } else {