Code cleanup

src/pocketmine/Player.php

@@ -164,7 +164,6 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
 	private $inAction = false;
 
 
-
 	private $needACK = [];
 
 	/**
@@ -520,6 +519,7 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
 			return $this->spawnPosition;
 		}else{
 			$level = $this->server->getDefaultLevel();
+
 			return $level->getSafeSpawn();
 		}
 	}
@@ -1896,8 +1896,7 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
 							$this->inventory->setItem($packet->slot, $packet->item);
 							$this->inventory->setHotbarSlotIndex($packet->slot, $packet->slot); //links $hotbar[$packet->slot] to $slots[$packet->slot]
 						}
-					}
+					}else{
-					else{
 						$this->inventory->setHeldItemSlot($packet->slot);
 					}
 					$transaction = new BaseTransaction($this->inventory, $packet->slot, $this->inventory->getItem($packet->slot), $packet->item);

src/pocketmine/PocketMine.php

@@ -68,7 +68,6 @@ namespace pocketmine {
 	use LogLevel;
 	use pocketmine\utils\Binary;
 	use pocketmine\utils\MainLogger;
-	use pocketmine\utils\TextFormat;
 	use pocketmine\utils\Utils;
 	use pocketmine\wizard\Installer;
 	use raklib\RakLib;

src/pocketmine/Server.php

@@ -60,7 +60,6 @@ use pocketmine\nbt\tag\Long;
 use pocketmine\nbt\tag\Short;
 use pocketmine\nbt\tag\String;
 use pocketmine\network\protocol\DataPacket;
-use pocketmine\network\protocol\Info;
 use pocketmine\network\query\QueryHandler;
 use pocketmine\network\query\QueryPacket;
 use pocketmine\network\RakLibInterface;
@@ -879,6 +878,7 @@ class Server{
 	public function unloadLevel(Level $level, $forceUnload = false){
 		if($level->unload($forceUnload) === true and $this->isLevelLoaded($level->getFolderName())){
 			unset($this->levels[$level->getID()]);
+
 			return true;
 		}
 
@@ -924,6 +924,7 @@ class Server{
 			$level = new Level($this, $name, $path, $provider);
 		}catch(\Exception $e){
 			$this->logger->error("Could not load level \"" . $name . "\": " . $e->getMessage());
+
 			return false;
 		}
 
@@ -1575,6 +1576,7 @@ class Server{
 		if(!($this->getDefaultLevel() instanceof Level)){
 			$this->getLogger()->emergency("No default level has been loaded");
 			$this->forceShutdown();
+
 			return;
 		}
 
@@ -1621,6 +1623,7 @@ class Server{
 		foreach($recipients as $recipient){
 			$recipient->sendMessage($message);
 		}
+
 		return count($recipients);
 	}
 
@@ -1693,6 +1696,7 @@ class Server{
 		}else{
 			$sender->sendMessage("Unknown command. Type \"help\" for help.");
 		}
+
 		return false;
 	}
 

src/pocketmine/Thread.php

@@ -28,6 +28,7 @@ abstract class Thread extends \Thread{
 
 	public final function start($options = PTHREADS_INHERIT_ALL){
 		ThreadManager::getInstance()->add($this);
+
 		return parent::start($options & ~PTHREADS_INHERIT_CLASSES);
 	}
 }

src/pocketmine/ThreadManager.php

@@ -63,6 +63,7 @@ class ThreadManager extends \Threaded{
 		foreach($this as $key => $thread){
 			$array[$key] = $thread;
 		}
+
 		return $array;
 	}
 }

src/pocketmine/Worker.php

@@ -28,6 +28,7 @@ abstract class Worker extends \Worker{
 
 	public final function start($options = PTHREADS_INHERIT_ALL){
 		ThreadManager::getInstance()->add($this);
+
 		return parent::start($options & ~PTHREADS_INHERIT_CLASSES);
 	}
 }

src/pocketmine/block/Cactus.php

@@ -25,7 +25,6 @@ use pocketmine\item\Item;
 use pocketmine\level\Level;
 use pocketmine\math\Vector3 as Vector3;
 use pocketmine\Player;
-use pocketmine\Server;
 
 class Cactus extends Transparent{
 	public function __construct($meta = 0){

src/pocketmine/block/Generic.php

@@ -24,7 +24,6 @@ namespace pocketmine\block;
 use pocketmine\item\Item;
 use pocketmine\level\Level;
 use pocketmine\Player;
-use pocketmine\Server;
 
 class Generic extends Block{
 

src/pocketmine/block/TallGrass.php

@@ -53,6 +53,7 @@ class TallGrass extends Flowable{
 		if(mt_rand(0, 15) === 0){
 			return [Item::WHEAT_SEEDS, 0, 1];
 		}
+
 		return [];
 	}
 

src/pocketmine/command/Command.php

@@ -163,6 +163,7 @@ abstract class Command{
 		if(!$this->isRegistered()){
 			$this->timings = new TimingsHandler("** Command: " . $name);
 			$this->label = $name;
+
 			return true;
 		}
 

src/pocketmine/command/FormattedCommandAlias.php

@@ -50,6 +50,7 @@ class FormattedCommandAlias extends Command{
 				}else{
 					$sender->sendMessage(TextFormat::RED . "An internal error occurred while attempting to perform this command");
 				}
+
 				return false;
 			}
 		}

src/pocketmine/command/defaults/GamemodeCommand.php

@@ -53,6 +53,7 @@ class GamemodeCommand extends VanillaCommand{
 
 		if($gameMode === -1){
 			$sender->sendMessage("Unknown game mode");
+
 			return true;
 		}
 

src/pocketmine/command/defaults/KickCommand.php

@@ -53,12 +53,9 @@ class KickCommand extends VanillaCommand{
 
 		if(($player = $sender->getServer()->getPlayer($name)) instanceof Player){
 			$player->kick($reason);
-            if(strlen($reason) >= 1)
+			if(strlen($reason) >= 1){
-            {
 				Command::broadcastCommandMessage($sender, "Kicked " . $player->getName() . " from the game: '{$reason}'");
-            }
+			}else{
-            else
-            {
 				Command::broadcastCommandMessage($sender, "Kicked " . $player->getName() . " from the game.");
 			}
 		}else{

src/pocketmine/command/defaults/SpawnpointCommand.php

@@ -50,12 +50,14 @@ class SpawnpointCommand extends VanillaCommand{
 				$target = $sender;
 			}else{
 				$sender->sendMessage(TextFormat::RED . "Please provide a player!");
+
 				return true;
 			}
 		}else{
 			$target = $sender->getServer()->getPlayer($args[0]);
 			if($target === null){
 				$sender->sendMessage(TextFormat::RED . "Can't find player " . $args[0]);
+
 				return true;
 			}
 		}

src/pocketmine/command/defaults/TeleportCommand.php

@@ -58,12 +58,14 @@ class TeleportCommand extends VanillaCommand{
 				$target = $sender;
 			}else{
 				$sender->sendMessage(TextFormat::RED . "Please provide a player!");
+
 				return true;
 			}
 			if(count($args) === 1){
 				$target = $sender->getServer()->getPlayer($args[0]);
 				if($target === null){
 					$sender->sendMessage(TextFormat::RED . "Can't find player " . $args[0]);
+
 					return true;
 				}
 			}
@@ -71,6 +73,7 @@ class TeleportCommand extends VanillaCommand{
 			$target = $sender->getServer()->getPlayer($args[0]);
 			if($target === null){
 				$sender->sendMessage(TextFormat::RED . "Can't find player " . $args[0]);
+
 				return true;
 			}
 			if(count($args) === 2){
@@ -78,6 +81,7 @@ class TeleportCommand extends VanillaCommand{
 				$target = $sender->getServer()->getPlayer($args[1]);
 				if($target === null){
 					$sender->sendMessage(TextFormat::RED . "Can't find player " . $args[1]);
+
 					return true;
 				}
 			}

src/pocketmine/command/defaults/TimeCommand.php

@@ -39,12 +39,14 @@ class TimeCommand extends VanillaCommand{
 	public function execute(CommandSender $sender, $currentAlias, array $args){
 		if(count($args) < 2){
 			$sender->sendMessage(TextFormat::RED . "Usage: " . $this->usageMessage);
+
 			return false;
 		}
 
 		if($args[0] === "set"){
 			if(!$sender->hasPermission("pocketmine.command.time.set")){
 				$sender->sendMessage(TextFormat::RED . "You don't have permission to set the time");
+
 				return true;
 			}
 
@@ -65,6 +67,7 @@ class TimeCommand extends VanillaCommand{
 		}elseif($args[0] === "add"){
 			if(!$sender->hasPermission("pocketmine.command.time.add")){
 				$sender->sendMessage(TextFormat::RED . "You don't have permission to add the time");
+
 				return true;
 			}
 

src/pocketmine/command/defaults/TimingsCommand.php

@@ -22,12 +22,8 @@
 namespace pocketmine\command\defaults;
 
 use pocketmine\command\CommandSender;
-use pocketmine\event\HandlerList;
 use pocketmine\event\TimingsHandler;
-use pocketmine\Player;
-use pocketmine\plugin\TimedRegisteredListener;
 use pocketmine\utils\TextFormat;
-use pocketmine\utils\Utils;
 
 class TimingsCommand extends VanillaCommand{
 
@@ -49,6 +45,7 @@ class TimingsCommand extends VanillaCommand{
 
 		if(count($args) !== 1){
 			$sender->sendMessage(TextFormat::RED . "Usage: " . $this->usageMessage);
+
 			return true;
 		}
 
@@ -58,6 +55,7 @@ class TimingsCommand extends VanillaCommand{
 			$sender->getServer()->getPluginManager()->setUseTimings(true);
 			TimingsHandler::reload();
 			$sender->sendMessage("Enabled Timings & Reset");
+
 			return true;
 		}elseif($mode === "off"){
 			$sender->getServer()->getPluginManager()->setUseTimings(false);
@@ -66,6 +64,7 @@ class TimingsCommand extends VanillaCommand{
 
 		if(!$sender->getServer()->getPluginManager()->useTimings()){
 			$sender->sendMessage("Please enable timings by typing /timings on");
+
 			return true;
 		}
 
@@ -74,13 +73,6 @@ class TimingsCommand extends VanillaCommand{
 		if($mode === "reset"){
 			TimingsHandler::reload();
 			$sender->sendMessage("Timings reset");
-			/*foreach(HandlerList::getHandlerLists() as $handlerList){
-				foreach($handlerList->getRegisteredListeners() as $listener){
-					if($listener instanceof TimedRegisteredListener){
-						$listener->reset();
-					}
-				}
-			}*/
 		}elseif($mode === "merged" or $mode === "report" or $paste){
 
 			$sampleTime = microtime(true) - self::$timingStart;
@@ -126,6 +118,7 @@ class TimingsCommand extends VanillaCommand{
 				curl_close($ch);
 				if($data === false or $data === null or !isset($data->html_url)){
 					$sender->sendMessage("An error happened while pasting the report");
+
 					return true;
 				}
 				$timings = $data->html_url;

src/pocketmine/entity/Arrow.php

@@ -46,8 +46,6 @@ class Arrow extends Projectile{
 		}
 
 
-
-
 	}
 
 	public function onUpdate(){

src/pocketmine/entity/Entity.php

@@ -26,7 +26,6 @@ namespace pocketmine\entity;
 
 use pocketmine\block\Block;
 use pocketmine\event\entity\EntityDamageEvent;
-use pocketmine\event\entity\EntityDeathEvent;
 use pocketmine\event\entity\EntityDespawnEvent;
 use pocketmine\event\entity\EntityLevelChangeEvent;
 use pocketmine\event\entity\EntityMotionEvent;
@@ -48,12 +47,12 @@ use pocketmine\nbt\tag\Double;
 use pocketmine\nbt\tag\Enum;
 use pocketmine\nbt\tag\Float;
 use pocketmine\nbt\tag\Short;
+use pocketmine\Network;
 use pocketmine\network\protocol\MoveEntityPacket;
 use pocketmine\network\protocol\MovePlayerPacket;
 use pocketmine\network\protocol\RemoveEntityPacket;
 use pocketmine\network\protocol\SetEntityMotionPacket;
 use pocketmine\network\protocol\SetTimePacket;
-use pocketmine\Network;
 use pocketmine\Player;
 use pocketmine\plugin\Plugin;
 use pocketmine\Server;
@@ -1019,6 +1018,7 @@ abstract class Entity extends Position implements Metadatable{
 		if($this->setPositionAndRotation($pos, $yaw === null ? $this->yaw : $yaw, $pitch === null ? $this->pitch : $pitch, true) !== false){
 			$this->fallDistance = 0;
 			$this->onGround = true;
+
 			return true;
 		}
 

src/pocketmine/entity/Human.php

@@ -21,7 +21,6 @@
 
 namespace pocketmine\entity;
 
-use pocketmine\inventory\Inventory;
 use pocketmine\inventory\InventoryHolder;
 use pocketmine\inventory\PlayerInventory;
 use pocketmine\item\Item;
@@ -30,10 +29,10 @@ use pocketmine\nbt\tag\Byte;
 use pocketmine\nbt\tag\Compound;
 use pocketmine\nbt\tag\Enum;
 use pocketmine\nbt\tag\Short;
+use pocketmine\Network;
 use pocketmine\network\protocol\AddPlayerPacket;
 use pocketmine\network\protocol\RemovePlayerPacket;
 use pocketmine\network\protocol\SetEntityMotionPacket;
-use pocketmine\Network;
 use pocketmine\Player;
 use pocketmine\utils\TextFormat;
 
@@ -91,6 +90,7 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{
 				$drops[] = $item;
 			}
 		}
+
 		return $drops;
 	}
 

src/pocketmine/entity/Living.php

@@ -27,11 +27,11 @@ use pocketmine\event\entity\EntityDamageEvent;
 use pocketmine\event\entity\EntityDeathEvent;
 use pocketmine\event\entity\EntityRegainHealthEvent;
 use pocketmine\event\Timings;
+use pocketmine\item\Item;
 use pocketmine\math\Vector3;
 use pocketmine\nbt\tag\Short;
 use pocketmine\network\protocol\EntityEventPacket;
 use pocketmine\Server;
-use pocketmine\item\Item;
 
 abstract class Living extends Entity implements Damageable{
 

src/pocketmine/entity/Zombie.php

@@ -95,6 +95,7 @@ class Zombie extends Monster{
 				}
 			}
 		}
