mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-07 12:18:46 +00:00
Code Issues Projects Releases Wiki Activity

More PHP 7.1 nullables

Browse Source
This commit is contained in:
Dylan K. Taylor 2019-02-22 12:55:34 +00:00
parent 73a565355b
commit c26544475e
28 changed files with 50 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/pocketmine/Player.php
View File

@ -609,7 +609,7 @@ class Player extends Human implements CommandSender, ChunkLoader, ChunkListener,
*
* @return PermissionAttachment
*/
public function addAttachment(Plugin $plugin, string $name = null, bool $value = null) : PermissionAttachment{
public function addAttachment(Plugin $plugin, ?string $name = null, ?bool $value = null) : PermissionAttachment{
return $this->perm->addAttachment($plugin, $name, $value);
}
@ -910,7 +910,7 @@ class Player extends Human implements CommandSender, ChunkLoader, ChunkListener,
return false;
}
protected function unloadChunk(int $x, int $z, Level $level = null){
protected function unloadChunk(int $x, int $z, ?Level $level = null){
$level = $level ?? $this->level;
$index = Level::chunkHash($x, $z);
if(isset($this->usedChunks[$index])){
@ -3132,7 +3132,7 @@ class Player extends Human implements CommandSender, ChunkLoader, ChunkListener,
return $result;
}
public function sendPosition(Vector3 $pos, float $yaw = null, float $pitch = null, int $mode = MovePlayerPacket::MODE_NORMAL, array $targets = null){
public function sendPosition(Vector3 $pos, ?float $yaw = null, ?float $pitch = null, int $mode = MovePlayerPacket::MODE_NORMAL, ?array $targets = null){
$yaw = $yaw ?? $this->yaw;
$pitch = $pitch ?? $this->pitch;
@ -3156,7 +3156,7 @@ class Player extends Human implements CommandSender, ChunkLoader, ChunkListener,
/**
* {@inheritdoc}
*/
public function teleport(Vector3 $pos, float $yaw = null, float $pitch = null) : bool{
public function teleport(Vector3 $pos, ?float $yaw = null, ?float $pitch = null) : bool{
if(parent::teleport($pos, $yaw, $pitch)){
$this->removeAllWindows();
@ -3298,7 +3298,7 @@ class Player extends Human implements CommandSender, ChunkLoader, ChunkListener,
* @throws \InvalidArgumentException if a forceID which is already in use is specified
* @throws \InvalidStateException if trying to add a window without forceID when no slots are free
*/
public function addWindow(Inventory $inventory, int $forceId = null, bool $isPermanent = false) : int{
public function addWindow(Inventory $inventory, ?int $forceId = null, bool $isPermanent = false) : int{
if(($id = $this->getWindowId($inventory)) !== ContainerIds::NONE){
return $id;
}

12
src/pocketmine/Server.php
View File

@ -1333,7 +1333,7 @@ class Server{
*
* @return int
*/
public function broadcastMessage($message, array $recipients = null) : int{
public function broadcastMessage($message, ?array $recipients = null) : int{
if(!is_array($recipients)){
return $this->broadcast($message, self::BROADCAST_CHANNEL_USERS);
}
@ -1363,7 +1363,7 @@ class Server{
*
* @return int
*/
public function broadcastTip(string $tip, array $recipients = null) : int{
public function broadcastTip(string $tip, ?array $recipients = null) : int{
$recipients = $recipients ?? $this->selectPermittedPlayers(self::BROADCAST_CHANNEL_USERS);
/** @var Player[] $recipients */
@ -1380,7 +1380,7 @@ class Server{
*
* @return int
*/
public function broadcastPopup(string $popup, array $recipients = null) : int{
public function broadcastPopup(string $popup, ?array $recipients = null) : int{
$recipients = $recipients ?? $this->selectPermittedPlayers(self::BROADCAST_CHANNEL_USERS);
/** @var Player[] $recipients */
@ -1401,7 +1401,7 @@ class Server{
*
* @return int
*/
public function broadcastTitle(string $title, string $subtitle = "", int $fadeIn = -1, int $stay = -1, int $fadeOut = -1, array $recipients = null) : int{
public function broadcastTitle(string $title, string $subtitle = "", int $fadeIn = -1, int $stay = -1, int $fadeOut = -1, ?array $recipients = null) : int{
$recipients = $recipients ?? $this->selectPermittedPlayers(self::BROADCAST_CHANNEL_USERS);
/** @var Player[] $recipients */
@ -1916,7 +1916,7 @@ class Server{
* @param string $xboxUserId
* @param Player[]|null $players
*/
public function updatePlayerListData(UUID $uuid, int $entityId, string $name, Skin $skin, string $xboxUserId = "", array $players = null){
public function updatePlayerListData(UUID $uuid, int $entityId, string $name, Skin $skin, string $xboxUserId = "", ?array $players = null){
$pk = new PlayerListPacket();
$pk->type = PlayerListPacket::TYPE_ADD;
@ -1929,7 +1929,7 @@ class Server{
* @param UUID $uuid
* @param Player[]|null $players
*/
public function removePlayerListData(UUID $uuid, array $players = null){
public function removePlayerListData(UUID $uuid, ?array $players = null){
$pk = new PlayerListPacket();
$pk->type = PlayerListPacket::TYPE_REMOVE;
$pk->entries[] = PlayerListEntry::createRemovalEntry($uuid);

2
src/pocketmine/Thread.php
View File

@ -39,7 +39,7 @@ abstract class Thread extends \Thread{
return $this->classLoader;
}
public function setClassLoader(\ClassLoader $loader = null){
public function setClassLoader(?\ClassLoader $loader = null){
$this->composerAutoloaderPath = \pocketmine\COMPOSER_AUTOLOADER_PATH;
if($loader === null){

2
src/pocketmine/Worker.php
View File

@ -39,7 +39,7 @@ abstract class Worker extends \Worker{
return $this->classLoader;
}
public function setClassLoader(\ClassLoader $loader = null){
public function setClassLoader(?\ClassLoader $loader = null){
$this->composerAutoloaderPath = \pocketmine\COMPOSER_AUTOLOADER_PATH;
if($loader === null){

2
src/pocketmine/command/Command.php
View File

@ -79,7 +79,7 @@ abstract class Command{
* @param string $usageMessage
* @param string[] $aliases
*/
public function __construct(string $name, string $description = "", string $usageMessage = null, array $aliases = []){
public function __construct(string $name, string $description = "", ?string $usageMessage = null, array $aliases = []){
$this->name = $name;
$this->setLabel($name);
$this->setDescription($description);

2
src/pocketmine/command/CommandMap.php
View File

@ -39,7 +39,7 @@ interface CommandMap{
*
* @return bool
*/
public function register(string $fallbackPrefix, Command $command, string $label = null) : bool;
public function register(string $fallbackPrefix, Command $command, ?string $label = null) : bool;
/**
* @param CommandSender $sender

2
src/pocketmine/command/ConsoleCommandSender.php
View File

@ -71,7 +71,7 @@ class ConsoleCommandSender implements CommandSender{
*
* @return PermissionAttachment
*/
public function addAttachment(Plugin $plugin, string $name = null, bool $value = null) : PermissionAttachment{
public function addAttachment(Plugin $plugin, ?string $name = null, ?bool $value = null) : PermissionAttachment{
return $this->perm->addAttachment($plugin, $name, $value);
}

2
src/pocketmine/command/SimpleCommandMap.php
View File

@ -151,7 +151,7 @@ class SimpleCommandMap implements CommandMap{
*
* @return bool
*/
public function register(string $fallbackPrefix, Command $command, string $label = null) : bool{
public function register(string $fallbackPrefix, Command $command, ?string $label = null) : bool{
if($label === null){
$label = $command->getName();
}

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

@ -141,7 +141,7 @@ class ParticleCommand extends VanillaCommand{
*
* @return Particle|null
*/
private function getParticle(string $name, int $data = null){
private function getParticle(string $name, ?int $data = null){
switch($name){
case "explode":
return new ExplodeParticle();

2
src/pocketmine/event/entity/EntityEffectAddEvent.php
View File

@ -38,7 +38,7 @@ class EntityEffectAddEvent extends EntityEffectEvent{
* @param EffectInstance $effect
* @param EffectInstance $oldEffect
*/
public function __construct(Entity $entity, EffectInstance $effect, EffectInstance $oldEffect = null){
public function __construct(Entity $entity, EffectInstance $effect, ?EffectInstance $oldEffect = null){
parent::__construct($entity, $effect);
$this->oldEffect = $oldEffect;
}

2
src/pocketmine/event/player/PlayerChatEvent.php
View File

@ -52,7 +52,7 @@ class PlayerChatEvent extends PlayerEvent implements Cancellable{
* @param string $format
* @param Player[] $recipients
*/
public function __construct(Player $player, string $message, string $format = "chat.type.text", array $recipients = null){
public function __construct(Player $player, string $message, string $format = "chat.type.text", ?array $recipients = null){
$this->player = $player;
$this->message = $message;

2
src/pocketmine/inventory/BaseInventory.php
View File

@ -57,7 +57,7 @@ abstract class BaseInventory implements Inventory{
* @param int $size
* @param string $title
*/
public function __construct(array $items = [], int $size = null, string $title = null){
public function __construct(array $items = [], ?int $size = null, ?string $title = null){
$this->slots = new \SplFixedArray($size ?? $this->getDefaultSize());
$this->title = $title ?? $this->getName();

2
src/pocketmine/inventory/ContainerInventory.php
View File

@ -33,7 +33,7 @@ abstract class ContainerInventory extends BaseInventory{
/** @var Vector3 */
protected $holder;
public function __construct(Vector3 $holder, array $items = [], int $size = null, string $title = null){
public function __construct(Vector3 $holder, array $items = [], ?int $size = null, ?string $title = null){
$this->holder = $holder;
parent::__construct($items, $size, $title);
}

2
src/pocketmine/item/ItemBlock.php
View File

@ -38,7 +38,7 @@ class ItemBlock extends Item{
* @param int $meta usually 0-15 (placed blocks may only have meta values 0-15)
* @param int|null $itemId
*/
public function __construct(int $blockId, int $meta = 0, int $itemId = null){
public function __construct(int $blockId, int $meta = 0, ?int $itemId = null){
if($blockId < 0){ //extended blocks
if($itemId === null){
$itemId = $blockId;

6
src/pocketmine/lang/Language.php
View File

@ -94,7 +94,7 @@ class Language{
*
* @throws LanguageNotFoundException
*/
public function __construct(string $lang, string $path = null, string $fallback = self::FALLBACK_LANGUAGE){
public function __construct(string $lang, ?string $path = null, string $fallback = self::FALLBACK_LANGUAGE){
$this->langName = strtolower($lang);
if($path === null){
@ -129,7 +129,7 @@ class Language{
*
* @return string
*/
public function translateString(string $str, array $params = [], string $onlyPrefix = null) : string{
public function translateString(string $str, array $params = [], ?string $onlyPrefix = null) : string{
$baseText = $this->get($str);
$baseText = $this->parseTranslation(($baseText !== null and ($onlyPrefix === null or strpos($str, $onlyPrefix) === 0)) ? $baseText : $str, $onlyPrefix);
@ -179,7 +179,7 @@ class Language{
*
* @return string
*/
protected function parseTranslation(string $text, string $onlyPrefix = null) : string{
protected function parseTranslation(string $text, ?string $onlyPrefix = null) : string{
$newString = "";
$replaceString = null;

14
src/pocketmine/level/Level.php
View File

@ -478,7 +478,7 @@ class Level implements ChunkManager, Metadatable{
$this->closed = true;
}
public function addSound(Vector3 $pos, Sound $sound, array $players = null){
public function addSound(Vector3 $pos, Sound $sound, ?array $players = null){
$pk = $sound->encode($pos);
if(!is_array($pk)){
$pk = [$pk];
@ -494,7 +494,7 @@ class Level implements ChunkManager, Metadatable{
}
}
public function addParticle(Vector3 $pos, Particle $particle, array $players = null){
public function addParticle(Vector3 $pos, Particle $particle, ?array $players = null){
$pk = $particle->encode($pos);
if(!is_array($pk)){
$pk = [$pk];
@ -1626,7 +1626,7 @@ class Level implements ChunkManager, Metadatable{
*
* @return ItemEntity|null
*/
public function dropItem(Vector3 $source, Item $item, Vector3 $motion = null, int $delay = 10){
public function dropItem(Vector3 $source, Item $item, ?Vector3 $motion = null, int $delay = 10){
$motion = $motion ?? new Vector3(lcg_value() * 0.2 - 0.1, 0.2, lcg_value() * 0.2 - 0.1);
$itemTag = $item->nbtSerialize();
$itemTag->setName("Item");
@ -1686,7 +1686,7 @@ class Level implements ChunkManager, Metadatable{
*
* @return bool
*/
public function useBreakOn(Vector3 $vector, Item &$item = null, Player $player = null, bool $createParticles = false) : bool{
public function useBreakOn(Vector3 $vector, Item &$item = null, ?Player $player = null, bool $createParticles = false) : bool{
$target = $this->getBlock($vector);
$affectedBlocks = $target->getAffectedBlocks();
@ -1788,7 +1788,7 @@ class Level implements ChunkManager, Metadatable{
*
* @return bool
*/
public function useItemOn(Vector3 $vector, Item &$item, int $face, Vector3 $clickVector = null, Player $player = null, bool $playSound = false) : bool{
public function useItemOn(Vector3 $vector, Item &$item, int $face, ?Vector3 $clickVector = null, ?Player $player = null, bool $playSound = false) : bool{
$blockClicked = $this->getBlock($vector);
$blockReplace = $blockClicked->getSide($face);
@ -1928,7 +1928,7 @@ class Level implements ChunkManager, Metadatable{
*
* @return Entity[]
*/
public function getCollidingEntities(AxisAlignedBB $bb, Entity $entity = null) : array{
public function getCollidingEntities(AxisAlignedBB $bb, ?Entity $entity = null) : array{
$nearby = [];
if($entity === null or $entity->canCollide){
@ -1960,7 +1960,7 @@ class Level implements ChunkManager, Metadatable{
*
* @return Entity[]
*/
public function getNearbyEntities(AxisAlignedBB $bb, Entity $entity = null) : array{
public function getNearbyEntities(AxisAlignedBB $bb, ?Entity $entity = null) : array{
$nearby = [];
$minX = ((int) floor($bb->minX - 2)) >> 4;

2
src/pocketmine/level/LevelManager.php
View File

@ -259,7 +259,7 @@ class LevelManager{
* @return bool
* @throws \InvalidArgumentException
*/
public function generateLevel(string $name, int $seed = null, string $generator = Normal::class, array $options = [], bool $backgroundGeneration = true) : bool{
public function generateLevel(string $name, ?int $seed = null, string $generator = Normal::class, array $options = [], bool $backgroundGeneration = true) : bool{
if(trim($name) === "" or $this->isLevelGenerated($name)){
return false;
}

4
src/pocketmine/level/Location.php
View File

@ -40,7 +40,7 @@ class Location extends Position{
* @param float $pitch
* @param Level $level
*/
public function __construct($x = 0, $y = 0, $z = 0, $yaw = 0.0, $pitch = 0.0, Level $level = null){
public function __construct($x = 0, $y = 0, $z = 0, $yaw = 0.0, $pitch = 0.0, ?Level $level = null){
$this->yaw = $yaw;
$this->pitch = $pitch;
parent::__construct($x, $y, $z, $level);
@ -54,7 +54,7 @@ class Location extends Position{
*
* @return Location
*/
public static function fromObject(Vector3 $pos, Level $level = null, $yaw = 0.0, $pitch = 0.0) : Location{
public static function fromObject(Vector3 $pos, ?Level $level = null, $yaw = 0.0, $pitch = 0.0) : Location{
return new Location($pos->x, $pos->y, $pos->z, $yaw, $pitch, $level ?? (($pos instanceof Position) ? $pos->level : null));
}

4
src/pocketmine/level/Position.php
View File

@ -37,12 +37,12 @@ class Position extends Vector3{
* @param int $z
* @param Level $level
*/
public function __construct($x = 0, $y = 0, $z = 0, Level $level = null){
public function __construct($x = 0, $y = 0, $z = 0, ?Level $level = null){
parent::__construct($x, $y, $z);
$this->setLevel($level);
}
public static function fromObject(Vector3 $pos, Level $level = null){
public static function fromObject(Vector3 $pos, ?Level $level = null){
return new Position($pos->x, $pos->y, $pos->z, $level);
}

2
src/pocketmine/permission/BanList.php
View File

@ -118,7 +118,7 @@ class BanList{
*
* @return BanEntry
*/
public function addBan(string $target, string $reason = null, \DateTime $expires = null, string $source = null) : BanEntry{
public function addBan(string $target, ?string $reason = null, ?\DateTime $expires = null, ?string $source = null) : BanEntry{
$entry = new BanEntry($target);
$entry->setSource($source ?? $entry->getSource());
$entry->setExpires($expires);

2
src/pocketmine/permission/DefaultPermissions.php
View File

@ -35,7 +35,7 @@ abstract class DefaultPermissions{
*
* @return Permission
*/
public static function registerPermission(Permission $perm, Permission $parent = null) : Permission{
public static function registerPermission(Permission $perm, ?Permission $parent = null) : Permission{
if($parent instanceof Permission){
$parent->getChildren()[$perm->getName()] = true;

2
src/pocketmine/permission/Permissible.php
View File

@ -52,7 +52,7 @@ interface Permissible extends ServerOperator{
*
* @return PermissionAttachment
*/
public function addAttachment(Plugin $plugin, string $name = null, bool $value = null) : PermissionAttachment;
public function addAttachment(Plugin $plugin, ?string $name = null, ?bool $value = null) : PermissionAttachment;
/**
* @param PermissionAttachment $attachment

2
src/pocketmine/permission/PermissibleBase.php
View File

@ -111,7 +111,7 @@ class PermissibleBase implements Permissible{
*
* @return PermissionAttachment
*/
public function addAttachment(Plugin $plugin, string $name = null, bool $value = null) : PermissionAttachment{
public function addAttachment(Plugin $plugin, ?string $name = null, ?bool $value = null) : PermissionAttachment{
if(!$plugin->isEnabled()){
throw new PluginException("Plugin " . $plugin->getDescription()->getName() . " is disabled");
}

2
src/pocketmine/permission/Permission.php
View File

@ -60,7 +60,7 @@ class Permission{
* @param string $defaultValue
* @param bool[] $children
*/
public function __construct(string $name, string $description = null, string $defaultValue = null, array $children = []){
public function __construct(string $name, ?string $description = null, ?string $defaultValue = null, array $children = []){
$this->name = $name;
$this->description = $description ?? "";
$this->defaultValue = $defaultValue ?? self::$DEFAULT_PERMISSION;

4
src/pocketmine/plugin/PluginManager.php
View File

@ -137,7 +137,7 @@ class PluginManager{
*
* @return Plugin|null
*/
public function loadPlugin(string $path, array $loaders = null) : ?Plugin{
public function loadPlugin(string $path, ?array $loaders = null) : ?Plugin{
foreach($loaders ?? $this->fileAssociations as $loader){
if($loader->canLoadPlugin($path)){
$description = $loader->getPluginDescription($path);
@ -193,7 +193,7 @@ class PluginManager{
*
* @return Plugin[]
*/
public function loadPlugins(string $directory, array $newLoaders = null){
public function loadPlugins(string $directory, ?array $newLoaders = null){
if(!is_dir($directory)){
return [];
}

2
src/pocketmine/timings/TimingsHandler.php
View File

@ -150,7 +150,7 @@ class TimingsHandler{
* @param string $name
* @param TimingsHandler $parent
*/
public function __construct(string $name, TimingsHandler $parent = null){
public function __construct(string $name, ?TimingsHandler $parent = null){
$this->name = $name;
$this->parent = $parent;

2
src/pocketmine/utils/Internet.php
View File

@ -193,7 +193,7 @@ class Internet{
*
* @throws InternetException if a cURL error occurs
*/
public static function simpleCurl(string $page, $timeout = 10, array $extraHeaders = [], array $extraOpts = [], callable $onSuccess = null){
public static function simpleCurl(string $page, $timeout = 10, array $extraHeaders = [], array $extraOpts = [], ?callable $onSuccess = null){
if(!self::$online){
throw new InternetException("Cannot execute web request while offline");
}

6
src/pocketmine/utils/UUID.php
View File

@ -41,7 +41,7 @@ class UUID{
private $parts = [0, 0, 0, 0];
private $version = null;
public function __construct(int $part1 = 0, int $part2 = 0, int $part3 = 0, int $part4 = 0, int $version = null){
public function __construct(int $part1 = 0, int $part2 = 0, int $part3 = 0, int $part4 = 0, ?int $version = null){
$this->parts = [$part1, $part2, $part3, $part4];
$this->version = $version ?? ($this->parts[1] & 0xf000) >> 12;
@ -63,7 +63,7 @@ class UUID{
*
* @return UUID
*/
public static function fromString(string $uuid, int $version = null) : UUID{
public static function fromString(string $uuid, ?int $version = null) : UUID{
return self::fromBinary(hex2bin(str_replace("-", "", trim($uuid))), $version);
}
@ -77,7 +77,7 @@ class UUID{
*
* @throws \InvalidArgumentException
*/
public static function fromBinary(string $uuid, int $version = null) : UUID{
public static function fromBinary(string $uuid, ?int $version = null) : UUID{
if(strlen($uuid) !== 16){
throw new \InvalidArgumentException("Must have exactly 16 bytes");
}