jasonwynn10/PlayerSelectors
1
0
Fork 0
forked from Ad5001/PlayerSelectors
Code Issues Pull requests Releases Wiki Activity

Fix bug with variable name collisions

Browse source
This commit is contained in:
Jason Wynn 2020-01-07 19:11:01 -05:00
parent c9632dd62c
commit bba3ec86d2
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

@ -83,14 +83,14 @@ class Main extends PluginBase implements Listener {
$params = self::$selectors[$matches[1][$index]]->acceptsModifiers() ? $this->checkArgParams($matches, $index): [];
// Applying the selector
$newCommandsToExecute = [];
foreach($commandsToExecute as $index => $cmd){
foreach($commandsToExecute as $indexB => $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){
foreach(self::$selectors[$matches[1][$indexB]]->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 :/
$newCommandsToExecute[] = substr_replace($cmd, " " . $selectorStr . " ", strpos($cmd, $match), strlen($match));
}
if(count($newCommandsToExecute) == 0) {
$sender->sendMessage("§cYour selector $match (" . self::$selectors[$matches[1][$index]]->getName() . ") did not mactch any player/entity.");
$sender->sendMessage("§cYour selector $match (" . self::$selectors[$matches[1][$indexB]]->getName() . ") did not match any player/entity.");
return true;
}
}