+
 		return $drops;
 	}
 }

src/pocketmine/event/Event.php

@@ -53,6 +53,7 @@ abstract class Event{
 		if(!($this instanceof Cancellable)){
 			throw new \BadMethodCallException("Event is not Cancellable");
 		}
+
 		return $this->isCancelled === true;
 	}
 

src/pocketmine/event/Timings.php

@@ -22,7 +22,6 @@
 namespace pocketmine\event;
 
 
-
 use pocketmine\entity\Entity;
 use pocketmine\plugin\PluginManager;
 use pocketmine\scheduler\PluginTask;

src/pocketmine/event/block/SignChangeEvent.php

@@ -23,7 +23,6 @@ namespace pocketmine\event\block;
 
 use pocketmine\block\Block;
 use pocketmine\event\Cancellable;
-use pocketmine\item\Item;
 use pocketmine\Player;
 
 /**

src/pocketmine/event/entity/EntityDamageByEntityEvent.php

@@ -22,7 +22,6 @@
 namespace pocketmine\event\entity;
 
 use pocketmine\entity\Entity;
-use pocketmine\event\Cancellable;
 
 class EntityDamageByEntityEvent extends EntityDamageEvent{
 	public static $handlerList = null;

src/pocketmine/event/entity/EntityDamageEvent.php

@@ -141,6 +141,7 @@ class EntityDamageEvent extends EntityEvent implements Cancellable{
 		foreach($this->modifiers as $type => $d){
 			$damage += $d;
 		}
+
 		return $damage;
 	}
 

src/pocketmine/event/entity/EntityDeathEvent.php

@@ -21,12 +21,8 @@
 
 namespace pocketmine\event\entity;
 
-use pocketmine\block\Block;
-use pocketmine\entity\Entity;
 use pocketmine\entity\Living;
-use pocketmine\event\Cancellable;
 use pocketmine\item\Item;
-use pocketmine\level\Position;
 
 class EntityDeathEvent extends EntityEvent{
 	public static $handlerList = null;

src/pocketmine/event/inventory/CraftItemEvent.php

@@ -36,6 +36,7 @@ class CraftItemEvent extends Event implements Cancellable{
 
 	/**
 	 * @param CraftingTransactionGroup $ts
+	 * @param Recipe                   $recipe
 	 */
 	public function __construct(CraftingTransactionGroup $ts, Recipe $recipe){
 		$this->ts = $ts;

src/pocketmine/event/level/ChunkLoadEvent.php

@@ -20,6 +20,7 @@
  */
 
 namespace pocketmine\event\level;
+
 use pocketmine\level\format\FullChunk;
 
 /**

src/pocketmine/event/level/ChunkUnloadEvent.php

@@ -20,6 +20,7 @@
  */
 
 namespace pocketmine\event\level;
+
 use pocketmine\event\Cancellable;
 
 /**

src/pocketmine/event/level/LevelUnloadEvent.php

@@ -20,6 +20,7 @@
  */
 
 namespace pocketmine\event\level;
+
 use pocketmine\event\Cancellable;
 
 /**

src/pocketmine/event/player/PlayerDeathEvent.php

@@ -21,9 +21,9 @@
 
 namespace pocketmine\event\player;
 
+use pocketmine\event\entity\EntityDeathEvent;
 use pocketmine\item\Item;
 use pocketmine\Player;
-use pocketmine\event\entity\EntityDeathEvent;
 
 class PlayerDeathEvent extends EntityDeathEvent{
 	public static $handlerList = null;

src/pocketmine/event/player/PlayerItemHeldEvent.php

@@ -21,8 +21,8 @@
 
 namespace pocketmine\event\player;
 
-use pocketmine\event\Cancellable;
 use pocketmine\Event;
+use pocketmine\event\Cancellable;
 use pocketmine\item\Item;
 use pocketmine\Player;
 

src/pocketmine/event/plugin/PluginDisableEvent.php

@@ -32,6 +32,6 @@ class PluginDisableEvent extends PluginEvent{
 	 * @param Plugin $plugin
 	 */
 	public function __construct(Plugin $plugin){
-		$this->plugin = $plugin;
+		parent::__construct($plugin);
 	}
 }

