diff --git a/src/lib/plugins/commands.js b/src/lib/plugins/commands.js
index 96a05ca..20b4d6e 100644
--- a/src/lib/plugins/commands.js
+++ b/src/lib/plugins/commands.js
@@ -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) {
 
   function shuffleArray(array) {
diff --git a/src/lib/plugins/tp.js b/src/lib/plugins/tp.js
index 3b23135..d6c7645 100644
--- a/src/lib/plugins/tp.js
+++ b/src/lib/plugins/tp.js
@@ -13,8 +13,8 @@ module.exports.player = (player, serv) => {
     },
     action(args) {
       if(args.length === 2) {
-        let entities_from = serv.selectorString(args[0]);
-        let entity_to = serv.selectorString(args[1])[0];
+        let entities_from = player.selectorString(args[0]);
+        let entity_to = player.selectorString(args[1])[0];
 
         entities_from.forEach(e => e.teleport(entity_to.position.scaled(1/32)));
       } else if(args.length === 3) {
@@ -24,7 +24,7 @@ module.exports.player = (player, serv) => {
         
         player.teleport(new Vec3(x, y, z));
       } 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 y = serv.posFromString(args[2], player_from.y / 32);