From 5b4035253bed6be6ad4d84391db690fa393fd557 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Thu, 17 Aug 2017 11:24:49 +0100 Subject: [PATCH] Casting cleanup and removed some 32-bit string-int leftovers --- src/pocketmine/Player.php | 4 ++-- src/pocketmine/Server.php | 6 +++--- src/pocketmine/level/Level.php | 11 ++++++----- .../level/format/io/BaseLevelProvider.php | 8 ++++---- src/pocketmine/level/format/io/LevelProvider.php | 16 ++++++++-------- src/pocketmine/plugin/PluginManager.php | 4 ++-- 6 files changed, 25 insertions(+), 24 deletions(-) diff --git a/src/pocketmine/Player.php b/src/pocketmine/Player.php index a1108f0f7..310bbe17a 100644 --- a/src/pocketmine/Player.php +++ b/src/pocketmine/Player.php @@ -440,7 +440,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{ * @param bool $remove */ public function setRemoveFormat(bool $remove = true){ - $this->removeFormat = (bool) $remove; + $this->removeFormat = $remove; } public function getScreenLineHeight() : int{ @@ -3435,7 +3435,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{ if($this->connected and !$this->closed){ try{ - if($notify and strlen((string) $reason) > 0){ + if($notify and strlen($reason) > 0){ $pk = new DisconnectPacket(); $pk->message = $reason; $this->directDataPacket($pk); diff --git a/src/pocketmine/Server.php b/src/pocketmine/Server.php index c95190130..3b120c388 100644 --- a/src/pocketmine/Server.php +++ b/src/pocketmine/Server.php @@ -428,7 +428,7 @@ class Server{ * @return string */ public static function getGamemodeString(int $mode) : string{ - switch((int) $mode){ + switch($mode){ case Player::SURVIVAL: return "%gameMode.survival"; case Player::CREATIVE: @@ -1209,7 +1209,7 @@ class Server{ return (int) $v[$variable]; } - return $this->properties->exists($variable) ? (int) $this->properties->get($variable) : (int) $defaultValue; + return $this->properties->exists($variable) ? (int) $this->properties->get($variable) : $defaultValue; } /** @@ -1217,7 +1217,7 @@ class Server{ * @param int $value */ public function setConfigInt(string $variable, int $value){ - $this->properties->set($variable, (int) $value); + $this->properties->set($variable, $value); } /** diff --git a/src/pocketmine/level/Level.php b/src/pocketmine/level/Level.php index b775b08a8..555350af7 100644 --- a/src/pocketmine/level/Level.php +++ b/src/pocketmine/level/Level.php @@ -180,6 +180,7 @@ class Level implements ChunkManager, Metadatable{ /** @var float[] */ private $unloadQueue = []; + /** @var int */ private $time; public $stopTime; @@ -334,7 +335,7 @@ class Level implements ChunkManager, Metadatable{ $this->neighbourBlockUpdateQueue = new \SplQueue(); - $this->time = (int) $this->provider->getTime(); + $this->time = $this->provider->getTime(); $this->chunkTickRadius = min($this->server->getViewDistance(), max(1, (int) $this->server->getProperty("chunk-ticking.tick-radius", 4))); $this->chunksPerTick = (int) $this->server->getProperty("chunk-ticking.per-tick", 40); @@ -668,7 +669,7 @@ class Level implements ChunkManager, Metadatable{ */ public function sendTime(Player ...$targets){ $pk = new SetTimePacket(); - $pk->time = (int) $this->time; + $pk->time = $this->time; $this->server->broadcastPacket(count($targets) > 0 ? $targets : $this->players, $pk); } @@ -1010,7 +1011,7 @@ class Level implements ChunkManager, Metadatable{ $this->server->getPluginManager()->callEvent(new LevelSaveEvent($this)); - $this->provider->setTime((int) $this->time); + $this->provider->setTime($this->time); $this->saveChunks(); if($this->provider instanceof BaseLevelProvider){ $this->provider->saveLevelData(); @@ -1090,7 +1091,7 @@ class Level implements ChunkManager, Metadatable{ return; } $this->scheduledBlockUpdateQueueIndex[$index] = $delay; - $this->scheduledBlockUpdateQueue->insert(new Vector3((int) $pos->x, (int) $pos->y, (int) $pos->z), (int) $delay + $this->server->getTick()); + $this->scheduledBlockUpdateQueue->insert(new Vector3((int) $pos->x, (int) $pos->y, (int) $pos->z), $delay + $this->server->getTick()); } /** @@ -2729,7 +2730,7 @@ class Level implements ChunkManager, Metadatable{ * @return int */ public function getTime() : int{ - return (int) $this->time; + return $this->time; } /** diff --git a/src/pocketmine/level/format/io/BaseLevelProvider.php b/src/pocketmine/level/format/io/BaseLevelProvider.php index 9d3689cbd..eefe7ea98 100644 --- a/src/pocketmine/level/format/io/BaseLevelProvider.php +++ b/src/pocketmine/level/format/io/BaseLevelProvider.php @@ -84,19 +84,19 @@ abstract class BaseLevelProvider implements LevelProvider{ return (string) $this->levelData["LevelName"]; } - public function getTime(){ + public function getTime() : int{ return $this->levelData["Time"]; } - public function setTime($value){ + public function setTime(int $value){ $this->levelData->Time = new LongTag("Time", $value); } - public function getSeed(){ + public function getSeed() : int{ return $this->levelData["RandomSeed"]; } - public function setSeed($value){ + public function setSeed(int $value){ $this->levelData->RandomSeed = new LongTag("RandomSeed", $value); } diff --git a/src/pocketmine/level/format/io/LevelProvider.php b/src/pocketmine/level/format/io/LevelProvider.php index e03305281..e3634c3b6 100644 --- a/src/pocketmine/level/format/io/LevelProvider.php +++ b/src/pocketmine/level/format/io/LevelProvider.php @@ -177,24 +177,24 @@ interface LevelProvider{ public function getName() : string; /** - * @return int|string int, or the string numeric representation of a long in 32-bit systems + * @return int */ - public function getTime(); + public function getTime() : int; /** - * @param int|string $value int, or the string numeric representation of a long in 32-bit systems + * @param int */ - public function setTime($value); + public function setTime(int $value); /** - * @return int|string int, or the string numeric representation of a long in 32-bit systems + * @return int */ - public function getSeed(); + public function getSeed() : int; /** - * @param int|string $value int, or the string numeric representation of a long in 32-bit systems + * @param int */ - public function setSeed($value); + public function setSeed(int $value); /** * @return Vector3 diff --git a/src/pocketmine/plugin/PluginManager.php b/src/pocketmine/plugin/PluginManager.php index c53dab85c..17511cec0 100644 --- a/src/pocketmine/plugin/PluginManager.php +++ b/src/pocketmine/plugin/PluginManager.php @@ -260,8 +260,8 @@ class PluginManager{ $plugins[$name] = $file; - $softDependencies[$name] = (array) $description->getSoftDepend(); - $dependencies[$name] = (array) $description->getDepend(); + $softDependencies[$name] = $description->getSoftDepend(); + $dependencies[$name] = $description->getDepend(); foreach($description->getLoadBefore() as $before){ if(isset($softDependencies[$before])){