src/pocketmine/event/plugin/PluginEnableEvent.php

@@ -32,6 +32,6 @@ class PluginEnableEvent extends PluginEvent{
 	 * @param Plugin $plugin
 	 */
 	public function __construct(Plugin $plugin){
-		$this->plugin = $plugin;
+		parent::__construct($plugin);
 	}
 }

src/pocketmine/event/server/DataPacketReceiveEvent.php

@@ -21,8 +21,8 @@
 
 namespace pocketmine\event\server;
 
-use pocketmine\event;
 use pocketmine\event\Cancellable;
+use pocketmine\event;
 use pocketmine\network\protocol\DataPacket;
 use pocketmine\Player;
 

src/pocketmine/event/server/DataPacketSendEvent.php

@@ -21,8 +21,8 @@
 
 namespace pocketmine\event\server;
 
-use pocketmine\event;
 use pocketmine\event\Cancellable;
+use pocketmine\event;
 use pocketmine\network\protocol\DataPacket;
 use pocketmine\Player;
 

src/pocketmine/inventory/SimpleTransactionGroup.php

@@ -88,6 +88,8 @@ class SimpleTransactionGroup implements TransactionGroup{
 	/**
 	 * @param Item[] $needItems
 	 * @param Item[] $haveItems
+	 *
+	 * @return bool
 	 */
 	protected function matchItems(array &$needItems, array &$haveItems){
 		foreach($this->transactions as $key => $ts){
@@ -120,6 +122,8 @@ class SimpleTransactionGroup implements TransactionGroup{
 				}
 			}
 		}
+
+		return true;
 	}
 
 	public function canExecute(){

src/pocketmine/item/SpawnEgg.php

@@ -100,8 +100,10 @@ class SpawnEgg extends Item{
 				--$this->count;
 			}
 			$entity->spawnToAll();
+
 			return true;
 		}
