Allowed radius in lookup command

matcracker · May 7, 2021 · c7baa57 · c7baa57
1 parent 853b0ee
commit c7baa57
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/matcracker/BedcoreProtect/commands/CommandParser.php b/src/matcracker/BedcoreProtect/commands/CommandParser.php
@@ -449,7 +449,7 @@ public function getErrorMessage(): ?string
         return $this->errorMessage;
     }
 
-    public function buildLookupQuery(string &$query, array &$args): void
+    public function buildLookupQuery(string &$query, array &$args, ?AxisAlignedBB $bb = null): void
     {
         if (!$this->parsed) {
             throw new BadMethodCallException('Before invoking this method, you need to invoke CommandParser::parse()');
@@ -502,7 +502,7 @@ public function buildLookupQuery(string &$query, array &$args): void
         $variables = [];
         $parameters = [];
 
-        $this->buildConditionalQuery($query, $variables, $parameters, null);
+        $this->buildConditionalQuery($query, $variables, $parameters, $bb);
 
         $query .= ' ORDER BY time DESC;';
 

diff --git a/src/matcracker/BedcoreProtect/storage/queries/PluginQueries.php b/src/matcracker/BedcoreProtect/storage/queries/PluginQueries.php
@@ -26,6 +26,7 @@
 use matcracker\BedcoreProtect\commands\CommandParser;
 use matcracker\BedcoreProtect\Inspector;
 use matcracker\BedcoreProtect\math\Area;
+use matcracker\BedcoreProtect\math\MathUtils;
 use pocketmine\block\Block;
 use pocketmine\command\CommandSender;
 use pocketmine\level\Position;
@@ -75,7 +76,13 @@ public function requestLookup(CommandSender $sender, CommandParser $parser): voi
         $query = "";
         $args = [];
 
-        $parser->buildLookupQuery($query, $args);
+        if ($sender instanceof Player && $parser->getRadius() !== null) {
+            $bb = MathUtils::getRangedVector($sender->asVector3(), $parser->getRadius());
+        } else {
+            $bb = null;
+        }
+
+        $parser->buildLookupQuery($query, $args, $bb);
 
         $this->connector->executeSelectRaw(
             $query,