From 0cb3975928d81ceb6dd9d0a37090b03611368f38 Mon Sep 17 00:00:00 2001 From: Ad5001 Date: Sun, 5 Nov 2017 16:31:11 +0100 Subject: [PATCH] Fixing misused brezk statements --- src/Ad5001/PlayerSelectors/selector/AllPlayers.php | 6 +++--- src/Ad5001/PlayerSelectors/selector/Entities.php | 6 +++--- src/Ad5001/PlayerSelectors/selector/RandomPlayer.php | 4 ++-- src/Ad5001/PlayerSelectors/selector/WorldPlayers.php | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/Ad5001/PlayerSelectors/selector/AllPlayers.php b/src/Ad5001/PlayerSelectors/selector/AllPlayers.php index 7eb1d21..a92d770 100644 --- a/src/Ad5001/PlayerSelectors/selector/AllPlayers.php +++ b/src/Ad5001/PlayerSelectors/selector/AllPlayers.php @@ -34,9 +34,9 @@ class AllPlayers extends Selector{ $params = $parameters + $defaultParams; $return = []; foreach(Server::getInstance()->getOnlinePlayers() as $p){ - if($params["c"] !== 0 && count($return) == $params["c"]) break; // Too much players - if($p->getLevel()->getName() !== $params["lvl"] && $params["lvl"] !== "") break; // Not in the right level - if(!$this->checkDefaultParams($p, $params)) break; + if($params["c"] !== 0 && count($return) == $params["c"]) continue; // Too much players + if($p->getLevel()->getName() !== $params["lvl"] && $params["lvl"] !== "") continue; // Not in the right level + if(!$this->checkDefaultParams($p, $params)) continue; $return[] = $p->getName(); } return $return; diff --git a/src/Ad5001/PlayerSelectors/selector/Entities.php b/src/Ad5001/PlayerSelectors/selector/Entities.php index 64dabac..a07b5ad 100644 --- a/src/Ad5001/PlayerSelectors/selector/Entities.php +++ b/src/Ad5001/PlayerSelectors/selector/Entities.php @@ -37,9 +37,9 @@ class Entities extends Selector{ $return = []; foreach(Server::getInstance()->getLevels() as $lvl){ foreach($lvl->getEntities() as $e){ - if($params["c"] !== 0 && count($return) == $params["c"]) break; // Too much players - if($e->getLevel()->getName() !== $params["lvl"] && $params["lvl"] !== "") break; // Not in the right level - if(!$this->checkDefaultParams($e, $params)) break; + if($params["c"] !== 0 && count($return) == $params["c"]) continue; // Too much players + if($e->getLevel()->getName() !== $params["lvl"] && $params["lvl"] !== "") continue; // Not in the right level + if(!$this->checkDefaultParams($e, $params)) continue; $return[] = "e" . $e->getId(); } } diff --git a/src/Ad5001/PlayerSelectors/selector/RandomPlayer.php b/src/Ad5001/PlayerSelectors/selector/RandomPlayer.php index d53e38e..eebcd8f 100644 --- a/src/Ad5001/PlayerSelectors/selector/RandomPlayer.php +++ b/src/Ad5001/PlayerSelectors/selector/RandomPlayer.php @@ -34,8 +34,8 @@ class RandomPlayer extends Selector{ $params = $parameters + $defaultParams; $possible = []; foreach(Server::getInstance()->getOnlinePlayers() as $p){ - if($p->getLevel()->getName() !== $params["lvl"] && $params["lvl"] !== "") break; // Not in the right level - if(!$this->checkDefaultParams($p, $params)) break; + if($p->getLevel()->getName() !== $params["lvl"] && $params["lvl"] !== "") continue; // Not in the right level + if(!$this->checkDefaultParams($p, $params)) continue; $possible[] = $p; } if(count($possible) == 0) return []; diff --git a/src/Ad5001/PlayerSelectors/selector/WorldPlayers.php b/src/Ad5001/PlayerSelectors/selector/WorldPlayers.php index dc14c79..5a72ebf 100644 --- a/src/Ad5001/PlayerSelectors/selector/WorldPlayers.php +++ b/src/Ad5001/PlayerSelectors/selector/WorldPlayers.php @@ -38,9 +38,9 @@ class WorldPlayers extends Selector{ $params = $parameters + $defaultParams; $return = []; foreach(Server::getInstance()->getOnlinePlayers() as $p){ - if($params["c"] !== 0 && count($return) == $params["c"]) break; // Too much players - if($p->getLevel()->getName() !== $params["lvl"] && $params["lvl"] !== "") break; // Not in the right level - if(!$this->checkDefaultParams($p, $params)) break; + if($params["c"] !== 0 && count($return) == $params["c"]) continue; // Too much players + if($p->getLevel()->getName() !== $params["lvl"] && $params["lvl"] !== "") continue; // Not in the right level + if(!$this->checkDefaultParams($p, $params)) continue; $return[] = $p->getName(); } return $return;