+
 		return false;
 	}
 }

src/pocketmine/lang/Installer/fi_FI.ini

@@ -1,6 +1,3 @@
-
-
-
 default_gamemode = Normaali Peli Tila
 
 

src/pocketmine/level/Level.php

@@ -51,7 +51,6 @@ use pocketmine\math\Vector3;
 use pocketmine\metadata\BlockMetadataStore;
 use pocketmine\metadata\Metadatable;
 use pocketmine\metadata\MetadataValue;
-use pocketmine\nbt\NBT;
 use pocketmine\nbt\tag\Byte;
 use pocketmine\nbt\tag\Compound;
 use pocketmine\nbt\tag\Double;
@@ -67,12 +66,10 @@ use pocketmine\plugin\Plugin;
 use pocketmine\scheduler\AsyncTask;
 use pocketmine\Server;
 use pocketmine\tile\Sign;
-use pocketmine\tile\Spawnable;
 use pocketmine\tile\Tile;
 use pocketmine\utils\Cache;
 use pocketmine\utils\ReversePriorityQueue;
 use pocketmine\utils\TextFormat;
-use raklib\Binary;
 
 
 class Level implements ChunkManager, Metadatable{
@@ -925,6 +922,7 @@ class Level implements ChunkManager, Metadatable{
 			if($item->isActivable and $item->onActivate($this, $player, $block, $target, $face, $fx, $fy, $fz)){
 				if($item->getCount() <= 0){
 					$item = Item::get(Item::AIR, 0, 0);
+
 					return true;
 				}
 			}
@@ -937,6 +935,7 @@ class Level implements ChunkManager, Metadatable{
 			$hand->position($block);
 		}elseif($block->getID() === Item::FIRE){
 			$this->setBlock($block, new Air(), true, false, true);
+
 			return false;
 		}else{
 			return false;
@@ -957,7 +956,6 @@ class Level implements ChunkManager, Metadatable{
 		}
 
 
-
 		if($player instanceof Player){
 			$ev = new BlockPlaceEvent($player, $hand, $block, $target, $item);
 			if(!$player->isOp() and ($distance = $this->server->getConfigInt("spawn-protection", 16)) > -1){
@@ -1308,8 +1306,10 @@ class Level implements ChunkManager, Metadatable{
 			return $this->chunks[$index];
 		}elseif(($chunk = $this->provider->getChunk($x, $z, $create)) instanceof FullChunk){
 			$this->chunks[$index] = $chunk;
+
 			return $chunk;
 		}
+
 		return null;
 	}
 
@@ -1564,6 +1564,7 @@ class Level implements ChunkManager, Metadatable{
 		}
 
 		$this->server->getPluginManager()->callEvent(new ChunkLoadEvent($chunk, !$chunk->isGenerated()));
+
 		return true;
 	}
 
@@ -1678,6 +1679,7 @@ class Level implements ChunkManager, Metadatable{
 	 * Sets the spawnpoint
 	 *
 	 * @param Vector3 $pos
+	 *
 	 * @deprecated
 	 */
 	public function setSpawn(Vector3 $pos){

src/pocketmine/level/format/Chunk.php

@@ -21,9 +21,6 @@
 
 namespace pocketmine\level\format;
 
-use pocketmine\entity\Entity;
-use pocketmine\tile\Tile;
-
 interface Chunk extends FullChunk{
 	const SECTION_COUNT = 8;
 

src/pocketmine/level/format/LevelProviderManager.php

@@ -59,6 +59,7 @@ abstract class LevelProviderManager{
 
 	public static function getProviderByName($name){
 		$name = trim(strtolower($name));
+
 		return isset(self::$providers[$name]) ? self::$providers[$name] : null;
 	}
 }

src/pocketmine/level/format/anvil/Anvil.php

@@ -60,6 +60,7 @@ class Anvil extends McRegion{
 				}
 			}
 		}
+
 		return $isValid;
 	}
 

src/pocketmine/level/format/anvil/Chunk.php

@@ -193,6 +193,7 @@ class Chunk extends BaseChunk{
 		$writer = new NBT(NBT::BIG_ENDIAN);
 		$nbt->setName("Level");
 		$writer->setData(new Compound("", array("Level" => $nbt)));
+
 		return $writer->writeCompressed(ZLIB_ENCODING_DEFLATE, RegionLoader::$COMPRESSION_LEVEL);
 	}
 }

src/pocketmine/level/format/anvil/ChunkRequestTask.php

@@ -115,6 +115,7 @@ class ChunkRequestTask extends AsyncTask{
 		for($y = 0; $y < 128; ++$y){
 			$column .= $data{($y << 8) + $i};
 		}
+
 		return $column;
 	}
 
@@ -130,6 +131,7 @@ class ChunkRequestTask extends AsyncTask{
 				$column .= chr((ord($data{($y << 7) + $i}) & 0xf0) >> 4) | ($data{(($y + 1) << 7) + $i} & "\xf0");
 			}
 		}
+
 		return $column;
 	}
 

