diff --git a/src/Ad5001/PlayerSelectors/Main.php b/src/Ad5001/PlayerSelectors/Main.php index 3fc9b6e..323c111 100644 --- a/src/Ad5001/PlayerSelectors/Main.php +++ b/src/Ad5001/PlayerSelectors/Main.php @@ -50,8 +50,8 @@ class Main extends PluginBase implements Listener { * @return void */ public function onCommandPreProcess(PlayerCommandPreProcessEvent $event): void{ - $m = $event->getMessage(); - if($this->execSelectors($m, $event->getPlayer())) $event->setCancelled(); + $m = substr($event->getMessage(), 1); + if(substr($event->getMessage(), 0, 1) == "/" && $this->execSelectors($m, $event->getPlayer())) $event->setCancelled(); } @@ -86,7 +86,7 @@ class Main extends PluginBase implements Listener { foreach($commandsToExecute as $index => $cmd){ // Foreaching the returning commands to push them to the new commands to be executed at the next run. foreach(self::$selectors[$matches[1][$index]]->applySelector($sender, $params) as $selectorStr){ - if(strpos($selectorStr, " ") !== -1) $selectorStr = explode($selectorStr)[count(explode($selectorStr)) - 1]; // Name w/ spaces. Match the nearest name in the player. Not perfect :/ + if(strpos($selectorStr, " ") !== -1) $selectorStr = explode(" ", $selectorStr)[count(explode(" ", $selectorStr)) - 1]; // Name w/ spaces. Match the nearest name in the player. Not perfect :/ $newCommandsToExecute[] = substr_replace($cmd, " " . $selectorStr . " ", strpos($cmd, $match), strlen($match)); } if(count($newCommandsToExecute) == 0) {