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

Fix tp, implement entity.selectorString

Browse source
This commit is contained in:
DemiPixel 2015-12-10 09:06:20 -08:00
parent f38ea36c55
commit 9b0970b291
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/lib/plugins/commands.js
View file

@ -120,6 +120,10 @@ module.exports.player=function(player, serv) {
} }
}; };
module.exports.entity = function(entity, serv) {
entity.selectorString = (str) => serv.selectorString(str, entity.position.scaled(1/32), entity.world);
}
module.exports.server = function(serv) { module.exports.server = function(serv) {
function shuffleArray(array) { function shuffleArray(array) {

6
src/lib/plugins/tp.js
View file

@ -13,8 +13,8 @@ module.exports.player = (player, serv) => {
}, },
action(args) { action(args) {
if(args.length === 2) { if(args.length === 2) {
let entities_from = serv.selectorString(args[0]); let entities_from = player.selectorString(args[0]);
let entity_to = serv.selectorString(args[1])[0]; let entity_to = player.selectorString(args[1])[0];
entities_from.forEach(e => e.teleport(entity_to.position.scaled(1/32))); entities_from.forEach(e => e.teleport(entity_to.position.scaled(1/32)));
} else if(args.length === 3) { } else if(args.length === 3) {
@ -24,7 +24,7 @@ module.exports.player = (player, serv) => {
player.teleport(new Vec3(x, y, z)); player.teleport(new Vec3(x, y, z));
} else if(args.length === 4) { } else if(args.length === 4) {
let entities_from = serv.selectorString(args[0]); let entities_from = player.selectorString(args[0]);
let x = serv.posFromString(args[1], player_from.x / 32); let x = serv.posFromString(args[1], player_from.x / 32);
let y = serv.posFromString(args[2], player_from.y / 32); let y = serv.posFromString(args[2], player_from.y / 32);