From d269b0a49d6979b81d94e443eb4dce061a54741c Mon Sep 17 00:00:00 2001
From: DemiPixel <luke5227@gmail.com>
Date: Sun, 13 Dec 2015 19:35:13 -0800
Subject: [PATCH] Fix a few things for FX

---
 src/lib/plugins/physics.js         | 13 ++++++++++++-
 src/lib/plugins/pvp.js             |  2 +-
 src/lib/plugins/updatePositions.js | 11 -----------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/lib/plugins/physics.js b/src/lib/plugins/physics.js
index 076ed84..90d4b85 100644
--- a/src/lib/plugins/physics.js
+++ b/src/lib/plugins/physics.js
@@ -86,6 +86,17 @@ module.exports.entity=function(entity){
   function clamp(a, b, c) {
     return Math.max(a, Math.min(b, c));
   }
+
+  function addVelocityWithMax(current, newVel, max) {
+    var x, y, z;
+    if (current.x > max.x || current.x < -max.x) x = current.x;
+    else x = Math.max(-max.x, Math.min(max.x, current.x + newVel.x));
+    if (current.y > max.y || current.y < -max.y) y = current.y;
+    else y = Math.max(-max.y, Math.min(max.y, current.y + newVel.y));
+    if (current.z > max.z || current.z < -max.z) z = current.z;
+    else z = Math.max(-max.z, Math.min(max.z, current.z + newVel.z));
+    return new Vec3(x, y, z);
+  }
 };
 
 module.exports.player = function(player, serv) {
@@ -102,5 +113,5 @@ module.exports.player = function(player, serv) {
       var vec = new Vec3(parseInt(params[2]), parseInt(params[3]), parseInt(params[4]));
       selector.forEach(e => e.sendVelocity(vec, vec.scaled(5)));
     }
-  })
+  });
 }
\ No newline at end of file
diff --git a/src/lib/plugins/pvp.js b/src/lib/plugins/pvp.js
index b713845..0dcfa61 100644
--- a/src/lib/plugins/pvp.js
+++ b/src/lib/plugins/pvp.js
@@ -45,7 +45,7 @@ module.exports.player=function(player,serv)
       return str || false;
     },
     action(sel) {
-      var arr = serv.selectorString(sel, player.position.scaled(1/32), player.world);
+      var arr = player.selectorString(sel);
       if (arr.length==0) throw new UserError('Could not find player');
 
       arr.map(entity => entity.takeDamage({damage:20}));
diff --git a/src/lib/plugins/updatePositions.js b/src/lib/plugins/updatePositions.js
index 10e04e5..1157bf6 100644
--- a/src/lib/plugins/updatePositions.js
+++ b/src/lib/plugins/updatePositions.js
@@ -123,15 +123,4 @@ module.exports.entity=function(entity,serv){
   entity.teleport = (pos) => { // Overwritten in players inject above
     entity.sendPosition(pos.scaled(32), false, true);
   }
-
-  function addVelocityWithMax(current, newVel, max) {
-    var x, y, z;
-    if (current.x > max.x || current.x < -max.x) x = current.x;
-    else x = Math.max(-max.x, Math.min(max.x, current.x + newVel.x));
-    if (current.y > max.y || current.y < -max.y) y = current.y;
-    else y = Math.max(-max.y, Math.min(max.y, current.y + newVel.y));
-    if (current.z > max.z || current.z < -max.z) z = current.z;
-    else z = Math.max(-max.z, Math.min(max.z, current.z + newVel.z));
-    return new Vec3(x, y, z);
-  }
 };