diff --git a/src/MemoryManager.php b/src/MemoryManager.php index adce63085..fcda3bc5a 100644 --- a/src/MemoryManager.php +++ b/src/MemoryManager.php @@ -435,7 +435,6 @@ class MemoryManager{ fwrite($obData, "$hash@$className: " . json_encode($info, JSON_UNESCAPED_SLASHES) . "\n"); } - }while($continue); $logger->info("Wrote " . count($objects) . " objects"); diff --git a/src/Server.php b/src/Server.php index 72d458643..4cc793eac 100644 --- a/src/Server.php +++ b/src/Server.php @@ -1328,7 +1328,6 @@ class Server{ return true; } - $sender->sendMessage($this->getLanguage()->translateString(TextFormat::RED . "%commands.generic.notFound")); return false; @@ -1580,7 +1579,6 @@ class Server{ $this->uniquePlayers = []; } - /** * @return Language */ diff --git a/src/VersionInfo.php b/src/VersionInfo.php index 4e5ede6a4..20e7272b8 100644 --- a/src/VersionInfo.php +++ b/src/VersionInfo.php @@ -30,7 +30,6 @@ if(defined('pocketmine\_VERSION_INFO_INCLUDED')){ } const _VERSION_INFO_INCLUDED = true; - const NAME = "PocketMine-MP"; const BASE_VERSION = "4.0.0"; const IS_DEVELOPMENT_BUILD = true; diff --git a/src/block/Block.php b/src/block/Block.php index e006a4217..0674f6c5e 100644 --- a/src/block/Block.php +++ b/src/block/Block.php @@ -333,7 +333,6 @@ class Block{ return false; } - public function addVelocityToEntity(Entity $entity, Vector3 $vector) : void{ } diff --git a/src/block/BlockFactory.php b/src/block/BlockFactory.php index 5c34585e3..dd12f922c 100644 --- a/src/block/BlockFactory.php +++ b/src/block/BlockFactory.php @@ -307,8 +307,6 @@ class BlockFactory{ self::register(new SeaPickle(new BID(Ids::SEA_PICKLE), "Sea Pickle")); self::register(new Skull(new BID(Ids::MOB_HEAD_BLOCK, 0, null, TileSkull::class), "Mob Head")); - - self::register(new Snow(new BID(Ids::SNOW), "Snow Block")); self::register(new SnowLayer(new BID(Ids::SNOW_LAYER), "Snow Layer")); self::register(new SoulSand(new BID(Ids::SOUL_SAND), "Soul Sand")); @@ -399,7 +397,6 @@ class BlockFactory{ self::register(new WeightedPressurePlateLight(new BID(Ids::LIGHT_WEIGHTED_PRESSURE_PLATE), "Weighted Pressure Plate Light")); self::register(new Wheat(new BID(Ids::WHEAT_BLOCK), "Wheat Block")); - //region ugly treetype -> blockID mapping tables $woodenStairIds = [ TreeType::OAK()->id() => Ids::OAK_STAIRS, diff --git a/src/block/Crops.php b/src/block/Crops.php index 0d1b461e2..b9c8877f9 100644 --- a/src/block/Crops.php +++ b/src/block/Crops.php @@ -61,7 +61,6 @@ abstract class Crops extends Flowable{ return false; } - public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null) : bool{ if($this->age < 7 and $item instanceof Fertilizer){ $block = clone $this; diff --git a/src/block/Door.php b/src/block/Door.php index 84f2cb131..ab4ad13e8 100644 --- a/src/block/Door.php +++ b/src/block/Door.php @@ -32,7 +32,6 @@ use pocketmine\player\Player; use pocketmine\world\BlockTransaction; use pocketmine\world\sound\DoorSound; - class Door extends Transparent{ /** @var int */ protected $facing = Facing::NORTH; @@ -46,7 +45,6 @@ class Door extends Transparent{ /** @var bool */ protected $powered = false; - protected function writeStateToMeta() : int{ if($this->top){ return BlockLegacyMetadata::DOOR_FLAG_TOP | diff --git a/src/block/GlazedTerracotta.php b/src/block/GlazedTerracotta.php index b4d6baebb..a9335ad6b 100644 --- a/src/block/GlazedTerracotta.php +++ b/src/block/GlazedTerracotta.php @@ -1,6 +1,5 @@ x, $pos->y, $pos->z); if(isset($visited[$index])){ diff --git a/src/block/NetherWartPlant.php b/src/block/NetherWartPlant.php index 0b72bb0a0..7ca38d72f 100644 --- a/src/block/NetherWartPlant.php +++ b/src/block/NetherWartPlant.php @@ -23,7 +23,6 @@ declare(strict_types=1); namespace pocketmine\block; - use pocketmine\block\utils\BlockDataSerializer; use pocketmine\event\block\BlockGrowEvent; use pocketmine\item\Item; diff --git a/src/block/Sponge.php b/src/block/Sponge.php index f95a7128c..486fbff28 100644 --- a/src/block/Sponge.php +++ b/src/block/Sponge.php @@ -23,7 +23,6 @@ declare(strict_types=1); namespace pocketmine\block; - class Sponge extends Opaque{ /** @var bool */ diff --git a/src/block/Transparent.php b/src/block/Transparent.php index 3d501dd76..46fe7217a 100644 --- a/src/block/Transparent.php +++ b/src/block/Transparent.php @@ -23,7 +23,6 @@ declare(strict_types=1); namespace pocketmine\block; - class Transparent extends Block{ public function isTransparent() : bool{ diff --git a/src/block/tile/BrewingStand.php b/src/block/tile/BrewingStand.php index 535a4180e..62814e528 100644 --- a/src/block/tile/BrewingStand.php +++ b/src/block/tile/BrewingStand.php @@ -51,7 +51,6 @@ class BrewingStand extends Spawnable implements Container, Nameable{ /** @var int */ private $remainingFuelTime = 0; - public function __construct(World $world, Vector3 $pos){ parent::__construct($world, $pos); $this->inventory = new BrewingStandInventory($this->pos); diff --git a/src/command/CommandExecutor.php b/src/command/CommandExecutor.php index 1efcd5f52..fb989590d 100644 --- a/src/command/CommandExecutor.php +++ b/src/command/CommandExecutor.php @@ -23,7 +23,6 @@ declare(strict_types=1); namespace pocketmine\command; - interface CommandExecutor{ /** diff --git a/src/command/CommandMap.php b/src/command/CommandMap.php index fa1b63cbd..3be7850e6 100644 --- a/src/command/CommandMap.php +++ b/src/command/CommandMap.php @@ -23,7 +23,6 @@ declare(strict_types=1); namespace pocketmine\command; - interface CommandMap{ /** @@ -39,5 +38,4 @@ interface CommandMap{ public function getCommand(string $name) : ?Command; - } diff --git a/src/command/SimpleCommandMap.php b/src/command/SimpleCommandMap.php index d36e0ddb2..ac312143b 100644 --- a/src/command/SimpleCommandMap.php +++ b/src/command/SimpleCommandMap.php @@ -133,7 +133,6 @@ class SimpleCommandMap implements CommandMap{ ]); } - public function registerAll(string $fallbackPrefix, array $commands) : void{ foreach($commands as $command){ $this->register($fallbackPrefix, $command); @@ -288,7 +287,6 @@ class SimpleCommandMap implements CommandMap{ $commandName = ""; $command = $this->matchCommand($commandName, $args); - if($command === null){ $bad[] = $commandString; }elseif($commandName === $alias){ diff --git a/src/command/defaults/EffectCommand.php b/src/command/defaults/EffectCommand.php index b7ec3760b..fa0d74aa7 100644 --- a/src/command/defaults/EffectCommand.php +++ b/src/command/defaults/EffectCommand.php @@ -119,7 +119,6 @@ class EffectCommand extends VanillaCommand{ self::broadcastCommandMessage($sender, new TranslationContainer("%commands.effect.success", [$effect->getName(), $instance->getAmplifier(), $player->getDisplayName(), $instance->getDuration() / 20])); } - return true; } } diff --git a/src/command/defaults/EnchantCommand.php b/src/command/defaults/EnchantCommand.php index 2f770699b..bd8b71bd6 100644 --- a/src/command/defaults/EnchantCommand.php +++ b/src/command/defaults/EnchantCommand.php @@ -88,7 +88,6 @@ class EnchantCommand extends VanillaCommand{ $item->addEnchantment(new EnchantmentInstance($enchantment, $level)); $player->getInventory()->setItemInHand($item); - self::broadcastCommandMessage($sender, new TranslationContainer("%commands.enchant.success", [$player->getName()])); return true; } diff --git a/src/command/defaults/KickCommand.php b/src/command/defaults/KickCommand.php index 126215e41..879a18160 100644 --- a/src/command/defaults/KickCommand.php +++ b/src/command/defaults/KickCommand.php @@ -68,7 +68,6 @@ class KickCommand extends VanillaCommand{ $sender->sendMessage(new TranslationContainer(TextFormat::RED . "%commands.generic.player.notFound")); } - return true; } } diff --git a/src/command/defaults/ParticleCommand.php b/src/command/defaults/ParticleCommand.php index 18342534c..d503ee510 100644 --- a/src/command/defaults/ParticleCommand.php +++ b/src/command/defaults/ParticleCommand.php @@ -121,7 +121,6 @@ class ParticleCommand extends VanillaCommand{ return true; } - $sender->sendMessage(new TranslationContainer("commands.particle.success", [$name, $count])); $random = new Random((int) (microtime(true) * 1000) + mt_rand()); diff --git a/src/command/defaults/TimeCommand.php b/src/command/defaults/TimeCommand.php index 91cc1cbc7..147c3e4cf 100644 --- a/src/command/defaults/TimeCommand.php +++ b/src/command/defaults/TimeCommand.php @@ -85,7 +85,6 @@ class TimeCommand extends VanillaCommand{ return true; } - if(count($args) < 2){ throw new InvalidCommandSyntaxException(); } diff --git a/src/command/defaults/TransferServerCommand.php b/src/command/defaults/TransferServerCommand.php index 9f102cb47..295ce3f45 100644 --- a/src/command/defaults/TransferServerCommand.php +++ b/src/command/defaults/TransferServerCommand.php @@ -21,10 +21,8 @@ declare(strict_types=1); - namespace pocketmine\command\defaults; - use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; use pocketmine\player\Player; diff --git a/src/entity/Ageable.php b/src/entity/Ageable.php index cc835dbbf..bc74036d8 100644 --- a/src/entity/Ageable.php +++ b/src/entity/Ageable.php @@ -23,7 +23,6 @@ declare(strict_types=1); namespace pocketmine\entity; - interface Ageable{ public function isBaby() : bool; } diff --git a/src/entity/Animal.php b/src/entity/Animal.php index b3116653f..60dbf9c46 100644 --- a/src/entity/Animal.php +++ b/src/entity/Animal.php @@ -23,7 +23,6 @@ declare(strict_types=1); namespace pocketmine\entity; - use pocketmine\network\mcpe\protocol\types\entity\EntityMetadataFlags; abstract class Animal extends Living implements Ageable{ diff --git a/src/entity/Entity.php b/src/entity/Entity.php index 332c7322c..9d7c2d6d5 100644 --- a/src/entity/Entity.php +++ b/src/entity/Entity.php @@ -988,7 +988,6 @@ abstract class Entity{ return true; } - $this->timings->startTiming(); if($this->hasMovementUpdate()){ @@ -1017,7 +1016,6 @@ abstract class Entity{ $hasUpdate = $this->entityBaseTick($tickDiff); Timings::$timerEntityBaseTick->stopTiming(); - $this->timings->stopTiming(); //if($this->isStatic()) @@ -1188,7 +1186,6 @@ abstract class Entity{ $moveBB->offset(0, 0, $dz); - if($this->stepHeight > 0 and $fallingFlag and ($movX != $dx or $movZ != $dz)){ $cx = $dx; $cy = $dy; diff --git a/src/entity/EntityFactory.php b/src/entity/EntityFactory.php index 51ba2176a..2c0510a6b 100644 --- a/src/entity/EntityFactory.php +++ b/src/entity/EntityFactory.php @@ -231,7 +231,6 @@ final class EntityFactory{ throw new \InvalidArgumentException("Entity $class is not registered"); } - /** * Helper function which creates minimal NBT needed to spawn an entity. */ diff --git a/src/entity/ExperienceManager.php b/src/entity/ExperienceManager.php index 49aea2c27..cafbf4214 100644 --- a/src/entity/ExperienceManager.php +++ b/src/entity/ExperienceManager.php @@ -227,7 +227,6 @@ class ExperienceManager{ $this->totalXp = $amount; } - /** * Returns whether the human can pickup XP orbs (checks cooldown time) */ diff --git a/src/entity/Explosive.php b/src/entity/Explosive.php index 347c68a49..94922cb19 100644 --- a/src/entity/Explosive.php +++ b/src/entity/Explosive.php @@ -23,7 +23,6 @@ declare(strict_types=1); namespace pocketmine\entity; - interface Explosive{ public function explode() : void; diff --git a/src/entity/Living.php b/src/entity/Living.php index 0f741ff0f..9dc43442b 100644 --- a/src/entity/Living.php +++ b/src/entity/Living.php @@ -203,7 +203,6 @@ abstract class Living extends Entity{ return $nbt; } - public function hasLineOfSight(Entity $entity) : bool{ //TODO: head height return true; diff --git a/src/entity/Squid.php b/src/entity/Squid.php index 4b98c2401..a5ec3a407 100644 --- a/src/entity/Squid.php +++ b/src/entity/Squid.php @@ -79,7 +79,6 @@ class Squid extends WaterAnimal{ return new Vector3(mt_rand(-1000, 1000) / 1000, mt_rand(-500, 500) / 1000, mt_rand(-1000, 1000) / 1000); } - protected function entityBaseTick(int $tickDiff = 1) : bool{ if($this->closed){ return false; diff --git a/src/entity/effect/VanillaEffects.php b/src/entity/effect/VanillaEffects.php index a20b4ebb6..c714c1842 100644 --- a/src/entity/effect/VanillaEffects.php +++ b/src/entity/effect/VanillaEffects.php @@ -23,7 +23,6 @@ declare(strict_types=1); namespace pocketmine\entity\effect; - use pocketmine\utils\Color; use pocketmine\utils\RegistryTrait; use function assert; diff --git a/src/entity/object/ItemEntity.php b/src/entity/object/ItemEntity.php index 092bfe85c..32b2ba805 100644 --- a/src/entity/object/ItemEntity.php +++ b/src/entity/object/ItemEntity.php @@ -80,7 +80,6 @@ class ItemEntity extends Entity{ $this->owner = $nbt->getString("Owner", $this->owner); $this->thrower = $nbt->getString("Thrower", $this->thrower); - $itemTag = $nbt->getCompoundTag("Item"); if($itemTag === null){ throw new \UnexpectedValueException("Invalid " . get_class($this) . " entity: expected \"Item\" NBT tag not found"); @@ -91,7 +90,6 @@ class ItemEntity extends Entity{ throw new \UnexpectedValueException("Item for " . get_class($this) . " is invalid"); } - (new ItemSpawnEvent($this))->call(); } diff --git a/src/entity/object/PaintingMotive.php b/src/entity/object/PaintingMotive.php index 1ae1deb17..a21bba2fc 100644 --- a/src/entity/object/PaintingMotive.php +++ b/src/entity/object/PaintingMotive.php @@ -86,7 +86,6 @@ class PaintingMotive{ /** @var int */ protected $height; - public function __construct(int $width, int $height, string $name){ $this->name = $name; $this->width = $width; diff --git a/src/entity/object/PrimedTNT.php b/src/entity/object/PrimedTNT.php index 084c7f489..505b22f55 100644 --- a/src/entity/object/PrimedTNT.php +++ b/src/entity/object/PrimedTNT.php @@ -51,7 +51,6 @@ class PrimedTNT extends Entity implements Explosive{ public $canCollide = false; - public function attack(EntityDamageEvent $source) : void{ if($source->getCause() === EntityDamageEvent::CAUSE_VOID){ parent::attack($source); @@ -66,7 +65,6 @@ class PrimedTNT extends Entity implements Explosive{ $this->getWorld()->addSound($this->location, new IgniteSound()); } - public function canCollideWith(Entity $entity) : bool{ return false; } diff --git a/src/entity/projectile/Projectile.php b/src/entity/projectile/Projectile.php index db2b5bcce..82a1aa992 100644 --- a/src/entity/projectile/Projectile.php +++ b/src/entity/projectile/Projectile.php @@ -261,7 +261,6 @@ abstract class Projectile extends Entity{ $this->checkChunks(); $this->checkBlockCollision(); - Timings::$entityMoveTimer->stopTiming(); } diff --git a/src/entity/projectile/ProjectileSource.php b/src/entity/projectile/ProjectileSource.php index 0bab7da5f..e74cafad9 100644 --- a/src/entity/projectile/ProjectileSource.php +++ b/src/entity/projectile/ProjectileSource.php @@ -23,7 +23,6 @@ declare(strict_types=1); namespace pocketmine\entity\projectile; - interface ProjectileSource{ } diff --git a/src/event/Cancellable.php b/src/event/Cancellable.php index 1e439ad31..023549023 100644 --- a/src/event/Cancellable.php +++ b/src/event/Cancellable.php @@ -23,7 +23,6 @@ declare(strict_types=1); namespace pocketmine\event; - /** * Events that can be cancelled must use the interface Cancellable */ diff --git a/src/event/block/BlockBreakEvent.php b/src/event/block/BlockBreakEvent.php index 68f3fae18..ca28352c3 100644 --- a/src/event/block/BlockBreakEvent.php +++ b/src/event/block/BlockBreakEvent.php @@ -87,7 +87,6 @@ class BlockBreakEvent extends BlockEvent implements Cancellable{ $this->instaBreak = $instaBreak; } - /** * @return Item[] */ diff --git a/src/event/plugin/PluginDisableEvent.php b/src/event/plugin/PluginDisableEvent.php index e551f7f3a..6f847b7a4 100644 --- a/src/event/plugin/PluginDisableEvent.php +++ b/src/event/plugin/PluginDisableEvent.php @@ -21,7 +21,6 @@ declare(strict_types=1); - namespace pocketmine\event\plugin; class PluginDisableEvent extends PluginEvent{ diff --git a/src/event/plugin/PluginEnableEvent.php b/src/event/plugin/PluginEnableEvent.php index f00dd249e..7496be1f3 100644 --- a/src/event/plugin/PluginEnableEvent.php +++ b/src/event/plugin/PluginEnableEvent.php @@ -21,7 +21,6 @@ declare(strict_types=1); - namespace pocketmine\event\plugin; class PluginEnableEvent extends PluginEvent{ diff --git a/src/event/server/LowMemoryEvent.php b/src/event/server/LowMemoryEvent.php index ecdfb2f46..46f0c8022 100644 --- a/src/event/server/LowMemoryEvent.php +++ b/src/event/server/LowMemoryEvent.php @@ -25,7 +25,6 @@ namespace pocketmine\event\server; use pocketmine\utils\Process; - /** * Called when the server is in a low-memory state as defined by the properties * Plugins should free caches or other non-essential data. diff --git a/src/event/world/ChunkEvent.php b/src/event/world/ChunkEvent.php index 02db808e2..2c5cb5e51 100644 --- a/src/event/world/ChunkEvent.php +++ b/src/event/world/ChunkEvent.php @@ -21,7 +21,6 @@ declare(strict_types=1); - namespace pocketmine\event\world; use pocketmine\world\format\Chunk; diff --git a/src/event/world/ChunkLoadEvent.php b/src/event/world/ChunkLoadEvent.php index 3e6dad408..a03c4ad15 100644 --- a/src/event/world/ChunkLoadEvent.php +++ b/src/event/world/ChunkLoadEvent.php @@ -21,7 +21,6 @@ declare(strict_types=1); - namespace pocketmine\event\world; use pocketmine\world\format\Chunk; diff --git a/src/item/Apple.php b/src/item/Apple.php index 82dfcf789..5f2a711c0 100644 --- a/src/item/Apple.php +++ b/src/item/Apple.php @@ -23,7 +23,6 @@ declare(strict_types=1); namespace pocketmine\item; - class Apple extends Food{ public function getFoodRestore() : int{ diff --git a/src/item/Armor.php b/src/item/Armor.php index 3b64f6b08..a9b469965 100644 --- a/src/item/Armor.php +++ b/src/item/Armor.php @@ -21,7 +21,6 @@ declare(strict_types=1); - namespace pocketmine\item; use pocketmine\block\Block; diff --git a/src/item/Banner.php b/src/item/Banner.php index db566f7de..fa91c2c66 100644 --- a/src/item/Banner.php +++ b/src/item/Banner.php @@ -115,7 +115,6 @@ class Banner extends Item{ ); } - $tag->setTag(self::TAG_PATTERNS, $patterns); }else{ $tag->removeTag(self::TAG_PATTERNS); diff --git a/src/item/BeetrootSoup.php b/src/item/BeetrootSoup.php index 8f8e5bed1..267131739 100644 --- a/src/item/BeetrootSoup.php +++ b/src/item/BeetrootSoup.php @@ -23,7 +23,6 @@ declare(strict_types=1); namespace pocketmine\item; - class BeetrootSoup extends Food{ public function getMaxStackSize() : int{ diff --git a/src/item/Bowl.php b/src/item/Bowl.php index 47b93a2a8..66ef530b0 100644 --- a/src/item/Bowl.php +++ b/src/item/Bowl.php @@ -23,7 +23,6 @@ declare(strict_types=1); namespace pocketmine\item; - class Bowl extends Item{ //TODO: check fuel diff --git a/src/item/Coal.php b/src/item/Coal.php index ebdb65ee3..55aa44440 100644 --- a/src/item/Coal.php +++ b/src/item/Coal.php @@ -23,7 +23,6 @@ declare(strict_types=1); namespace pocketmine\item; - class Coal extends Item{ public function getFuelTime() : int{ diff --git a/src/item/ItemEnchantmentHandlingTrait.php b/src/item/ItemEnchantmentHandlingTrait.php index 23ca86b03..3760e16c6 100644 --- a/src/item/ItemEnchantmentHandlingTrait.php +++ b/src/item/ItemEnchantmentHandlingTrait.php @@ -23,7 +23,6 @@ declare(strict_types=1); namespace pocketmine\item; - use pocketmine\item\enchantment\Enchantment; use pocketmine\item\enchantment\EnchantmentInstance; diff --git a/src/item/Stick.php b/src/item/Stick.php index d7b749e05..59c5ed91b 100644 --- a/src/item/Stick.php +++ b/src/item/Stick.php @@ -23,7 +23,6 @@ declare(strict_types=1); namespace pocketmine\item; - class Stick extends Item{ public function getFuelTime() : int{ diff --git a/src/item/ToolTier.php b/src/item/ToolTier.php index f15ba7c3a..1f2190bb8 100644 --- a/src/item/ToolTier.php +++ b/src/item/ToolTier.php @@ -23,7 +23,6 @@ declare(strict_types=1); namespace pocketmine\item; - use pocketmine\utils\EnumTrait; /** diff --git a/src/item/enchantment/EnchantmentEntry.php b/src/item/enchantment/EnchantmentEntry.php index 287305aec..6463d6cd5 100644 --- a/src/item/enchantment/EnchantmentEntry.php +++ b/src/item/enchantment/EnchantmentEntry.php @@ -23,7 +23,6 @@ declare(strict_types=1); namespace pocketmine\item\enchantment; - class EnchantmentEntry{ /** @var Enchantment[] */ diff --git a/src/item/enchantment/EnchantmentList.php b/src/item/enchantment/EnchantmentList.php index 90914e090..617ca13af 100644 --- a/src/item/enchantment/EnchantmentList.php +++ b/src/item/enchantment/EnchantmentList.php @@ -23,7 +23,6 @@ declare(strict_types=1); namespace pocketmine\item\enchantment; - class EnchantmentList{ /** @var \SplFixedArray|EnchantmentEntry[] */ diff --git a/src/network/mcpe/handler/LoginPacketHandler.php b/src/network/mcpe/handler/LoginPacketHandler.php index f0d6876fc..a0bb6f3b0 100644 --- a/src/network/mcpe/handler/LoginPacketHandler.php +++ b/src/network/mcpe/handler/LoginPacketHandler.php @@ -50,7 +50,6 @@ class LoginPacketHandler extends PacketHandler{ /** @var NetworkSession */ private $session; - public function __construct(Server $server, NetworkSession $session){ $this->session = $session; $this->server = $server; diff --git a/src/network/mcpe/handler/ResourcePacksPacketHandler.php b/src/network/mcpe/handler/ResourcePacksPacketHandler.php index ea97d9f47..1f79bf988 100644 --- a/src/network/mcpe/handler/ResourcePacksPacketHandler.php +++ b/src/network/mcpe/handler/ResourcePacksPacketHandler.php @@ -57,7 +57,6 @@ class ResourcePacksPacketHandler extends PacketHandler{ /** @var bool[][] uuid => [chunk index => hasSent] */ private $downloadedChunks = []; - public function __construct(NetworkSession $session, ResourcePackManager $resourcePackManager){ $this->session = $session; $this->resourcePackManager = $resourcePackManager; diff --git a/src/network/mcpe/protocol/ActorFallPacket.php b/src/network/mcpe/protocol/ActorFallPacket.php index ab2d59fcb..420940f23 100644 --- a/src/network/mcpe/protocol/ActorFallPacket.php +++ b/src/network/mcpe/protocol/ActorFallPacket.php @@ -25,7 +25,6 @@ namespace pocketmine\network\mcpe\protocol; #include - use pocketmine\network\mcpe\handler\PacketHandler; class ActorFallPacket extends DataPacket implements ServerboundPacket{ diff --git a/src/network/mcpe/protocol/AdventureSettingsPacket.php b/src/network/mcpe/protocol/AdventureSettingsPacket.php index a1f76b552..71164de3d 100644 --- a/src/network/mcpe/protocol/AdventureSettingsPacket.php +++ b/src/network/mcpe/protocol/AdventureSettingsPacket.php @@ -25,7 +25,6 @@ namespace pocketmine\network\mcpe\protocol; #include - use pocketmine\network\mcpe\handler\PacketHandler; use pocketmine\network\mcpe\protocol\types\PlayerPermissions; diff --git a/src/network/mcpe/protocol/AnimatePacket.php b/src/network/mcpe/protocol/AnimatePacket.php index 5fb3cb8a7..abb02d70e 100644 --- a/src/network/mcpe/protocol/AnimatePacket.php +++ b/src/network/mcpe/protocol/AnimatePacket.php @@ -25,7 +25,6 @@ namespace pocketmine\network\mcpe\protocol; #include - use pocketmine\network\mcpe\handler\PacketHandler; class AnimatePacket extends DataPacket implements ClientboundPacket, ServerboundPacket{ diff --git a/src/network/mcpe/protocol/AvailableCommandsPacket.php b/src/network/mcpe/protocol/AvailableCommandsPacket.php index e7b8847d8..67fcf2a1f 100644 --- a/src/network/mcpe/protocol/AvailableCommandsPacket.php +++ b/src/network/mcpe/protocol/AvailableCommandsPacket.php @@ -39,7 +39,6 @@ use function dechex; class AvailableCommandsPacket extends DataPacket implements ClientboundPacket{ public const NETWORK_ID = ProtocolInfo::AVAILABLE_COMMANDS_PACKET; - /** * This flag is set on all types EXCEPT the POSTFIX type. Not completely sure what this is for, but it is required * for the argtype to work correctly. VALID seems as good a name as any. diff --git a/src/network/mcpe/protocol/BlockActorDataPacket.php b/src/network/mcpe/protocol/BlockActorDataPacket.php index 6e4b428e5..476a33f91 100644 --- a/src/network/mcpe/protocol/BlockActorDataPacket.php +++ b/src/network/mcpe/protocol/BlockActorDataPacket.php @@ -25,7 +25,6 @@ namespace pocketmine\network\mcpe\protocol; #include - use pocketmine\network\mcpe\handler\PacketHandler; class BlockActorDataPacket extends DataPacket implements ClientboundPacket, ServerboundPacket{ diff --git a/src/network/mcpe/protocol/BlockEventPacket.php b/src/network/mcpe/protocol/BlockEventPacket.php index 9badd3036..855995ac8 100644 --- a/src/network/mcpe/protocol/BlockEventPacket.php +++ b/src/network/mcpe/protocol/BlockEventPacket.php @@ -25,7 +25,6 @@ namespace pocketmine\network\mcpe\protocol; #include - use pocketmine\math\Vector3; use pocketmine\network\mcpe\handler\PacketHandler; diff --git a/src/network/mcpe/protocol/BlockPickRequestPacket.php b/src/network/mcpe/protocol/BlockPickRequestPacket.php index cc6ea483e..8e2760b7e 100644 --- a/src/network/mcpe/protocol/BlockPickRequestPacket.php +++ b/src/network/mcpe/protocol/BlockPickRequestPacket.php @@ -21,12 +21,10 @@ declare(strict_types=1); - namespace pocketmine\network\mcpe\protocol; #include - use pocketmine\network\mcpe\handler\PacketHandler; class BlockPickRequestPacket extends DataPacket implements ServerboundPacket{ diff --git a/src/network/mcpe/protocol/BossEventPacket.php b/src/network/mcpe/protocol/BossEventPacket.php index 3a504c695..bc215e154 100644 --- a/src/network/mcpe/protocol/BossEventPacket.php +++ b/src/network/mcpe/protocol/BossEventPacket.php @@ -25,7 +25,6 @@ namespace pocketmine\network\mcpe\protocol; #include - use pocketmine\network\mcpe\handler\PacketHandler; class BossEventPacket extends DataPacket implements ClientboundPacket, ServerboundPacket{ diff --git a/src/network/mcpe/protocol/ChangeDimensionPacket.php b/src/network/mcpe/protocol/ChangeDimensionPacket.php index 95b66d4d4..0cf5dfae5 100644 --- a/src/network/mcpe/protocol/ChangeDimensionPacket.php +++ b/src/network/mcpe/protocol/ChangeDimensionPacket.php @@ -25,7 +25,6 @@ namespace pocketmine\network\mcpe\protocol; #include - use pocketmine\math\Vector3; use pocketmine\network\mcpe\handler\PacketHandler; diff --git a/src/network/mcpe/protocol/ChunkRadiusUpdatedPacket.php b/src/network/mcpe/protocol/ChunkRadiusUpdatedPacket.php index 3ff77d51a..567c291e4 100644 --- a/src/network/mcpe/protocol/ChunkRadiusUpdatedPacket.php +++ b/src/network/mcpe/protocol/ChunkRadiusUpdatedPacket.php @@ -25,7 +25,6 @@ namespace pocketmine\network\mcpe\protocol; #include - use pocketmine\network\mcpe\handler\PacketHandler; class ChunkRadiusUpdatedPacket extends DataPacket implements ClientboundPacket{ diff --git a/src/network/mcpe/protocol/ClientToServerHandshakePacket.php b/src/network/mcpe/protocol/ClientToServerHandshakePacket.php index 99e2d0545..697d46246 100644 --- a/src/network/mcpe/protocol/ClientToServerHandshakePacket.php +++ b/src/network/mcpe/protocol/ClientToServerHandshakePacket.php @@ -25,7 +25,6 @@ namespace pocketmine\network\mcpe\protocol; #include - use pocketmine\network\mcpe\handler\PacketHandler; class ClientToServerHandshakePacket extends DataPacket implements ServerboundPacket{ diff --git a/src/network/mcpe/protocol/ClientboundMapItemDataPacket.php b/src/network/mcpe/protocol/ClientboundMapItemDataPacket.php index 503fec530..e702121b4 100644 --- a/src/network/mcpe/protocol/ClientboundMapItemDataPacket.php +++ b/src/network/mcpe/protocol/ClientboundMapItemDataPacket.php @@ -21,12 +21,10 @@ declare(strict_types=1); - namespace pocketmine\network\mcpe\protocol; #include - use pocketmine\network\BadPacketException; use pocketmine\network\mcpe\handler\PacketHandler; use pocketmine\network\mcpe\protocol\types\DimensionIds; diff --git a/src/network/mcpe/protocol/CommandBlockUpdatePacket.php b/src/network/mcpe/protocol/CommandBlockUpdatePacket.php index 51b610db5..da4f66ec3 100644 --- a/src/network/mcpe/protocol/CommandBlockUpdatePacket.php +++ b/src/network/mcpe/protocol/CommandBlockUpdatePacket.php @@ -21,12 +21,10 @@ declare(strict_types=1); - namespace pocketmine\network\mcpe\protocol; #include - use pocketmine\network\mcpe\handler\PacketHandler; class CommandBlockUpdatePacket extends DataPacket implements ServerboundPacket{ diff --git a/src/network/mcpe/protocol/ContainerClosePacket.php b/src/network/mcpe/protocol/ContainerClosePacket.php index d60ae7952..1d3ae9c6f 100644 --- a/src/network/mcpe/protocol/ContainerClosePacket.php +++ b/src/network/mcpe/protocol/ContainerClosePacket.php @@ -25,7 +25,6 @@ namespace pocketmine\network\mcpe\protocol; #include - use pocketmine\network\mcpe\handler\PacketHandler; class ContainerClosePacket extends DataPacket implements ClientboundPacket, ServerboundPacket{ diff --git a/src/network/mcpe/protocol/ContainerOpenPacket.php b/src/network/mcpe/protocol/ContainerOpenPacket.php index 6b36f9782..2361de87d 100644 --- a/src/network/mcpe/protocol/ContainerOpenPacket.php +++ b/src/network/mcpe/protocol/ContainerOpenPacket.php @@ -25,7 +25,6 @@ namespace pocketmine\network\mcpe\protocol; #include - use pocketmine\math\Vector3; use pocketmine\network\mcpe\handler\PacketHandler; diff --git a/src/network/mcpe/protocol/ContainerSetDataPacket.php b/src/network/mcpe/protocol/ContainerSetDataPacket.php index 1782b66f5..d8b3a5934 100644 --- a/src/network/mcpe/protocol/ContainerSetDataPacket.php +++ b/src/network/mcpe/protocol/ContainerSetDataPacket.php @@ -25,7 +25,6 @@ namespace pocketmine\network\mcpe\protocol; #include - use pocketmine\network\mcpe\handler\PacketHandler; class ContainerSetDataPacket extends DataPacket implements ClientboundPacket{ diff --git a/src/network/mcpe/protocol/CraftingDataPacket.php b/src/network/mcpe/protocol/CraftingDataPacket.php index 8ac5b2cf8..f586b76b3 100644 --- a/src/network/mcpe/protocol/CraftingDataPacket.php +++ b/src/network/mcpe/protocol/CraftingDataPacket.php @@ -25,7 +25,6 @@ namespace pocketmine\network\mcpe\protocol; #include - use pocketmine\crafting\FurnaceRecipe; use pocketmine\crafting\ShapedRecipe; use pocketmine\crafting\ShapelessRecipe; diff --git a/src/network/mcpe/protocol/DisconnectPacket.php b/src/network/mcpe/protocol/DisconnectPacket.php index d02619341..3c665d344 100644 --- a/src/network/mcpe/protocol/DisconnectPacket.php +++ b/src/network/mcpe/protocol/DisconnectPacket.php @@ -25,7 +25,6 @@ namespace pocketmine\network\mcpe\protocol; #include - use pocketmine\network\mcpe\handler\PacketHandler; class DisconnectPacket extends DataPacket implements ClientboundPacket, ServerboundPacket{ diff --git a/src/network/mcpe/protocol/HurtArmorPacket.php b/src/network/mcpe/protocol/HurtArmorPacket.php index 6dbef6649..b9e236c4f 100644 --- a/src/network/mcpe/protocol/HurtArmorPacket.php +++ b/src/network/mcpe/protocol/HurtArmorPacket.php @@ -25,7 +25,6 @@ namespace pocketmine\network\mcpe\protocol; #include - use pocketmine\network\mcpe\handler\PacketHandler; class HurtArmorPacket extends DataPacket implements ClientboundPacket{ diff --git a/src/network/mcpe/protocol/InteractPacket.php b/src/network/mcpe/protocol/InteractPacket.php index 5ae4d1fe8..03773799f 100644 --- a/src/network/mcpe/protocol/InteractPacket.php +++ b/src/network/mcpe/protocol/InteractPacket.php @@ -25,7 +25,6 @@ namespace pocketmine\network\mcpe\protocol; #include - use pocketmine\network\mcpe\handler\PacketHandler; class InteractPacket extends DataPacket implements ServerboundPacket{ diff --git a/src/network/mcpe/protocol/LoginPacket.php b/src/network/mcpe/protocol/LoginPacket.php index 8ae9f09be..57578f57c 100644 --- a/src/network/mcpe/protocol/LoginPacket.php +++ b/src/network/mcpe/protocol/LoginPacket.php @@ -25,7 +25,6 @@ namespace pocketmine\network\mcpe\protocol; #include - use Particle\Validator\Validator; use pocketmine\network\BadPacketException; use pocketmine\network\mcpe\handler\PacketHandler; diff --git a/src/network/mcpe/protocol/MapInfoRequestPacket.php b/src/network/mcpe/protocol/MapInfoRequestPacket.php index a1bc4144f..08248acf4 100644 --- a/src/network/mcpe/protocol/MapInfoRequestPacket.php +++ b/src/network/mcpe/protocol/MapInfoRequestPacket.php @@ -21,12 +21,10 @@ declare(strict_types=1); - namespace pocketmine\network\mcpe\protocol; #include - use pocketmine\network\mcpe\handler\PacketHandler; class MapInfoRequestPacket extends DataPacket implements ServerboundPacket{ diff --git a/src/network/mcpe/protocol/MobArmorEquipmentPacket.php b/src/network/mcpe/protocol/MobArmorEquipmentPacket.php index 38f9305c5..22b1556e8 100644 --- a/src/network/mcpe/protocol/MobArmorEquipmentPacket.php +++ b/src/network/mcpe/protocol/MobArmorEquipmentPacket.php @@ -25,7 +25,6 @@ namespace pocketmine\network\mcpe\protocol; #include - use pocketmine\item\Item; use pocketmine\network\mcpe\handler\PacketHandler; diff --git a/src/network/mcpe/protocol/MobEffectPacket.php b/src/network/mcpe/protocol/MobEffectPacket.php index 15c8c8a39..03912a5fc 100644 --- a/src/network/mcpe/protocol/MobEffectPacket.php +++ b/src/network/mcpe/protocol/MobEffectPacket.php @@ -25,7 +25,6 @@ namespace pocketmine\network\mcpe\protocol; #include - use pocketmine\network\mcpe\handler\PacketHandler; class MobEffectPacket extends DataPacket implements ClientboundPacket{ diff --git a/src/network/mcpe/protocol/MobEquipmentPacket.php b/src/network/mcpe/protocol/MobEquipmentPacket.php index d4cad955d..8b5486218 100644 --- a/src/network/mcpe/protocol/MobEquipmentPacket.php +++ b/src/network/mcpe/protocol/MobEquipmentPacket.php @@ -25,7 +25,6 @@ namespace pocketmine\network\mcpe\protocol; #include - use pocketmine\item\Item; use pocketmine\network\mcpe\handler\PacketHandler; diff --git a/src/network/mcpe/protocol/MoveActorAbsolutePacket.php b/src/network/mcpe/protocol/MoveActorAbsolutePacket.php index f42a51a9c..04116f46f 100644 --- a/src/network/mcpe/protocol/MoveActorAbsolutePacket.php +++ b/src/network/mcpe/protocol/MoveActorAbsolutePacket.php @@ -25,7 +25,6 @@ namespace pocketmine\network\mcpe\protocol; #include - use pocketmine\math\Vector3; use pocketmine\network\mcpe\handler\PacketHandler; diff --git a/src/network/mcpe/protocol/MovePlayerPacket.php b/src/network/mcpe/protocol/MovePlayerPacket.php index 6f6c6c06f..98786299e 100644 --- a/src/network/mcpe/protocol/MovePlayerPacket.php +++ b/src/network/mcpe/protocol/MovePlayerPacket.php @@ -25,7 +25,6 @@ namespace pocketmine\network\mcpe\protocol; #include - use pocketmine\math\Vector3; use pocketmine\network\mcpe\handler\PacketHandler; diff --git a/src/network/mcpe/protocol/PlaySoundPacket.php b/src/network/mcpe/protocol/PlaySoundPacket.php index 952a97fb8..cda6b01a1 100644 --- a/src/network/mcpe/protocol/PlaySoundPacket.php +++ b/src/network/mcpe/protocol/PlaySoundPacket.php @@ -21,12 +21,10 @@ declare(strict_types=1); - namespace pocketmine\network\mcpe\protocol; #include - use pocketmine\network\mcpe\handler\PacketHandler; class PlaySoundPacket extends DataPacket implements ClientboundPacket{ diff --git a/src/network/mcpe/protocol/PlayStatusPacket.php b/src/network/mcpe/protocol/PlayStatusPacket.php index 9084a3fa2..9f4402d18 100644 --- a/src/network/mcpe/protocol/PlayStatusPacket.php +++ b/src/network/mcpe/protocol/PlayStatusPacket.php @@ -25,7 +25,6 @@ namespace pocketmine\network\mcpe\protocol; #include - use pocketmine\network\mcpe\handler\PacketHandler; class PlayStatusPacket extends DataPacket implements ClientboundPacket{ diff --git a/src/network/mcpe/protocol/PlayerActionPacket.php b/src/network/mcpe/protocol/PlayerActionPacket.php index c79ddd25b..7cffd0c5f 100644 --- a/src/network/mcpe/protocol/PlayerActionPacket.php +++ b/src/network/mcpe/protocol/PlayerActionPacket.php @@ -25,7 +25,6 @@ namespace pocketmine\network\mcpe\protocol; #include - use pocketmine\network\mcpe\handler\PacketHandler; class PlayerActionPacket extends DataPacket implements ServerboundPacket{ diff --git a/src/network/mcpe/protocol/PlayerInputPacket.php b/src/network/mcpe/protocol/PlayerInputPacket.php index 1d4fd0b97..6828cdaa5 100644 --- a/src/network/mcpe/protocol/PlayerInputPacket.php +++ b/src/network/mcpe/protocol/PlayerInputPacket.php @@ -25,7 +25,6 @@ namespace pocketmine\network\mcpe\protocol; #include - use pocketmine\network\mcpe\handler\PacketHandler; class PlayerInputPacket extends DataPacket implements ServerboundPacket{ diff --git a/src/network/mcpe/protocol/PlayerListPacket.php b/src/network/mcpe/protocol/PlayerListPacket.php index a4ca1c4eb..8431c354e 100644 --- a/src/network/mcpe/protocol/PlayerListPacket.php +++ b/src/network/mcpe/protocol/PlayerListPacket.php @@ -25,7 +25,6 @@ namespace pocketmine\network\mcpe\protocol; #include - use pocketmine\network\mcpe\handler\PacketHandler; use pocketmine\network\mcpe\protocol\types\PlayerListEntry; use function count; diff --git a/src/network/mcpe/protocol/RemoveActorPacket.php b/src/network/mcpe/protocol/RemoveActorPacket.php index 690e5c161..54e8aeded 100644 --- a/src/network/mcpe/protocol/RemoveActorPacket.php +++ b/src/network/mcpe/protocol/RemoveActorPacket.php @@ -25,7 +25,6 @@ namespace pocketmine\network\mcpe\protocol; #include - use pocketmine\network\mcpe\handler\PacketHandler; class RemoveActorPacket extends DataPacket implements ClientboundPacket{ diff --git a/src/network/mcpe/protocol/RequestChunkRadiusPacket.php b/src/network/mcpe/protocol/RequestChunkRadiusPacket.php index cc3caa251..7d7fccf86 100644 --- a/src/network/mcpe/protocol/RequestChunkRadiusPacket.php +++ b/src/network/mcpe/protocol/RequestChunkRadiusPacket.php @@ -25,7 +25,6 @@ namespace pocketmine\network\mcpe\protocol; #include - use pocketmine\network\mcpe\handler\PacketHandler; class RequestChunkRadiusPacket extends DataPacket implements ServerboundPacket{ diff --git a/src/network/mcpe/protocol/ResourcePackChunkDataPacket.php b/src/network/mcpe/protocol/ResourcePackChunkDataPacket.php index 4fbe71f84..87e1496bc 100644 --- a/src/network/mcpe/protocol/ResourcePackChunkDataPacket.php +++ b/src/network/mcpe/protocol/ResourcePackChunkDataPacket.php @@ -21,12 +21,10 @@ declare(strict_types=1); - namespace pocketmine\network\mcpe\protocol; #include - use pocketmine\network\mcpe\handler\PacketHandler; use function strlen; diff --git a/src/network/mcpe/protocol/ResourcePackChunkRequestPacket.php b/src/network/mcpe/protocol/ResourcePackChunkRequestPacket.php index d414ba1b4..c15e7c3d2 100644 --- a/src/network/mcpe/protocol/ResourcePackChunkRequestPacket.php +++ b/src/network/mcpe/protocol/ResourcePackChunkRequestPacket.php @@ -21,12 +21,10 @@ declare(strict_types=1); - namespace pocketmine\network\mcpe\protocol; #include - use pocketmine\network\mcpe\handler\PacketHandler; class ResourcePackChunkRequestPacket extends DataPacket implements ServerboundPacket{ diff --git a/src/network/mcpe/protocol/ResourcePackClientResponsePacket.php b/src/network/mcpe/protocol/ResourcePackClientResponsePacket.php index 833c3982c..06bd7a039 100644 --- a/src/network/mcpe/protocol/ResourcePackClientResponsePacket.php +++ b/src/network/mcpe/protocol/ResourcePackClientResponsePacket.php @@ -25,7 +25,6 @@ namespace pocketmine\network\mcpe\protocol; #include - use pocketmine\network\mcpe\handler\PacketHandler; use function count; diff --git a/src/network/mcpe/protocol/ResourcePackDataInfoPacket.php b/src/network/mcpe/protocol/ResourcePackDataInfoPacket.php index c0bc3ad8e..37fbde3b9 100644 --- a/src/network/mcpe/protocol/ResourcePackDataInfoPacket.php +++ b/src/network/mcpe/protocol/ResourcePackDataInfoPacket.php @@ -21,12 +21,10 @@ declare(strict_types=1); - namespace pocketmine\network\mcpe\protocol; #include - use pocketmine\network\mcpe\handler\PacketHandler; use pocketmine\network\mcpe\protocol\types\resourcepacks\ResourcePackType; diff --git a/src/network/mcpe/protocol/ResourcePackStackPacket.php b/src/network/mcpe/protocol/ResourcePackStackPacket.php index 69d168402..08d4e572c 100644 --- a/src/network/mcpe/protocol/ResourcePackStackPacket.php +++ b/src/network/mcpe/protocol/ResourcePackStackPacket.php @@ -21,12 +21,10 @@ declare(strict_types=1); - namespace pocketmine\network\mcpe\protocol; #include - use pocketmine\network\mcpe\handler\PacketHandler; use pocketmine\network\mcpe\protocol\types\resourcepacks\ResourcePackStackEntry; use function count; diff --git a/src/network/mcpe/protocol/ResourcePacksInfoPacket.php b/src/network/mcpe/protocol/ResourcePacksInfoPacket.php index 753d60486..868e21942 100644 --- a/src/network/mcpe/protocol/ResourcePacksInfoPacket.php +++ b/src/network/mcpe/protocol/ResourcePacksInfoPacket.php @@ -25,7 +25,6 @@ namespace pocketmine\network\mcpe\protocol; #include - use pocketmine\network\mcpe\handler\PacketHandler; use pocketmine\network\mcpe\protocol\types\resourcepacks\ResourcePackInfoEntry; use function count; diff --git a/src/network/mcpe/protocol/RespawnPacket.php b/src/network/mcpe/protocol/RespawnPacket.php index ff6d450be..923ea7a4d 100644 --- a/src/network/mcpe/protocol/RespawnPacket.php +++ b/src/network/mcpe/protocol/RespawnPacket.php @@ -25,7 +25,6 @@ namespace pocketmine\network\mcpe\protocol; #include - use pocketmine\math\Vector3; use pocketmine\network\mcpe\handler\PacketHandler; diff --git a/src/network/mcpe/protocol/RiderJumpPacket.php b/src/network/mcpe/protocol/RiderJumpPacket.php index fad394c4f..c6b9f534d 100644 --- a/src/network/mcpe/protocol/RiderJumpPacket.php +++ b/src/network/mcpe/protocol/RiderJumpPacket.php @@ -21,12 +21,10 @@ declare(strict_types=1); - namespace pocketmine\network\mcpe\protocol; #include - use pocketmine\network\mcpe\handler\PacketHandler; class RiderJumpPacket extends DataPacket implements ServerboundPacket{ diff --git a/src/network/mcpe/protocol/ServerToClientHandshakePacket.php b/src/network/mcpe/protocol/ServerToClientHandshakePacket.php index 78ce6ad82..577bf38dc 100644 --- a/src/network/mcpe/protocol/ServerToClientHandshakePacket.php +++ b/src/network/mcpe/protocol/ServerToClientHandshakePacket.php @@ -25,7 +25,6 @@ namespace pocketmine\network\mcpe\protocol; #include - use pocketmine\network\mcpe\handler\PacketHandler; class ServerToClientHandshakePacket extends DataPacket implements ClientboundPacket{ diff --git a/src/network/mcpe/protocol/SetActorDataPacket.php b/src/network/mcpe/protocol/SetActorDataPacket.php index cb9a60339..b25bb91d5 100644 --- a/src/network/mcpe/protocol/SetActorDataPacket.php +++ b/src/network/mcpe/protocol/SetActorDataPacket.php @@ -25,7 +25,6 @@ namespace pocketmine\network\mcpe\protocol; #include - use pocketmine\network\mcpe\handler\PacketHandler; use pocketmine\network\mcpe\protocol\types\entity\MetadataProperty; diff --git a/src/network/mcpe/protocol/SetActorLinkPacket.php b/src/network/mcpe/protocol/SetActorLinkPacket.php index a8cfbb421..6e03372d8 100644 --- a/src/network/mcpe/protocol/SetActorLinkPacket.php +++ b/src/network/mcpe/protocol/SetActorLinkPacket.php @@ -25,7 +25,6 @@ namespace pocketmine\network\mcpe\protocol; #include - use pocketmine\network\mcpe\handler\PacketHandler; use pocketmine\network\mcpe\protocol\types\entity\EntityLink; diff --git a/src/network/mcpe/protocol/SetActorMotionPacket.php b/src/network/mcpe/protocol/SetActorMotionPacket.php index dae0e6f8a..863af7485 100644 --- a/src/network/mcpe/protocol/SetActorMotionPacket.php +++ b/src/network/mcpe/protocol/SetActorMotionPacket.php @@ -25,7 +25,6 @@ namespace pocketmine\network\mcpe\protocol; #include - use pocketmine\math\Vector3; use pocketmine\network\mcpe\handler\PacketHandler; diff --git a/src/network/mcpe/protocol/SetCommandsEnabledPacket.php b/src/network/mcpe/protocol/SetCommandsEnabledPacket.php index 986350d05..6f0d1bcb3 100644 --- a/src/network/mcpe/protocol/SetCommandsEnabledPacket.php +++ b/src/network/mcpe/protocol/SetCommandsEnabledPacket.php @@ -25,7 +25,6 @@ namespace pocketmine\network\mcpe\protocol; #include - use pocketmine\network\mcpe\handler\PacketHandler; class SetCommandsEnabledPacket extends DataPacket implements ClientboundPacket{ diff --git a/src/network/mcpe/protocol/SetDifficultyPacket.php b/src/network/mcpe/protocol/SetDifficultyPacket.php index 9aa2df4f4..a6de96175 100644 --- a/src/network/mcpe/protocol/SetDifficultyPacket.php +++ b/src/network/mcpe/protocol/SetDifficultyPacket.php @@ -25,7 +25,6 @@ namespace pocketmine\network\mcpe\protocol; #include - use pocketmine\network\mcpe\handler\PacketHandler; class SetDifficultyPacket extends DataPacket implements ClientboundPacket, ServerboundPacket{ diff --git a/src/network/mcpe/protocol/SetHealthPacket.php b/src/network/mcpe/protocol/SetHealthPacket.php index e11b05a84..4efee7493 100644 --- a/src/network/mcpe/protocol/SetHealthPacket.php +++ b/src/network/mcpe/protocol/SetHealthPacket.php @@ -25,7 +25,6 @@ namespace pocketmine\network\mcpe\protocol; #include - use pocketmine\network\mcpe\handler\PacketHandler; class SetHealthPacket extends DataPacket implements ClientboundPacket{ diff --git a/src/network/mcpe/protocol/SetPlayerGameTypePacket.php b/src/network/mcpe/protocol/SetPlayerGameTypePacket.php index 5385ec6a5..94695ac4a 100644 --- a/src/network/mcpe/protocol/SetPlayerGameTypePacket.php +++ b/src/network/mcpe/protocol/SetPlayerGameTypePacket.php @@ -25,7 +25,6 @@ namespace pocketmine\network\mcpe\protocol; #include - use pocketmine\network\mcpe\handler\PacketHandler; class SetPlayerGameTypePacket extends DataPacket implements ClientboundPacket, ServerboundPacket{ diff --git a/src/network/mcpe/protocol/SetSpawnPositionPacket.php b/src/network/mcpe/protocol/SetSpawnPositionPacket.php index 41b2aeaf3..a5c600110 100644 --- a/src/network/mcpe/protocol/SetSpawnPositionPacket.php +++ b/src/network/mcpe/protocol/SetSpawnPositionPacket.php @@ -25,7 +25,6 @@ namespace pocketmine\network\mcpe\protocol; #include - use pocketmine\network\mcpe\handler\PacketHandler; class SetSpawnPositionPacket extends DataPacket implements ClientboundPacket{ diff --git a/src/network/mcpe/protocol/SetTitlePacket.php b/src/network/mcpe/protocol/SetTitlePacket.php index f6afe5b6d..937dffeca 100644 --- a/src/network/mcpe/protocol/SetTitlePacket.php +++ b/src/network/mcpe/protocol/SetTitlePacket.php @@ -21,12 +21,10 @@ declare(strict_types=1); - namespace pocketmine\network\mcpe\protocol; #include - use pocketmine\network\mcpe\handler\PacketHandler; class SetTitlePacket extends DataPacket implements ClientboundPacket{ diff --git a/src/network/mcpe/protocol/ShowCreditsPacket.php b/src/network/mcpe/protocol/ShowCreditsPacket.php index 959f88c8b..d898831f4 100644 --- a/src/network/mcpe/protocol/ShowCreditsPacket.php +++ b/src/network/mcpe/protocol/ShowCreditsPacket.php @@ -21,12 +21,10 @@ declare(strict_types=1); - namespace pocketmine\network\mcpe\protocol; #include - use pocketmine\network\mcpe\handler\PacketHandler; class ShowCreditsPacket extends DataPacket implements ClientboundPacket, ServerboundPacket{ diff --git a/src/network/mcpe/protocol/SpawnExperienceOrbPacket.php b/src/network/mcpe/protocol/SpawnExperienceOrbPacket.php index c7dcd25fb..0ce2e6125 100644 --- a/src/network/mcpe/protocol/SpawnExperienceOrbPacket.php +++ b/src/network/mcpe/protocol/SpawnExperienceOrbPacket.php @@ -25,7 +25,6 @@ namespace pocketmine\network\mcpe\protocol; #include - use pocketmine\math\Vector3; use pocketmine\network\mcpe\handler\PacketHandler; diff --git a/src/network/mcpe/protocol/StartGamePacket.php b/src/network/mcpe/protocol/StartGamePacket.php index 8e95ad56e..5669f326a 100644 --- a/src/network/mcpe/protocol/StartGamePacket.php +++ b/src/network/mcpe/protocol/StartGamePacket.php @@ -25,7 +25,6 @@ namespace pocketmine\network\mcpe\protocol; #include - use pocketmine\math\Vector3; use pocketmine\nbt\tag\ListTag; use pocketmine\nbt\TreeRoot; diff --git a/src/network/mcpe/protocol/StopSoundPacket.php b/src/network/mcpe/protocol/StopSoundPacket.php index 83d44d806..72460d70d 100644 --- a/src/network/mcpe/protocol/StopSoundPacket.php +++ b/src/network/mcpe/protocol/StopSoundPacket.php @@ -21,12 +21,10 @@ declare(strict_types=1); - namespace pocketmine\network\mcpe\protocol; #include - use pocketmine\network\mcpe\handler\PacketHandler; class StopSoundPacket extends DataPacket implements ClientboundPacket{ diff --git a/src/network/mcpe/protocol/TakeItemActorPacket.php b/src/network/mcpe/protocol/TakeItemActorPacket.php index 36dd8fa62..1968922dd 100644 --- a/src/network/mcpe/protocol/TakeItemActorPacket.php +++ b/src/network/mcpe/protocol/TakeItemActorPacket.php @@ -25,7 +25,6 @@ namespace pocketmine\network\mcpe\protocol; #include - use pocketmine\network\mcpe\handler\PacketHandler; class TakeItemActorPacket extends DataPacket implements ClientboundPacket{ diff --git a/src/network/mcpe/protocol/TextPacket.php b/src/network/mcpe/protocol/TextPacket.php index b167e2a19..d227eb0a9 100644 --- a/src/network/mcpe/protocol/TextPacket.php +++ b/src/network/mcpe/protocol/TextPacket.php @@ -25,7 +25,6 @@ namespace pocketmine\network\mcpe\protocol; #include - use pocketmine\network\mcpe\handler\PacketHandler; use function count; diff --git a/src/network/mcpe/protocol/UnknownPacket.php b/src/network/mcpe/protocol/UnknownPacket.php index 490471dfe..184115b07 100644 --- a/src/network/mcpe/protocol/UnknownPacket.php +++ b/src/network/mcpe/protocol/UnknownPacket.php @@ -21,10 +21,8 @@ declare(strict_types=1); - namespace pocketmine\network\mcpe\protocol; - use pocketmine\network\mcpe\handler\PacketHandler; use function ord; use function strlen; diff --git a/src/network/mcpe/protocol/UpdateAttributesPacket.php b/src/network/mcpe/protocol/UpdateAttributesPacket.php index de37371e3..18a7e7ace 100644 --- a/src/network/mcpe/protocol/UpdateAttributesPacket.php +++ b/src/network/mcpe/protocol/UpdateAttributesPacket.php @@ -25,7 +25,6 @@ namespace pocketmine\network\mcpe\protocol; #include - use pocketmine\entity\Attribute; use pocketmine\network\mcpe\handler\PacketHandler; use function array_values; diff --git a/src/network/mcpe/protocol/UpdateBlockPacket.php b/src/network/mcpe/protocol/UpdateBlockPacket.php index 306d0ad25..46729ab80 100644 --- a/src/network/mcpe/protocol/UpdateBlockPacket.php +++ b/src/network/mcpe/protocol/UpdateBlockPacket.php @@ -25,7 +25,6 @@ namespace pocketmine\network\mcpe\protocol; #include - use pocketmine\network\mcpe\handler\PacketHandler; class UpdateBlockPacket extends DataPacket implements ClientboundPacket{ diff --git a/src/network/mcpe/protocol/UpdateTradePacket.php b/src/network/mcpe/protocol/UpdateTradePacket.php index bfb0537f0..08d01c76d 100644 --- a/src/network/mcpe/protocol/UpdateTradePacket.php +++ b/src/network/mcpe/protocol/UpdateTradePacket.php @@ -21,12 +21,10 @@ declare(strict_types=1); - namespace pocketmine\network\mcpe\protocol; #include - use pocketmine\network\mcpe\handler\PacketHandler; use pocketmine\network\mcpe\protocol\types\inventory\WindowTypes; diff --git a/src/network/mcpe/protocol/types/entity/EntityLegacyIds.php b/src/network/mcpe/protocol/types/entity/EntityLegacyIds.php index a59e0a628..a0745e7ee 100644 --- a/src/network/mcpe/protocol/types/entity/EntityLegacyIds.php +++ b/src/network/mcpe/protocol/types/entity/EntityLegacyIds.php @@ -23,7 +23,6 @@ declare(strict_types=1); namespace pocketmine\network\mcpe\protocol\types\entity; - final class EntityLegacyIds{ public const CHICKEN = 10; diff --git a/src/network/mcpe/protocol/types/inventory/WindowTypes.php b/src/network/mcpe/protocol/types/inventory/WindowTypes.php index 6ee75daa1..33aeb9c57 100644 --- a/src/network/mcpe/protocol/types/inventory/WindowTypes.php +++ b/src/network/mcpe/protocol/types/inventory/WindowTypes.php @@ -21,10 +21,8 @@ declare(strict_types=1); - namespace pocketmine\network\mcpe\protocol\types\inventory; - final class WindowTypes{ private function __construct(){ diff --git a/src/network/mcpe/serializer/NetworkBinaryStream.php b/src/network/mcpe/serializer/NetworkBinaryStream.php index df6670150..2bbceec74 100644 --- a/src/network/mcpe/serializer/NetworkBinaryStream.php +++ b/src/network/mcpe/serializer/NetworkBinaryStream.php @@ -227,7 +227,6 @@ class NetworkBinaryStream extends BinaryStream{ } } - public function putSlot(Item $item) : void{ if($item->getId() === 0){ $this->putVarInt(0); diff --git a/src/permission/PermissionAttachmentInfo.php b/src/permission/PermissionAttachmentInfo.php index 57297a11c..ad934f693 100644 --- a/src/permission/PermissionAttachmentInfo.php +++ b/src/permission/PermissionAttachmentInfo.php @@ -23,7 +23,6 @@ declare(strict_types=1); namespace pocketmine\permission; - class PermissionAttachmentInfo{ /** @var Permissible */ private $permissible; diff --git a/src/permission/PermissionRemovedExecutor.php b/src/permission/PermissionRemovedExecutor.php index 71076d94d..606d017ee 100644 --- a/src/permission/PermissionRemovedExecutor.php +++ b/src/permission/PermissionRemovedExecutor.php @@ -23,7 +23,6 @@ declare(strict_types=1); namespace pocketmine\permission; - interface PermissionRemovedExecutor{ public function attachmentRemoved(PermissionAttachment $attachment) : void; diff --git a/src/permission/ServerOperator.php b/src/permission/ServerOperator.php index c9fe3afd8..bc5f233f2 100644 --- a/src/permission/ServerOperator.php +++ b/src/permission/ServerOperator.php @@ -23,7 +23,6 @@ declare(strict_types=1); namespace pocketmine\permission; - interface ServerOperator{ /** * Checks if the current object has operator permissions diff --git a/src/player/Player.php b/src/player/Player.php index a51a622cb..57bac6e86 100644 --- a/src/player/Player.php +++ b/src/player/Player.php @@ -125,7 +125,6 @@ use const M_PI; use const M_SQRT3; use const PHP_INT_MAX; - /** * Main class that handles networking, recovery, and packet sending to the server part */ @@ -2362,5 +2361,4 @@ class Player extends Human implements CommandSender, ChunkLoader, ChunkListener, return $this->location->getZ(); } - } diff --git a/src/plugin/PluginManager.php b/src/plugin/PluginManager.php index 76f69ff66..dce9ca86e 100644 --- a/src/plugin/PluginManager.php +++ b/src/plugin/PluginManager.php @@ -278,7 +278,6 @@ class PluginManager{ } } - while(count($plugins) > 0){ $loadedThisLoop = 0; foreach($plugins as $name => $file){ diff --git a/src/resourcepacks/ResourcePack.php b/src/resourcepacks/ResourcePack.php index 74f897888..aee9cf2c2 100644 --- a/src/resourcepacks/ResourcePack.php +++ b/src/resourcepacks/ResourcePack.php @@ -21,10 +21,8 @@ declare(strict_types=1); - namespace pocketmine\resourcepacks; - interface ResourcePack{ /** diff --git a/src/resourcepacks/ResourcePackManager.php b/src/resourcepacks/ResourcePackManager.php index 289117927..bbe83ca3c 100644 --- a/src/resourcepacks/ResourcePackManager.php +++ b/src/resourcepacks/ResourcePackManager.php @@ -21,7 +21,6 @@ declare(strict_types=1); - namespace pocketmine\resourcepacks; use pocketmine\utils\Config; diff --git a/src/resourcepacks/ZippedResourcePack.php b/src/resourcepacks/ZippedResourcePack.php index 3b262759f..f0106573c 100644 --- a/src/resourcepacks/ZippedResourcePack.php +++ b/src/resourcepacks/ZippedResourcePack.php @@ -21,10 +21,8 @@ declare(strict_types=1); - namespace pocketmine\resourcepacks; - use Ahc\Json\Comment as CommentedJsonDecoder; use function count; use function fclose; diff --git a/src/scheduler/SendUsageTask.php b/src/scheduler/SendUsageTask.php index 547b566f8..f9ad8cd81 100644 --- a/src/scheduler/SendUsageTask.php +++ b/src/scheduler/SendUsageTask.php @@ -115,7 +115,6 @@ class SendUsageTask extends AsyncTask{ "ticks" => $server->getTick() ]; - //This anonymizes the user ids so they cannot be reversed to the original foreach($playerList as $k => $v){ $playerList[$k] = md5($v); diff --git a/src/updater/UpdateCheckTask.php b/src/updater/UpdateCheckTask.php index 23efebb1b..012905785 100644 --- a/src/updater/UpdateCheckTask.php +++ b/src/updater/UpdateCheckTask.php @@ -21,7 +21,6 @@ declare(strict_types=1); - namespace pocketmine\updater; use pocketmine\scheduler\AsyncTask; diff --git a/src/utils/Process.php b/src/utils/Process.php index de2aee85e..67441e729 100644 --- a/src/utils/Process.php +++ b/src/utils/Process.php @@ -104,7 +104,6 @@ final class Process{ return [$heap, $stack]; } - public static function getThreadCount() : int{ if(Utils::getOS() === "linux" or Utils::getOS() === "android"){ if(preg_match("/Threads:[ \t]+([0-9]+)/", file_get_contents("/proc/self/status"), $matches) > 0){ diff --git a/src/utils/Timezone.php b/src/utils/Timezone.php index ff15d46ad..8158956c1 100644 --- a/src/utils/Timezone.php +++ b/src/utils/Timezone.php @@ -177,7 +177,6 @@ abstract class Timezone{ } } - /** * @param string $offset In the format of +09:00, +02:00, -04:00 etc. * diff --git a/src/utils/Utils.php b/src/utils/Utils.php index aa41cf5af..1c634a875 100644 --- a/src/utils/Utils.php +++ b/src/utils/Utils.php @@ -303,7 +303,6 @@ class Utils{ return $output; } - /** * Returns a string that can be printed, replaces non-printable characters * @@ -348,7 +347,6 @@ class Utils{ return $hash; } - /** * @return array of claims * diff --git a/src/utils/VersionString.php b/src/utils/VersionString.php index 37d803503..ca100a843 100644 --- a/src/utils/VersionString.php +++ b/src/utils/VersionString.php @@ -23,7 +23,6 @@ declare(strict_types=1); namespace pocketmine\utils; - use function count; use function preg_match; diff --git a/src/wizard/SetupWizard.php b/src/wizard/SetupWizard.php index 86d49b554..66862b9f9 100644 --- a/src/wizard/SetupWizard.php +++ b/src/wizard/SetupWizard.php @@ -200,7 +200,6 @@ LICENSE; $config->save(); - $this->message($this->lang->get("ip_get")); $externalIP = Internet::getIP(); diff --git a/src/world/Explosion.php b/src/world/Explosion.php index ab295359a..b6b574597 100644 --- a/src/world/Explosion.php +++ b/src/world/Explosion.php @@ -203,7 +203,6 @@ class Explosion{ } } - $air = ItemFactory::air(); $airBlock = VanillaBlocks::AIR(); diff --git a/src/world/World.php b/src/world/World.php index 4faf36241..3365e664d 100644 --- a/src/world/World.php +++ b/src/world/World.php @@ -927,7 +927,6 @@ class World implements ChunkManager{ $entity->scheduleUpdate(); } - foreach($chunk->getSubChunks() as $Y => $subChunk){ if(!$subChunk->isEmptyFast()){ $k = mt_rand(0, 0xfffffffff); //36 bits @@ -1046,7 +1045,6 @@ class World implements ChunkManager{ } } - return $collides; } @@ -1589,7 +1587,6 @@ class World implements ChunkManager{ } } - if($player !== null){ $ev = new BlockPlaceEvent($player, $hand, $blockReplace, $blockClicked, $item); if($player->isAdventure(true) and !$ev->isCancelled()){ diff --git a/src/world/WorldManager.php b/src/world/WorldManager.php index 8a86e727a..bdeedab46 100644 --- a/src/world/WorldManager.php +++ b/src/world/WorldManager.php @@ -320,7 +320,6 @@ class WorldManager{ return null; } - public function tick(int $currentTick) : void{ foreach($this->worlds as $k => $world){ if(!isset($this->worlds[$k])){ diff --git a/src/world/biome/Biome.php b/src/world/biome/Biome.php index eed499e5a..89f4f14ba 100644 --- a/src/world/biome/Biome.php +++ b/src/world/biome/Biome.php @@ -44,13 +44,10 @@ abstract class Biome{ public const ICE_PLAINS = 12; - public const SMALL_MOUNTAINS = 20; - public const BIRCH_FOREST = 27; - public const MAX_BIOMES = 256; /** @var Biome[]|\SplFixedArray */ @@ -96,7 +93,6 @@ abstract class Biome{ self::register(self::ICE_PLAINS, new IcePlainsBiome()); - self::register(self::SMALL_MOUNTAINS, new SmallMountainsBiome()); self::register(self::BIRCH_FOREST, new ForestBiome(TreeType::BIRCH())); diff --git a/src/world/biome/DesertBiome.php b/src/world/biome/DesertBiome.php index dac51c871..79e3cda63 100644 --- a/src/world/biome/DesertBiome.php +++ b/src/world/biome/DesertBiome.php @@ -23,7 +23,6 @@ declare(strict_types=1); namespace pocketmine\world\biome; - class DesertBiome extends SandyBiome{ public function __construct(){ diff --git a/src/world/biome/SmallMountainsBiome.php b/src/world/biome/SmallMountainsBiome.php index 8e649d889..6ba7127fb 100644 --- a/src/world/biome/SmallMountainsBiome.php +++ b/src/world/biome/SmallMountainsBiome.php @@ -23,7 +23,6 @@ declare(strict_types=1); namespace pocketmine\world\biome; - class SmallMountainsBiome extends MountainsBiome{ public function __construct(){ diff --git a/src/world/format/io/data/BaseNbtWorldData.php b/src/world/format/io/data/BaseNbtWorldData.php index 4a5fcf75f..20074dc5e 100644 --- a/src/world/format/io/data/BaseNbtWorldData.php +++ b/src/world/format/io/data/BaseNbtWorldData.php @@ -105,7 +105,6 @@ abstract class BaseNbtWorldData implements WorldData{ return $this->compoundTag; } - /* The below are common between PC and PE */ public function getName() : string{ diff --git a/src/world/format/io/data/JavaWorldData.php b/src/world/format/io/data/JavaWorldData.php index f3b509604..bd0d6490c 100644 --- a/src/world/format/io/data/JavaWorldData.php +++ b/src/world/format/io/data/JavaWorldData.php @@ -101,7 +101,6 @@ class JavaWorldData extends BaseNbtWorldData{ file_put_contents($this->dataPath, $buffer); } - public function getDifficulty() : int{ return $this->compoundTag->getByte("Difficulty", World::DIFFICULTY_NORMAL); } diff --git a/src/world/format/io/region/CorruptedRegionException.php b/src/world/format/io/region/CorruptedRegionException.php index 6c3943bcd..93604f70d 100644 --- a/src/world/format/io/region/CorruptedRegionException.php +++ b/src/world/format/io/region/CorruptedRegionException.php @@ -21,10 +21,8 @@ declare(strict_types=1); - namespace pocketmine\world\format\io\region; - class CorruptedRegionException extends RegionException{ } diff --git a/src/world/format/io/region/RegionException.php b/src/world/format/io/region/RegionException.php index fc9dcdb04..44cb1ff5f 100644 --- a/src/world/format/io/region/RegionException.php +++ b/src/world/format/io/region/RegionException.php @@ -21,10 +21,8 @@ declare(strict_types=1); - namespace pocketmine\world\format\io\region; - class RegionException extends \RuntimeException{ } diff --git a/src/world/generator/noise/Noise.php b/src/world/generator/noise/Noise.php index efe418381..9bee809b4 100644 --- a/src/world/generator/noise/Noise.php +++ b/src/world/generator/noise/Noise.php @@ -26,13 +26,11 @@ declare(strict_types=1); */ namespace pocketmine\world\generator\noise; - use function array_fill; use function assert; abstract class Noise{ - /** * @param float $x * @param float $x1 diff --git a/src/world/generator/object/Tree.php b/src/world/generator/object/Tree.php index b8345ba9c..c15ffb561 100644 --- a/src/world/generator/object/Tree.php +++ b/src/world/generator/object/Tree.php @@ -82,7 +82,6 @@ abstract class Tree{ } } - public function canPlaceObject(ChunkManager $world, int $x, int $y, int $z, Random $random) : bool{ $radiusToCheck = 0; for($yy = 0; $yy < $this->treeHeight + 3; ++$yy){