mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-07-05 09:39:56 +00:00
Code Issues Projects Releases Wiki Activity

Removed useless casts() from min/max calls

Browse Source
This commit is contained in:
Dylan K. Taylor 2020-02-06 15:58:27 +00:00
parent 812424a619
commit d26fcf7dee
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pocketmine/MemoryManager.php
View File

@ -181,7 +181,7 @@ class MemoryManager{
* Returns the allowed chunk radius based on the current memory usage. * Returns the allowed chunk radius based on the current memory usage.
*/ */
public function getViewDistance(int $distance) : int{ public function getViewDistance(int $distance) : int{
return ($this->lowMemory and $this->lowMemChunkRadiusOverride > 0) ? (int) min($this->lowMemChunkRadiusOverride, $distance) : $distance; return ($this->lowMemory and $this->lowMemChunkRadiusOverride > 0) ? min($this->lowMemChunkRadiusOverride, $distance) : $distance;
} }
/** /**

2
src/pocketmine/Server.php
View File

@ -1388,7 +1388,7 @@ class Server{
$poolSize = max(1, (int) $poolSize); $poolSize = max(1, (int) $poolSize);
} }
$this->asyncPool = new AsyncPool($this, $poolSize, (int) max(-1, (int) $this->getProperty("memory.async-worker-hard-limit", 256)), $this->autoloader, $this->logger); $this->asyncPool = new AsyncPool($this, $poolSize, max(-1, (int) $this->getProperty("memory.async-worker-hard-limit", 256)), $this->autoloader, $this->logger);
if($this->getProperty("network.batch-threshold", 256) >= 0){ if($this->getProperty("network.batch-threshold", 256) >= 0){
Network::$BATCH_THRESHOLD = (int) $this->getProperty("network.batch-threshold", 256); Network::$BATCH_THRESHOLD = (int) $this->getProperty("network.batch-threshold", 256);

2
src/pocketmine/command/defaults/HelpCommand.php
View File

@ -82,7 +82,7 @@ class HelpCommand extends VanillaCommand{
} }
ksort($commands, SORT_NATURAL | SORT_FLAG_CASE); ksort($commands, SORT_NATURAL | SORT_FLAG_CASE);
$commands = array_chunk($commands, $pageHeight); $commands = array_chunk($commands, $pageHeight);
$pageNumber = (int) min(count($commands), $pageNumber); $pageNumber = min(count($commands), $pageNumber);
if($pageNumber < 1){ if($pageNumber < 1){
$pageNumber = 1; $pageNumber = 1;
} }

2
src/pocketmine/entity/Human.php
View File

@ -524,7 +524,7 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{
public function getXpDropAmount() : int{ public function getXpDropAmount() : int{
//this causes some XP to be lost on death when above level 1 (by design), dropping at most enough points for //this causes some XP to be lost on death when above level 1 (by design), dropping at most enough points for
//about 7.5 levels of XP. //about 7.5 levels of XP.
return (int) min(100, 7 * $this->getXpLevel()); return min(100, 7 * $this->getXpLevel());
} }
/** /**

2
src/pocketmine/entity/utils/ExperienceUtils.php
View File

@ -75,6 +75,6 @@ abstract class ExperienceUtils{
$x = Math::solveQuadratic($a, $b, $c - $xp); $x = Math::solveQuadratic($a, $b, $c - $xp);
return (float) max($x); //we're only interested in the positive solution return max($x); //we're only interested in the positive solution
} }
} }

2
src/pocketmine/network/rcon/RCON.php
View File

@ -94,7 +94,7 @@ class RCON{
$this->server->getTickSleeper()->addNotifier($notifier, function() : void{ $this->server->getTickSleeper()->addNotifier($notifier, function() : void{
$this->check(); $this->check();
}); });
$this->instance = new RCONInstance($this->socket, $password, (int) max(1, $maxClients), $this->server->getLogger(), $this->ipcThreadSocket, $notifier); $this->instance = new RCONInstance($this->socket, $password, max(1, $maxClients), $this->server->getLogger(), $this->ipcThreadSocket, $notifier);
socket_getsockname($this->socket, $addr, $port); socket_getsockname($this->socket, $addr, $port);
$this->server->getLogger()->info("RCON running on $addr:$port"); $this->server->getLogger()->info("RCON running on $addr:$port");