diff --git a/src/pocketmine/Achievement.php b/src/pocketmine/Achievement.php index 232a0a162..af014d57a 100644 --- a/src/pocketmine/Achievement.php +++ b/src/pocketmine/Achievement.php @@ -20,6 +20,7 @@ */ namespace pocketmine; + use pocketmine\utils\TextFormat; /** diff --git a/src/pocketmine/OfflinePlayer.php b/src/pocketmine/OfflinePlayer.php index 33c258bae..b71e5b2af 100644 --- a/src/pocketmine/OfflinePlayer.php +++ b/src/pocketmine/OfflinePlayer.php @@ -22,7 +22,6 @@ namespace pocketmine; -use pocketmine\nbt\NBT; use pocketmine\nbt\tag\Compound; class OfflinePlayer implements IPlayer{ @@ -114,5 +113,4 @@ class OfflinePlayer implements IPlayer{ } - } diff --git a/src/pocketmine/Player.php b/src/pocketmine/Player.php index 497c5df0f..a82334a00 100644 --- a/src/pocketmine/Player.php +++ b/src/pocketmine/Player.php @@ -31,12 +31,6 @@ use pocketmine\math\Vector3 as Vector3; use pocketmine\nbt\NBT; use pocketmine\nbt\tag\Byte; use pocketmine\nbt\tag\Compound; -use pocketmine\nbt\tag\Double; -use pocketmine\nbt\tag\Enum; -use pocketmine\nbt\tag\Float; -use pocketmine\nbt\tag\Int; -use pocketmine\nbt\tag\Long; -use pocketmine\nbt\tag\Short; use pocketmine\nbt\tag\String; use pocketmine\network\protocol\AdventureSettingsPacket; use pocketmine\network\protocol\ChunkDataPacket; @@ -69,7 +63,6 @@ use pocketmine\tile\Furnace; use pocketmine\tile\Sign; use pocketmine\tile\Spawnable; use pocketmine\tile\Tile; -use pocketmine\utils\Config; use pocketmine\utils\TextFormat; use pocketmine\utils\Utils; diff --git a/src/pocketmine/Server.php b/src/pocketmine/Server.php index bb1e8e805..b64eabfb9 100644 --- a/src/pocketmine/Server.php +++ b/src/pocketmine/Server.php @@ -464,6 +464,7 @@ class Server{ if($result === null){ $result = new OfflinePlayer($this, $name); } + return $result; } @@ -568,10 +569,12 @@ class Server{ console("[NOTICE] Player data not found for \"" . $name . "\", creating new profile"); } $this->saveOfflinePlayerData($name, $nbt); + return $nbt; }else{ $nbt = new NBT(NBT::BIG_ENDIAN); $nbt->readCompressed(file_get_contents($path . "$name.dat")); + return $nbt->getData(); } } @@ -607,6 +610,7 @@ class Server{ } } } + return $found; } diff --git a/src/pocketmine/command/PluginCommand.php b/src/pocketmine/command/PluginCommand.php index daa7a2c79..401926b37 100644 --- a/src/pocketmine/command/PluginCommand.php +++ b/src/pocketmine/command/PluginCommand.php @@ -56,7 +56,7 @@ class PluginCommand extends Command{ $success = $this->executor->onCommand($sender, $this, $commandLabel, $args); if(!$success and $this->usageMessage !== ""){ - $sender->sendMessage(TextFormat::RED . "Usage: ". $this->usageMessage); + $sender->sendMessage(TextFormat::RED . "Usage: " . $this->usageMessage); } return $success; diff --git a/src/pocketmine/command/defaults/ListCommand.php b/src/pocketmine/command/defaults/ListCommand.php index 570b1a36f..9cb7e0ff2 100644 --- a/src/pocketmine/command/defaults/ListCommand.php +++ b/src/pocketmine/command/defaults/ListCommand.php @@ -21,11 +21,9 @@ namespace pocketmine\command\defaults; -use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\Player; use pocketmine\Server; -use pocketmine\utils\TextFormat; class ListCommand extends VanillaCommand{ @@ -51,7 +49,7 @@ class ListCommand extends VanillaCommand{ } } - $sender->sendMessage("There are ".count(Server::getInstance()->getOnlinePlayers())."/".Server::getInstance()->getMaxPlayers()." players online:\n" . substr($online, 0, -2)); + $sender->sendMessage("There are " . count(Server::getInstance()->getOnlinePlayers()) . "/" . Server::getInstance()->getMaxPlayers() . " players online:\n" . substr($online, 0, -2)); return true; } diff --git a/src/pocketmine/command/defaults/StopCommand.php b/src/pocketmine/command/defaults/StopCommand.php index a4edc73fd..c405ff2f3 100644 --- a/src/pocketmine/command/defaults/StopCommand.php +++ b/src/pocketmine/command/defaults/StopCommand.php @@ -23,7 +23,6 @@ namespace pocketmine\command\defaults; use pocketmine\command\Command; use pocketmine\command\CommandSender; -use pocketmine\Player; use pocketmine\Server; class StopCommand extends VanillaCommand{ diff --git a/src/pocketmine/entity/Entity.php b/src/pocketmine/entity/Entity.php index 52e65f05f..7f37d7a1a 100644 --- a/src/pocketmine/entity/Entity.php +++ b/src/pocketmine/entity/Entity.php @@ -34,11 +34,11 @@ use pocketmine\level\Position; use pocketmine\math\AxisAlignedBB; use pocketmine\math\Vector3 as Vector3; use pocketmine\nbt\tag\Compound; +use pocketmine\Network; use pocketmine\network\protocol\MoveEntityPacket_PosRot; use pocketmine\network\protocol\MovePlayerPacket; use pocketmine\network\protocol\RemoveEntityPacket; use pocketmine\network\protocol\SetEntityMotionPacket; -use pocketmine\Network; use pocketmine\network\protocol\SetTimePacket; use pocketmine\Player; use pocketmine\pmf\LevelFormat; diff --git a/src/pocketmine/entity/Human.php b/src/pocketmine/entity/Human.php index ce9697808..06d3b7406 100644 --- a/src/pocketmine/entity/Human.php +++ b/src/pocketmine/entity/Human.php @@ -29,13 +29,13 @@ 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\ContainerSetContentPacket; use pocketmine\network\protocol\PlayerArmorEquipmentPacket; use pocketmine\network\protocol\PlayerEquipmentPacket; use pocketmine\network\protocol\RemovePlayerPacket; use pocketmine\network\protocol\SetEntityMotionPacket; -use pocketmine\Network; use pocketmine\Player; use pocketmine\Server; diff --git a/src/pocketmine/event/player/PlayerItemHeldEvent.php b/src/pocketmine/event/player/PlayerItemHeldEvent.php index 2802e5492..fb359ecb5 100644 --- a/src/pocketmine/event/player/PlayerItemHeldEvent.php +++ b/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; diff --git a/src/pocketmine/event/server/DataPacketReceiveEvent.php b/src/pocketmine/event/server/DataPacketReceiveEvent.php index b8bc6392a..7de47696c 100644 --- a/src/pocketmine/event/server/DataPacketReceiveEvent.php +++ b/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; diff --git a/src/pocketmine/event/server/DataPacketSendEvent.php b/src/pocketmine/event/server/DataPacketSendEvent.php index eefaa0ee7..805354abb 100644 --- a/src/pocketmine/event/server/DataPacketSendEvent.php +++ b/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; diff --git a/src/pocketmine/event/tile/TileInventoryChangeEvent.php b/src/pocketmine/event/tile/TileInventoryChangeEvent.php index 30d7c21e1..af635f92d 100644 --- a/src/pocketmine/event/tile/TileInventoryChangeEvent.php +++ b/src/pocketmine/event/tile/TileInventoryChangeEvent.php @@ -21,8 +21,8 @@ namespace pocketmine\event\tile; -use pocketmine\Event; use pocketmine\event\Cancellable; +use pocketmine\Event; use pocketmine\item\Item; use pocketmine\tile\Tile; diff --git a/src/pocketmine/level/Level.php b/src/pocketmine/level/Level.php index da021e4dc..99b1742f0 100644 --- a/src/pocketmine/level/Level.php +++ b/src/pocketmine/level/Level.php @@ -305,7 +305,7 @@ class Level{ /** * Generates a new level * - * @param string $name + * @param string $name * @param bool $seed * @param bool $generator * @param bool|array $options diff --git a/src/pocketmine/network/query/QueryHandler.php b/src/pocketmine/network/query/QueryHandler.php index f4191d763..57ac78a53 100644 --- a/src/pocketmine/network/query/QueryHandler.php +++ b/src/pocketmine/network/query/QueryHandler.php @@ -26,7 +26,6 @@ namespace pocketmine\network\query; use pocketmine\level\Level; -use pocketmine\Player; use pocketmine\Server; use pocketmine\utils\Utils; diff --git a/src/pocketmine/permission/PermissibleBase.php b/src/pocketmine/permission/PermissibleBase.php index 5d94f8796..781f9fbc3 100644 --- a/src/pocketmine/permission/PermissibleBase.php +++ b/src/pocketmine/permission/PermissibleBase.php @@ -102,6 +102,7 @@ class PermissibleBase implements Permissible{ if(($perm = Server::getInstance()->getPluginManager()->getPermission($name)) !== null){ $perm = $perm->getDefault(); + return $perm === Permission::DEFAULT_TRUE or ($this->isOp() and $perm === Permission::DEFAULT_OP) or (!$this->isOp() and $perm === Permission::DEFAULT_NOT_OP); }else{ return Permission::$DEFAULT_PERMISSION === Permission::DEFAULT_TRUE or ($this->isOp() and Permission::$DEFAULT_PERMISSION === Permission::DEFAULT_OP) or (!$this->isOp() and Permission::$DEFAULT_PERMISSION === Permission::DEFAULT_NOT_OP); diff --git a/src/pocketmine/plugin/FolderPluginLoader.php b/src/pocketmine/plugin/FolderPluginLoader.php index 0745ac344..74be625f2 100644 --- a/src/pocketmine/plugin/FolderPluginLoader.php +++ b/src/pocketmine/plugin/FolderPluginLoader.php @@ -51,7 +51,7 @@ class FolderPluginLoader implements PluginLoader{ if(is_dir($file) and file_exists($file . "/plugin.yml") and file_exists($file . "/src/")){ if(($description = $this->getPluginDescription($file)) instanceof PluginDescription){ console("[INFO] Loading " . $description->getFullName()); - console("[WARNING] Non-packaged plugin ".$description->getName() ." detected, do not use on production."); + console("[WARNING] Non-packaged plugin " . $description->getName() . " detected, do not use on production."); $dataFolder = dirname($file) . DIRECTORY_SEPARATOR . $description->getName(); if(file_exists($dataFolder) and !is_dir($dataFolder)){ trigger_error("Projected dataFolder '" . $dataFolder . "' for " . $description->getName() . " exists and is not a directory", E_USER_WARNING); diff --git a/src/pocketmine/plugin/PharPluginLoader.php b/src/pocketmine/plugin/PharPluginLoader.php index f1f14f04b..5c19a186f 100644 --- a/src/pocketmine/plugin/PharPluginLoader.php +++ b/src/pocketmine/plugin/PharPluginLoader.php @@ -73,6 +73,7 @@ class PharPluginLoader implements PluginLoader{ return null; } } + return null; } diff --git a/src/pocketmine/plugin/PluginManager.php b/src/pocketmine/plugin/PluginManager.php index c16d6cdcf..040b8460f 100644 --- a/src/pocketmine/plugin/PluginManager.php +++ b/src/pocketmine/plugin/PluginManager.php @@ -555,6 +555,7 @@ class PluginManager{ $pluginCmds[] = $newCmd; } } + return $pluginCmds; } @@ -616,7 +617,8 @@ class PluginManager{ */ public function registerEvents(Listener $listener, Plugin $plugin){ if(!$plugin->isEnabled()){ - trigger_error("Plugin attempted to register ".get_class($listener)." while not enabled", E_USER_WARNING); + trigger_error("Plugin attempted to register " . get_class($listener) . " while not enabled", E_USER_WARNING); + return; } @@ -627,8 +629,8 @@ class PluginManager{ $ignoreCancelled = false; if(preg_match("/^[\t ]*\\* @priority[\t ]{1,}([a-zA-Z]{1,})$/m", (string) $method->getDocComment(), $matches) > 0){ $matches[1] = strtoupper($matches[1]); - if(defined("pocketmine\\event\\EventPriority::".$matches[1])){ - $priority = constant("pocketmine\\event\\EventPriority::".$matches[1]); + if(defined("pocketmine\\event\\EventPriority::" . $matches[1])){ + $priority = constant("pocketmine\\event\\EventPriority::" . $matches[1]); } } if(preg_match("/^[\t ]*\\* @ignoreCancelled[\t ]{1,}([a-zA-Z]{1,})$/m", (string) $method->getDocComment(), $matches) > 0){ diff --git a/src/pocketmine/tile/Container.php b/src/pocketmine/tile/Container.php index 191ce5161..b11954738 100644 --- a/src/pocketmine/tile/Container.php +++ b/src/pocketmine/tile/Container.php @@ -26,10 +26,10 @@ use pocketmine\item\Item; use pocketmine\nbt\tag\Byte; use pocketmine\nbt\tag\Compound; use pocketmine\nbt\tag\Short; -use pocketmine\Network; use pocketmine\network\protocol\ContainerOpenPacket; use pocketmine\network\protocol\ContainerSetContentPacket; use pocketmine\network\protocol\TileEventPacket; +use pocketmine\Network; use pocketmine\Player; use pocketmine\Server;