src/pocketmine/level/format/anvil/ChunkSection.php

@@ -157,6 +157,7 @@ class ChunkSection implements \pocketmine\level\format\ChunkSection{
 		for($y = 0; $y < 16; ++$y){
 			$column .= $this->blocks{($y << 8) + $i};
 		}
+
 		return $column;
 	}
 

src/pocketmine/level/format/anvil/RegionLoader.php

@@ -93,6 +93,7 @@ class RegionLoader extends \pocketmine\level\format\mcregion\RegionLoader{
 			$this->writeLocationIndex($index);
 		}elseif($compression !== self::COMPRESSION_ZLIB and $compression !== self::COMPRESSION_GZIP){
 			trigger_error("Invalid compression type", E_USER_WARNING);
+
 			return false;
 		}
 
@@ -102,6 +103,7 @@ class RegionLoader extends \pocketmine\level\format\mcregion\RegionLoader{
 		}elseif($forward === false){
 			trigger_error("Corrupted chunk detected", E_USER_WARNING);
 			$this->generateChunk($x, $z);
+
 			return $this->readChunk($x, $z, $generate, true);
 		}else{
 			return null;

src/pocketmine/level/format/generic/BaseChunk.php

@@ -24,7 +24,6 @@ namespace pocketmine\level\format\generic;
 use pocketmine\entity\DroppedItem;
 use pocketmine\entity\Entity;
 use pocketmine\level\format\Chunk;
-use pocketmine\level\format\FullChunk;
 use pocketmine\level\format\ChunkSection;
 use pocketmine\level\format\LevelProvider;
 use pocketmine\nbt\tag\Compound;
@@ -153,6 +152,7 @@ abstract class BaseChunk extends BaseFullChunk implements Chunk{
 		}catch(\Exception $e){
 			$level = $this->getProvider();
 			$this->setInternalSection($Y = $y >> 4, $level::createChunkSection($Y));
+
 			return $this->setBlock($x, $y, $z, $blockId, $meta);
 		}
 	}
