Assume the player is online when they are, uh, assumed to be online

the checks removed here should never be hit under normal circumstances. If they were hit, they'd just conceal bugs which would cause a crash to happen later anyway.
This commit is contained in:
Dylan K. Taylor 2019-05-07 19:49:06 +01:00
parent 78bb6f4a0c
commit cf0c0e72a9
5 changed files with 6 additions and 24 deletions

View File

@ -1129,10 +1129,6 @@ class Player extends Human implements CommandSender, ChunkLoader, ChunkListener,
}
public function doChunkRequests(){
if(!$this->isOnline()){
return;
}
if($this->nextChunkOrderRun !== PHP_INT_MAX and $this->nextChunkOrderRun-- <= 0){
$this->nextChunkOrderRun = PHP_INT_MAX;
$this->orderChunks();
@ -1192,10 +1188,6 @@ class Player extends Human implements CommandSender, ChunkLoader, ChunkListener,
* @return bool
*/
public function sleepOn(Vector3 $pos) : bool{
if(!$this->isOnline()){
return false;
}
$pos = $pos->floor();
$b = $this->world->getBlock($pos);

View File

@ -50,7 +50,7 @@ class ListCommand extends VanillaCommand{
$playerNames = array_map(function(Player $player){
return $player->getName();
}, array_filter($sender->getServer()->getOnlinePlayers(), function(Player $player) use ($sender){
return $player->isOnline() and (!($sender instanceof Player) or $sender->canSee($player));
return !($sender instanceof Player) or $sender->canSee($player);
}));
$sender->sendMessage(new TranslationContainer("commands.players.list", [count($playerNames), $sender->getServer()->getMaxPlayers()]));

View File

@ -1630,9 +1630,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
return;
}
foreach($this->world->getViewersForPosition($this) as $player){
if($player->isOnline()){
$this->spawnTo($player);
}
$this->spawnTo($player);
}
}

View File

@ -79,12 +79,7 @@ class QueryRegenerateEvent extends ServerEvent{
$this->serverName = $server->getMotd();
$this->listPlugins = $server->getProperty("settings.query-plugins", true);
$this->plugins = $server->getPluginManager()->getPlugins();
$this->players = [];
foreach($server->getOnlinePlayers() as $player){
if($player->isOnline()){
$this->players[] = $player;
}
}
$this->players = $server->getOnlinePlayers();
$this->gametype = ($server->getGamemode()->getMagicNumber() & 0x01) === 0 ? "SMP" : "CMP";
$this->version = $server->getVersion();

View File

@ -24,12 +24,14 @@ declare(strict_types=1);
namespace pocketmine\scheduler;
use pocketmine\network\mcpe\protocol\ProtocolInfo;
use pocketmine\Player;
use pocketmine\Server;
use pocketmine\utils\Internet;
use pocketmine\utils\Process;
use pocketmine\utils\Utils;
use pocketmine\utils\UUID;
use pocketmine\utils\VersionString;
use function array_map;
use function array_values;
use function count;
use function json_encode;
@ -122,12 +124,7 @@ class SendUsageTask extends AsyncTask{
$playerList[$k] = md5($v);
}
$players = [];
foreach($server->getOnlinePlayers() as $p){
if($p->isOnline()){
$players[] = md5($p->getUniqueId()->toBinary());
}
}
$players = array_map(function(Player $p){ return md5($p->getUniqueId()->toBinary()); }, $server->getOnlinePlayers());
$data["players"] = [
"count" => count($players),