Ad5001/PlayerSelectors
1
0
Fork 1
Code Issues 3 Pull requests Releases Wiki Activity

Fixing some underlying issues with command messages of players

Browse source
This commit is contained in:
Adsooi 2017-11-09 23:05:13 +01:00
parent 1bd147133c
commit 6a5ddcd42d
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Ad5001/PlayerSelectors/Main.php
View file

@ -50,8 +50,8 @@ class Main extends PluginBase implements Listener {
* @return void * @return void
*/ */
public function onCommandPreProcess(PlayerCommandPreProcessEvent $event): void{ public function onCommandPreProcess(PlayerCommandPreProcessEvent $event): void{
$m = $event->getMessage(); $m = substr($event->getMessage(), 1);
if($this->execSelectors($m, $event->getPlayer())) $event->setCancelled(); 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){ foreach($commandsToExecute as $index => $cmd){
// Foreaching the returning commands to push them to the new commands to be executed at the next run. // 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){ 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)); $newCommandsToExecute[] = substr_replace($cmd, " " . $selectorStr . " ", strpos($cmd, $match), strlen($match));
} }
if(count($newCommandsToExecute) == 0) { if(count($newCommandsToExecute) == 0) {