@@ -218,6 +218,7 @@ abstract class BaseChunk extends BaseFullChunk implements Chunk{
 		for($y = 0; $y < Chunk::SECTION_COUNT; ++$y){
 			$column .= $this->sections[$y]->getBlockIdColumn($x, $z);
 		}
+
 		return $column;
 	}
 
@@ -226,6 +227,7 @@ abstract class BaseChunk extends BaseFullChunk implements Chunk{
 		for($y = 0; $y < Chunk::SECTION_COUNT; ++$y){
 			$column .= $this->sections[$y]->getBlockDataColumn($x, $z);
 		}
+
 		return $column;
 	}
 
@@ -234,6 +236,7 @@ abstract class BaseChunk extends BaseFullChunk implements Chunk{
 		for($y = 0; $y < Chunk::SECTION_COUNT; ++$y){
 			$column .= $this->sections[$y]->getBlockSkyLightColumn($x, $z);
 		}
+
 		return $column;
 	}
 
@@ -242,6 +245,7 @@ abstract class BaseChunk extends BaseFullChunk implements Chunk{
 		for($y = 0; $y < Chunk::SECTION_COUNT; ++$y){
 			$column .= $this->sections[$y]->getBlockLightColumn($x, $z);
 		}
+
 		return $column;
 	}
 
@@ -274,6 +278,7 @@ abstract class BaseChunk extends BaseFullChunk implements Chunk{
 		for($y = 0; $y < Chunk::SECTION_COUNT; ++$y){
 			$blocks .= $this->sections[$y]->getIdArray();
 		}
+
 		return $blocks;
 	}
 
@@ -282,6 +287,7 @@ abstract class BaseChunk extends BaseFullChunk implements Chunk{
 		for($y = 0; $y < Chunk::SECTION_COUNT; ++$y){
 			$data .= $this->sections[$y]->getDataArray();
 		}
+
 		return $data;
 	}
 
@@ -290,6 +296,7 @@ abstract class BaseChunk extends BaseFullChunk implements Chunk{
 		for($y = 0; $y < Chunk::SECTION_COUNT; ++$y){
 			$skyLight .= $this->sections[$y]->getSkyLightArray();
 		}
+
 		return $skyLight;
 	}
 
@@ -298,6 +305,7 @@ abstract class BaseChunk extends BaseFullChunk implements Chunk{
 		for($y = 0; $y < Chunk::SECTION_COUNT; ++$y){
 			$blockLight .= $this->sections[$y]->getLightArray();
 		}
+
 		return $blockLight;
 	}
 

src/pocketmine/level/format/generic/BaseFullChunk.php

@@ -188,6 +188,7 @@ abstract class BaseFullChunk implements FullChunk{
 
 	public function getBiomeColor($x, $z){
 		$color = $this->biomeColors[($z << 4) + $x] & 0xFFFFFF;
+
 		return [$color >> 16, ($color >> 8) & 0xFF, $color & 0xFF];
 	}
 

src/pocketmine/level/format/mcregion/Chunk.php

@@ -299,6 +299,7 @@ class Chunk extends BaseFullChunk{
 		$writer = new NBT(NBT::BIG_ENDIAN);
 		$nbt->setName("Level");
 		$writer->setData(new Compound("", array("Level" => $nbt)));
+
 		return $writer->writeCompressed(ZLIB_ENCODING_DEFLATE, RegionLoader::$COMPRESSION_LEVEL);
 	}
 

src/pocketmine/level/format/mcregion/McRegion.php

@@ -67,6 +67,7 @@ class McRegion extends BaseLevelProvider{
 				}
 			}
 		}
+
 		return $isValid;
 	}
 
@@ -214,6 +215,7 @@ class McRegion extends BaseLevelProvider{
 
 			unset($this->chunks[$index]);
 		}
+
 		return true;
 	}
 
@@ -252,6 +254,7 @@ class McRegion extends BaseLevelProvider{
 			return $this->chunks[$index];
 		}else{
 			$this->loadChunk($chunkX, $chunkZ, $create);
+
 			return isset($this->chunks[$index]) ? $this->chunks[$index] : null;
 		}
 	}

src/pocketmine/level/format/mcregion/RegionLoader.php

@@ -31,7 +31,6 @@ use pocketmine\nbt\tag\Enum;
 use pocketmine\nbt\tag\Int;
 use pocketmine\nbt\tag\IntArray;
 use pocketmine\nbt\tag\Long;
-use pocketmine\Player;
 use pocketmine\utils\Binary;
 
 class RegionLoader{
@@ -117,6 +116,7 @@ class RegionLoader{
 			$this->writeLocationIndex($index);
 		}elseif($compression !== self::COMPRESSION_ZLIB and $compression !== self::COMPRESSION_GZIP){
 			trigger_error("Invalid compression type", E_USER_WARNING);
+
 			return false;
 		}
 
@@ -126,6 +126,7 @@ class RegionLoader{
 		}elseif($forward === false){
 			trigger_error("Corrupted chunk detected", E_USER_WARNING);
 			$this->generateChunk($x, $z);
+
 			return $this->readChunk($x, $z, $generate, true);
 		}else{
 			return null;

src/pocketmine/level/generator/Flat.php

@@ -21,7 +21,6 @@
 
 namespace pocketmine\level\generator;
 
-use pocketmine\level\format\FullChunk;
 use pocketmine\block\CoalOre;
 use pocketmine\block\DiamondOre;
 use pocketmine\block\Dirt;
@@ -31,6 +30,7 @@ use pocketmine\block\IronOre;
 use pocketmine\block\LapisOre;
 use pocketmine\block\RedstoneOre;
 use pocketmine\item\Item;
+use pocketmine\level\format\FullChunk;
 use pocketmine\level\generator\populator\Ore;
 use pocketmine\level\generator\populator\Populator;
 use pocketmine\math\Vector3 as Vector3;

src/pocketmine/level/generator/GenerationChunkManager.php

@@ -80,6 +80,7 @@ class GenerationChunkManager implements ChunkManager{
 		$index = Level::chunkHash($chunkX, $chunkZ);
 		$chunk = !isset($this->chunks[$index]) ? $this->requestChunk($chunkX, $chunkZ) : $this->chunks[$index];
 		$this->changes[$index] = $chunk;
+
 		return $chunk;
 	}
 
@@ -153,6 +154,7 @@ class GenerationChunkManager implements ChunkManager{
 	protected function requestChunk($chunkX, $chunkZ){
 		$chunk = $this->manager->requestChunk($this->levelID, $chunkX, $chunkZ);
 		$this->chunks[$index = Level::chunkHash($chunkX, $chunkZ)] = $chunk;
+
 		return $chunk;
 	}
 

src/pocketmine/level/generator/GenerationManager.php

@@ -238,6 +238,7 @@ class GenerationManager{
 		if(($len = Binary::readInt($len)) <= 0){
 			$this->shutdown = true;
 			$this->getLogger()->critical("Generation Thread found a stream error, shutting down");
+
 			return;
 		}
 

src/pocketmine/level/generator/GenerationRequestManager.php

@@ -22,7 +22,6 @@
 namespace pocketmine\level\generator;
 
 use pocketmine\level\format\FullChunk;
-use pocketmine\level\format\mcregion\Chunk;
 use pocketmine\level\Level;
 use pocketmine\Server;
 use pocketmine\utils\Binary;

src/pocketmine/math/Vector3.php

@@ -84,6 +84,7 @@ class Vector3{
 	 * @param Vector3|int $x
 	 * @param int         $y
 	 * @param int         $z
+	 *
 	 * @return Vector3
 	 */
 	public function add($x, $y = 0, $z = 0){
@@ -98,6 +99,7 @@ class Vector3{
 	 * @param Vector3|int $x
 	 * @param int         $y
 	 * @param int         $z
+	 *
 	 * @return Vector3
 	 */
 	public function subtract($x = 0, $y = 0, $z = 0){

src/pocketmine/nbt/tag/Enum.php

@@ -42,6 +42,7 @@ class Enum extends NamedTag implements \ArrayAccess, \Countable{
 				$value[$k] = $v;
 			}
 		}
+
 		return $value;
 	}
 
@@ -84,6 +85,8 @@ class Enum extends NamedTag implements \ArrayAccess, \Countable{
 				}
 			}
 		}
+
+		return $i;
 	}
 
 	public function getType(){

src/pocketmine/network/RakLibInterface.php

@@ -120,8 +120,10 @@ class RakLibInterface implements ServerInstance, SourceInterface{
 		$work = false;
 		if($this->interface->handlePacket()){
 			$work = true;
-			while($this->interface->handlePacket()){}
+			while($this->interface->handlePacket()){
 			}
+		}
+
 		return $work;
 	}
 

src/pocketmine/network/query/QueryHandler.php

@@ -30,7 +30,7 @@ use pocketmine\utils\Binary;
 use pocketmine\utils\Utils;
 
 class QueryHandler{
-	private $socket, $server, $lastToken, $token, $longData, $timeout;
+	private $server, $lastToken, $token, $longData, $timeout;
 
 	const HANDSHAKE = 9;
 	const STATISTICS = 0;

src/pocketmine/network/rcon/RCON.php

@@ -29,7 +29,6 @@ use pocketmine\command\RemoteConsoleCommandSender;
 use pocketmine\event\server\RemoteServerCommandEvent;
 use pocketmine\scheduler\CallbackTask;
 use pocketmine\Server;
-use pocketmine\utils\MainLogger;
 use pocketmine\utils\TextFormat;
 
 

src/pocketmine/plugin/PharPluginLoader.php

@@ -24,7 +24,6 @@ namespace pocketmine\plugin;
 use pocketmine\event\plugin\PluginDisableEvent;
 use pocketmine\event\plugin\PluginEnableEvent;
 use pocketmine\Server;
-use pocketmine\utils\MainLogger;
 
 /**
  * Handles different types of plugins

src/pocketmine/plugin/PluginManager.php

@@ -319,9 +319,11 @@ class PluginManager{
 			}
 
 			TimingsCommand::$timingStart = microtime(true);
+
 			return $loadedPlugins;
 		}else{
 			TimingsCommand::$timingStart = microtime(true);
+
 			return [];
 		}
 	}

src/pocketmine/plugin/RegisteredListener.php

@@ -47,7 +47,6 @@ class RegisteredListener{
 	private $timings;
 
 
-
 	/**
 	 * @param Listener       $listener
 	 * @param EventExecutor  $executor

src/pocketmine/scheduler/AsyncTask.php

@@ -20,6 +20,7 @@
 */
 
 namespace pocketmine\scheduler;
+
 use pocketmine\Server;
 
 /**

src/pocketmine/scheduler/ServerScheduler.php

@@ -243,8 +243,10 @@ class ServerScheduler{
 			$task->onCompletion(Server::getInstance());
 			$task->setCompleted();
 			unset($this->asyncTaskStorage[$task->getTaskId()]);
+
 			return true;
 		}
+
 		return false;
 	}
 

src/pocketmine/scheduler/TaskHandler.php

@@ -154,6 +154,7 @@ class TaskHandler{
 		if($this->timingName !== null){
 			return $this->timingName;
 		}
+
 		return get_class($this->task);
 	}
 }

src/pocketmine/tile/Chest.php

@@ -25,7 +25,6 @@ use pocketmine\inventory\ChestInventory;
 use pocketmine\inventory\DoubleChestInventory;
 use pocketmine\inventory\InventoryHolder;
 use pocketmine\item\Item;
-use pocketmine\level\format\Chunk;
 use pocketmine\level\format\FullChunk;
 use pocketmine\math\Vector3 as Vector3;
 use pocketmine\nbt\NBT;

src/pocketmine/tile/Furnace.php

@@ -26,7 +26,6 @@ use pocketmine\inventory\FurnaceInventory;
 use pocketmine\inventory\FurnaceRecipe;
 use pocketmine\inventory\InventoryHolder;
 use pocketmine\item\Item;
-use pocketmine\level\format\Chunk;
 use pocketmine\level\format\FullChunk;
 use pocketmine\nbt\NBT;
 use pocketmine\nbt\tag\Byte;

src/pocketmine/tile/Sign.php

@@ -21,7 +21,6 @@
 
 namespace pocketmine\tile;
 
-use pocketmine\level\format\Chunk;
 use pocketmine\level\format\FullChunk;
 use pocketmine\nbt\tag\Compound;
 use pocketmine\nbt\tag\Int;

src/pocketmine/tile/Spawnable.php

@@ -21,7 +21,6 @@
 
 namespace pocketmine\tile;
 
-use pocketmine\level\format\Chunk;
 use pocketmine\level\format\FullChunk;
 use pocketmine\nbt\NBT;
 use pocketmine\nbt\tag\Compound;

src/pocketmine/tile/Tile.php

@@ -28,7 +28,6 @@ namespace pocketmine\tile;
 use pocketmine\event\Timings;
 use pocketmine\level\format\Chunk;
 use pocketmine\level\format\FullChunk;
-use pocketmine\level\format\LevelProvider;
 use pocketmine\level\Level;
 use pocketmine\level\Position;
 use pocketmine\nbt\tag\Compound;

src/pocketmine/wizard/Installer.php

@@ -89,6 +89,7 @@ LICENSE;
 		if(strtolower($this->getInput("n")) != "y"){
 			echo "[!] " . $this->lang->you_have_to_accept_the_license . "\n";
 			sleep(5);
+
 			return false;
 		}