diff --git a/src/pocketmine/Player.php b/src/pocketmine/Player.php index 2dbd715a7..ba3618fab 100644 --- a/src/pocketmine/Player.php +++ b/src/pocketmine/Player.php @@ -118,7 +118,6 @@ use pocketmine\network\protocol\PlayerActionPacket; use pocketmine\network\protocol\PlayStatusPacket; use pocketmine\network\protocol\ResourcePacksInfoPacket; use pocketmine\network\protocol\RespawnPacket; -use pocketmine\network\protocol\SetDifficultyPacket; use pocketmine\network\protocol\SetEntityMotionPacket; use pocketmine\network\protocol\SetHealthPacket; use pocketmine\network\protocol\SetPlayerGameTypePacket; @@ -134,10 +133,7 @@ use pocketmine\permission\PermissibleBase; use pocketmine\permission\PermissionAttachment; use pocketmine\plugin\Plugin; use pocketmine\tile\ItemFrame; -use pocketmine\tile\Sign; use pocketmine\tile\Spawnable; -use pocketmine\tile\Tile; -use pocketmine\utils\Binary; use pocketmine\utils\TextFormat; use pocketmine\utils\UUID; @@ -3612,27 +3608,4 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade public function isLoaderActive(){ return $this->isConnected(); } - - /** - * @param int $chunkX - * @param int $chunkZ - * @param string $payload - * - * @return DataPacket - */ - public static function getChunkCacheFromData($chunkX, $chunkZ, $payload){ - $pk = new FullChunkDataPacket(); - $pk->chunkX = $chunkX; - $pk->chunkZ = $chunkZ; - $pk->data = $payload; - $pk->encode(); - - $batch = new BatchPacket(); - $batch->payload = zlib_encode(Binary::writeUnsignedVarInt(strlen($pk->getBuffer())) . $pk->getBuffer(), ZLIB_ENCODING_DEFLATE, Server::getInstance()->networkCompressionLevel); - - $batch->encode(); - $batch->isEncoded = true; - return $batch; - } - } diff --git a/src/pocketmine/PocketMine.php b/src/pocketmine/PocketMine.php index 9945c97a7..56a46b17f 100644 --- a/src/pocketmine/PocketMine.php +++ b/src/pocketmine/PocketMine.php @@ -489,7 +489,7 @@ namespace pocketmine { } ThreadManager::init(); - $server = new Server($autoloader, $logger, \pocketmine\PATH, \pocketmine\DATA, \pocketmine\PLUGIN_PATH); + new Server($autoloader, $logger, \pocketmine\PATH, \pocketmine\DATA, \pocketmine\PLUGIN_PATH); $logger->info("Stopping other threads"); diff --git a/src/pocketmine/block/BurningFurnace.php b/src/pocketmine/block/BurningFurnace.php index 7a7b5565c..d932af2c4 100644 --- a/src/pocketmine/block/BurningFurnace.php +++ b/src/pocketmine/block/BurningFurnace.php @@ -29,7 +29,7 @@ use pocketmine\nbt\tag\IntTag; use pocketmine\nbt\tag\ListTag; use pocketmine\nbt\tag\StringTag; use pocketmine\Player; -use pocketmine\tile\Furnace; +use pocketmine\tile\Furnace as TileFurnace; use pocketmine\tile\Tile; class BurningFurnace extends Solid{ @@ -101,11 +101,7 @@ class BurningFurnace extends Solid{ public function onActivate(Item $item, Player $player = null){ if($player instanceof Player){ - $t = $this->getLevel()->getTile($this); - $furnace = false; - if($t instanceof Furnace){ - $furnace = $t; - }else{ + if(!(($furnace = $this->getLevel()->getTile($this)) instanceof TileFurnace)){ $nbt = new CompoundTag("", [ new ListTag("Items", []), new StringTag("id", Tile::FURNACE), diff --git a/src/pocketmine/block/SeaLantern.php b/src/pocketmine/block/SeaLantern.php index 9abcba1b6..befee087a 100644 --- a/src/pocketmine/block/SeaLantern.php +++ b/src/pocketmine/block/SeaLantern.php @@ -21,7 +21,6 @@ namespace pocketmine\block; -use pocketmine\item\Tool; use pocketmine\item\Item; class SeaLantern extends Solid{ diff --git a/src/pocketmine/entity/Item.php b/src/pocketmine/entity/Item.php index 74bff751a..a19c8fd7f 100644 --- a/src/pocketmine/entity/Item.php +++ b/src/pocketmine/entity/Item.php @@ -25,7 +25,6 @@ use pocketmine\event\entity\EntityDamageEvent; use pocketmine\event\entity\ItemDespawnEvent; use pocketmine\event\entity\ItemSpawnEvent; use pocketmine\item\Item as ItemItem; -use pocketmine\nbt\NBT; use pocketmine\nbt\tag\CompoundTag; use pocketmine\nbt\tag\ShortTag; use pocketmine\nbt\tag\StringTag; diff --git a/src/pocketmine/entity/Living.php b/src/pocketmine/entity/Living.php index 8f6816ec3..6da49eb88 100644 --- a/src/pocketmine/entity/Living.php +++ b/src/pocketmine/entity/Living.php @@ -32,7 +32,6 @@ use pocketmine\item\Item as ItemItem; use pocketmine\math\Vector3; use pocketmine\nbt\tag\ShortTag; use pocketmine\network\protocol\EntityEventPacket; -use pocketmine\Server; use pocketmine\utils\BlockIterator; abstract class Living extends Entity implements Damageable{ diff --git a/src/pocketmine/entity/Squid.php b/src/pocketmine/entity/Squid.php index 547da9842..297b1d8aa 100644 --- a/src/pocketmine/entity/Squid.php +++ b/src/pocketmine/entity/Squid.php @@ -28,7 +28,6 @@ use pocketmine\math\Vector3; use pocketmine\network\protocol\AddEntityPacket; use pocketmine\network\protocol\EntityEventPacket; use pocketmine\Player; -use pocketmine\Server; class Squid extends WaterAnimal implements Ageable{ const NETWORK_ID = 17; diff --git a/src/pocketmine/event/entity/EntityArmorChangeEvent.php b/src/pocketmine/event/entity/EntityArmorChangeEvent.php index a5b5d0ba0..775870126 100644 --- a/src/pocketmine/event/entity/EntityArmorChangeEvent.php +++ b/src/pocketmine/event/entity/EntityArmorChangeEvent.php @@ -22,7 +22,6 @@ namespace pocketmine\event\entity; use pocketmine\entity\Entity; -use pocketmine\Event; use pocketmine\event\Cancellable; use pocketmine\item\Item; diff --git a/src/pocketmine/event/entity/EntityInventoryChangeEvent.php b/src/pocketmine/event/entity/EntityInventoryChangeEvent.php index ca50c001c..67b128ad0 100644 --- a/src/pocketmine/event/entity/EntityInventoryChangeEvent.php +++ b/src/pocketmine/event/entity/EntityInventoryChangeEvent.php @@ -22,7 +22,6 @@ namespace pocketmine\event\entity; use pocketmine\entity\Entity; -use pocketmine\Event; use pocketmine\event\Cancellable; use pocketmine\item\Item; diff --git a/src/pocketmine/event/entity/EntityLevelChangeEvent.php b/src/pocketmine/event/entity/EntityLevelChangeEvent.php index fcf8e4291..d113d8ca1 100644 --- a/src/pocketmine/event/entity/EntityLevelChangeEvent.php +++ b/src/pocketmine/event/entity/EntityLevelChangeEvent.php @@ -22,7 +22,6 @@ namespace pocketmine\event\entity; use pocketmine\entity\Entity; -use pocketmine\Event; use pocketmine\event\Cancellable; use pocketmine\level\Level; diff --git a/src/pocketmine/event/entity/EntityMotionEvent.php b/src/pocketmine/event/entity/EntityMotionEvent.php index 6c0ea6b75..92bae83af 100644 --- a/src/pocketmine/event/entity/EntityMotionEvent.php +++ b/src/pocketmine/event/entity/EntityMotionEvent.php @@ -22,7 +22,6 @@ namespace pocketmine\event\entity; use pocketmine\entity\Entity; -use pocketmine\Event; use pocketmine\event\Cancellable; use pocketmine\math\Vector3; diff --git a/src/pocketmine/event/entity/EntityTeleportEvent.php b/src/pocketmine/event/entity/EntityTeleportEvent.php index 230e0e3dc..3b470796b 100644 --- a/src/pocketmine/event/entity/EntityTeleportEvent.php +++ b/src/pocketmine/event/entity/EntityTeleportEvent.php @@ -22,7 +22,6 @@ namespace pocketmine\event\entity; use pocketmine\entity\Entity; -use pocketmine\Event; use pocketmine\event\Cancellable; use pocketmine\level\Position; diff --git a/src/pocketmine/event/player/PlayerItemHeldEvent.php b/src/pocketmine/event/player/PlayerItemHeldEvent.php index fb359ecb5..885f1f17a 100644 --- a/src/pocketmine/event/player/PlayerItemHeldEvent.php +++ b/src/pocketmine/event/player/PlayerItemHeldEvent.php @@ -21,7 +21,6 @@ namespace pocketmine\event\player; -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..84a58e274 100644 --- a/src/pocketmine/event/server/DataPacketReceiveEvent.php +++ b/src/pocketmine/event/server/DataPacketReceiveEvent.php @@ -21,7 +21,6 @@ namespace pocketmine\event\server; -use pocketmine\event; use pocketmine\event\Cancellable; 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..b0b70b850 100644 --- a/src/pocketmine/event/server/DataPacketSendEvent.php +++ b/src/pocketmine/event/server/DataPacketSendEvent.php @@ -21,7 +21,6 @@ namespace pocketmine\event\server; -use pocketmine\event; use pocketmine\event\Cancellable; use pocketmine\network\protocol\DataPacket; use pocketmine\Player; diff --git a/src/pocketmine/event/server/QueryRegenerateEvent.php b/src/pocketmine/event/server/QueryRegenerateEvent.php index 9f8ac3b2c..96156198a 100644 --- a/src/pocketmine/event/server/QueryRegenerateEvent.php +++ b/src/pocketmine/event/server/QueryRegenerateEvent.php @@ -21,7 +21,6 @@ namespace pocketmine\event\server; -use pocketmine\event; use pocketmine\Server; use pocketmine\utils\Binary; diff --git a/src/pocketmine/item/Food.php b/src/pocketmine/item/Food.php index 71949a30a..11269a379 100644 --- a/src/pocketmine/item/Food.php +++ b/src/pocketmine/item/Food.php @@ -26,7 +26,6 @@ use pocketmine\entity\Human; use pocketmine\event\entity\EntityEatItemEvent; use pocketmine\network\protocol\EntityEventPacket; use pocketmine\Player; -use pocketmine\Server; abstract class Food extends Item implements FoodSource{ public function canBeConsumed() : bool{ diff --git a/src/pocketmine/level/Level.php b/src/pocketmine/level/Level.php index 1c2d4940a..8b7856255 100644 --- a/src/pocketmine/level/Level.php +++ b/src/pocketmine/level/Level.php @@ -67,7 +67,6 @@ use pocketmine\inventory\InventoryHolder; use pocketmine\item\Item; use pocketmine\level\format\Chunk; use pocketmine\level\format\generic\BaseLevelProvider; -use pocketmine\level\format\generic\EmptyChunkSection; use pocketmine\level\format\LevelProvider; use pocketmine\level\generator\GenerationTask; use pocketmine\level\generator\Generator; @@ -85,13 +84,13 @@ use pocketmine\math\Vector3; use pocketmine\metadata\BlockMetadataStore; use pocketmine\metadata\Metadatable; use pocketmine\metadata\MetadataValue; -use pocketmine\nbt\NBT; use pocketmine\nbt\tag\CompoundTag; use pocketmine\nbt\tag\DoubleTag; use pocketmine\nbt\tag\FloatTag; use pocketmine\nbt\tag\ListTag; use pocketmine\nbt\tag\ShortTag; use pocketmine\nbt\tag\StringTag; +use pocketmine\network\protocol\BatchPacket; use pocketmine\network\protocol\DataPacket; use pocketmine\network\protocol\FullChunkDataPacket; use pocketmine\network\protocol\LevelEventPacket; @@ -104,6 +103,7 @@ use pocketmine\plugin\Plugin; use pocketmine\Server; use pocketmine\tile\Chest; use pocketmine\tile\Tile; +use pocketmine\utils\Binary; use pocketmine\utils\LevelException; use pocketmine\utils\Random; use pocketmine\utils\ReversePriorityQueue; @@ -896,8 +896,6 @@ class Level implements ChunkManager, Metadatable{ } } - $blockTest = 0; - foreach($this->chunkTickList as $index => $loaders){ Level::getXZ($index, $chunkX, $chunkZ); @@ -2297,7 +2295,7 @@ class Level implements ChunkManager, Metadatable{ $index = Level::chunkHash($x, $z); if(!isset($this->chunkCache[$index]) and $this->cacheChunks and $this->server->getMemoryManager()->canUseChunkCache()){ - $this->chunkCache[$index] = Player::getChunkCacheFromData($x, $z, $payload); + $this->chunkCache[$index] = Level::getChunkCacheFromData($x, $z, $payload); $this->sendChunkFromCache($x, $z); $this->timings->syncChunkSendTimer->stopTiming(); return; @@ -2731,7 +2729,7 @@ class Level implements ChunkManager, Metadatable{ $this->timings->doChunkGC->startTiming(); foreach($this->chunks as $index => $chunk){ - if(!isset($this->unloadQueue[$index]) and (!isset($this->usedChunks[$index]) or count($this->usedChunks[$index]) === 0)){ + if(!isset($this->unloadQueue[$index])){ Level::getXZ($index, $X, $Z); if(!$this->isSpawnChunk($X, $Z)){ $this->unloadChunkRequest($X, $Z, true); @@ -2774,6 +2772,28 @@ class Level implements ChunkManager, Metadatable{ } } + /** + * @param int $chunkX + * @param int $chunkZ + * @param string $payload + * + * @return DataPacket + */ + public static function getChunkCacheFromData($chunkX, $chunkZ, $payload){ + $pk = new FullChunkDataPacket(); + $pk->chunkX = $chunkX; + $pk->chunkZ = $chunkZ; + $pk->data = $payload; + $pk->encode(); + + $batch = new BatchPacket(); + $batch->payload = zlib_encode(Binary::writeUnsignedVarInt(strlen($pk->getBuffer())) . $pk->getBuffer(), ZLIB_ENCODING_DEFLATE, Server::getInstance()->networkCompressionLevel); + + $batch->encode(); + $batch->isEncoded = true; + return $batch; + } + public function setMetadata($metadataKey, MetadataValue $metadataValue){ $this->server->getLevelMetadata()->setMetadata($this, $metadataKey, $metadataValue); } diff --git a/src/pocketmine/level/WeakPosition.php b/src/pocketmine/level/WeakPosition.php index b8808ad48..257bbd3ca 100644 --- a/src/pocketmine/level/WeakPosition.php +++ b/src/pocketmine/level/WeakPosition.php @@ -27,6 +27,8 @@ use pocketmine\utils\LevelException; class WeakPosition extends Position{ + protected $levelId = -1; + /** * @param int $x * @param int $y diff --git a/src/pocketmine/level/format/LevelProvider.php b/src/pocketmine/level/format/LevelProvider.php index f7ecd4ff5..e4d610fe1 100644 --- a/src/pocketmine/level/format/LevelProvider.php +++ b/src/pocketmine/level/format/LevelProvider.php @@ -23,7 +23,6 @@ declare(strict_types = 1); namespace pocketmine\level\format; -use pocketmine\level\format\Chunk; use pocketmine\level\Level; use pocketmine\math\Vector3; diff --git a/src/pocketmine/level/format/generic/BaseLevelProvider.php b/src/pocketmine/level/format/generic/BaseLevelProvider.php index dd43b9dcf..fad79bad6 100644 --- a/src/pocketmine/level/format/generic/BaseLevelProvider.php +++ b/src/pocketmine/level/format/generic/BaseLevelProvider.php @@ -32,6 +32,7 @@ use pocketmine\nbt\tag\CompoundTag; use pocketmine\nbt\tag\IntTag; use pocketmine\nbt\tag\LongTag; use pocketmine\nbt\tag\StringTag; +use pocketmine\utils\ChunkException; use pocketmine\utils\LevelException; abstract class BaseLevelProvider implements LevelProvider{ diff --git a/src/pocketmine/level/format/generic/ChunkRequestTask.php b/src/pocketmine/level/format/generic/ChunkRequestTask.php index f0a41c3a3..fb5718d5d 100644 --- a/src/pocketmine/level/format/generic/ChunkRequestTask.php +++ b/src/pocketmine/level/format/generic/ChunkRequestTask.php @@ -19,7 +19,7 @@ * */ -namespace pocketmine\level\format; +namespace pocketmine\level\format\generic; use pocketmine\level\Level; use pocketmine\nbt\NBT; diff --git a/src/pocketmine/level/format/generic/EmptySubChunk.php b/src/pocketmine/level/format/generic/EmptySubChunk.php index a7a5e702b..9ee8d3327 100644 --- a/src/pocketmine/level/format/generic/EmptySubChunk.php +++ b/src/pocketmine/level/format/generic/EmptySubChunk.php @@ -23,8 +23,6 @@ declare(strict_types = 1); namespace pocketmine\level\format\generic; -use pocketmine\utils\ChunkException; - class EmptySubChunk extends SubChunk{ public function __construct(){ diff --git a/src/pocketmine/level/format/generic/GenericChunk.php b/src/pocketmine/level/format/generic/GenericChunk.php index 73b1cb367..b05c47bc2 100644 --- a/src/pocketmine/level/format/generic/GenericChunk.php +++ b/src/pocketmine/level/format/generic/GenericChunk.php @@ -30,13 +30,13 @@ use pocketmine\block\Block; use pocketmine\entity\Entity; use pocketmine\level\format\Chunk; use pocketmine\level\format\LevelProvider; -use pocketmine\level\Level; use pocketmine\nbt\NBT; use pocketmine\nbt\tag\CompoundTag; use pocketmine\Player; use pocketmine\tile\Tile; use pocketmine\tile\Spawnable; use pocketmine\utils\BinaryStream; +use pocketmine\utils\ChunkException; class GenericChunk implements Chunk{ diff --git a/src/pocketmine/level/format/region/Anvil.php b/src/pocketmine/level/format/region/Anvil.php index ad67bc40c..c30134aad 100644 --- a/src/pocketmine/level/format/region/Anvil.php +++ b/src/pocketmine/level/format/region/Anvil.php @@ -23,15 +23,19 @@ declare(strict_types = 1); namespace pocketmine\level\format\region; -use pocketmine\level\format\Chunk; use pocketmine\level\format\generic\GenericChunk; use pocketmine\level\format\generic\SubChunk; -use pocketmine\level\Level; use pocketmine\nbt\NBT; -use pocketmine\nbt\tag\{ByteArrayTag, ByteTag, CompoundTag, IntArrayTag, IntTag, ListTag, LongTag}; +use pocketmine\nbt\tag\{ + ByteArrayTag, + ByteTag, + CompoundTag, + IntArrayTag, + IntTag, + ListTag, + LongTag +}; use pocketmine\Player; -use pocketmine\tile\Spawnable; -use pocketmine\utils\BinaryStream; use pocketmine\utils\ChunkException; use pocketmine\utils\MainLogger; diff --git a/src/pocketmine/level/format/region/McRegion.php b/src/pocketmine/level/format/region/McRegion.php index 851582fb2..6c8150d98 100644 --- a/src/pocketmine/level/format/region/McRegion.php +++ b/src/pocketmine/level/format/region/McRegion.php @@ -24,16 +24,23 @@ declare(strict_types = 1); namespace pocketmine\level\format\region; use pocketmine\level\format\Chunk; -use pocketmine\level\format\LevelProvider; use pocketmine\level\format\generic\GenericChunk; use pocketmine\level\format\generic\SubChunk; use pocketmine\level\format\generic\BaseLevelProvider; use pocketmine\level\generator\Generator; use pocketmine\level\Level; use pocketmine\nbt\NBT; -use pocketmine\nbt\tag\{ByteArrayTag, ByteTag, CompoundTag, IntArrayTag, IntTag, ListTag, LongTag, StringTag}; +use pocketmine\nbt\tag\{ + ByteArrayTag, + ByteTag, + CompoundTag, + IntArrayTag, + IntTag, + ListTag, + LongTag, + StringTag +}; use pocketmine\Player; -use pocketmine\utils\ChunkException; use pocketmine\utils\MainLogger; class McRegion extends BaseLevelProvider{ @@ -137,9 +144,9 @@ class McRegion extends BaseLevelProvider{ $subChunks = []; $fullIds = isset($chunk->Blocks) ? $chunk->Blocks->getValue() : str_repeat("\x00", 32768); - $fullData = isset($chunk->Data) ? $chunk->Data->getValue() : ($half = str_repeat("\x00", 16384)); + $fullData = isset($chunk->Data) ? $chunk->Data->getValue() : (str_repeat("\x00", 16384)); $fullSkyLight = isset($chunk->SkyLight) ? $chunk->SkyLight->getValue() : str_repeat("\xff", 16384); - $fullBlockLight = isset($chunk->BlockLight) ? $chunk->BlockLight->getValue() : $half; + $fullBlockLight = isset($chunk->BlockLight) ? $chunk->BlockLight->getValue() : (str_repeat("\x00", 16384)); for($y = 0; $y < 8; ++$y){ $offset = ($y << 4); diff --git a/src/pocketmine/level/format/region/PMAnvil.php b/src/pocketmine/level/format/region/PMAnvil.php index 99ae99ff8..f904d22ef 100644 --- a/src/pocketmine/level/format/region/PMAnvil.php +++ b/src/pocketmine/level/format/region/PMAnvil.php @@ -23,15 +23,19 @@ declare(strict_types = 1); namespace pocketmine\level\format\region; -use pocketmine\level\format\Chunk; use pocketmine\level\format\generic\GenericChunk; use pocketmine\level\format\generic\SubChunk; -use pocketmine\level\Level; use pocketmine\nbt\NBT; -use pocketmine\nbt\tag\{ByteArrayTag, ByteTag, CompoundTag, IntArrayTag, IntTag, ListTag, LongTag}; +use pocketmine\nbt\tag\{ + ByteArrayTag, + ByteTag, + CompoundTag, + IntArrayTag, + IntTag, + ListTag, + LongTag +}; use pocketmine\Player; -use pocketmine\tile\Spawnable; -use pocketmine\utils\BinaryStream; use pocketmine\utils\ChunkException; use pocketmine\utils\MainLogger; diff --git a/src/pocketmine/level/generator/Flat.php b/src/pocketmine/level/generator/Flat.php index 307cfc588..c1967a0a8 100644 --- a/src/pocketmine/level/generator/Flat.php +++ b/src/pocketmine/level/generator/Flat.php @@ -32,7 +32,6 @@ use pocketmine\block\RedstoneOre; use pocketmine\item\Item; use pocketmine\level\ChunkManager; use pocketmine\level\format\Chunk; -use pocketmine\level\generator\biome\Biome; use pocketmine\level\generator\populator\Ore; use pocketmine\level\generator\populator\Populator; use pocketmine\math\Vector3; diff --git a/src/pocketmine/level/generator/GenerationTask.php b/src/pocketmine/level/generator/GenerationTask.php index fd8001209..2684f13d6 100644 --- a/src/pocketmine/level/generator/GenerationTask.php +++ b/src/pocketmine/level/generator/GenerationTask.php @@ -53,7 +53,6 @@ class GenerationTask extends AsyncTask{ } /** @var Chunk $chunk */ - $chunk = $this->chunkClass; $chunk = GenericChunk::fastDeserialize($this->chunk); if($chunk === null){ //TODO error @@ -79,7 +78,6 @@ class GenerationTask extends AsyncTask{ return; } /** @var Chunk $chunk */ - $chunk = $this->chunkClass; $chunk = GenericChunk::fastDeserialize($this->chunk, $level->getProvider()); if($chunk === null){ //TODO error diff --git a/src/pocketmine/level/generator/LightPopulationTask.php b/src/pocketmine/level/generator/LightPopulationTask.php index d2acffe1c..e6540610c 100644 --- a/src/pocketmine/level/generator/LightPopulationTask.php +++ b/src/pocketmine/level/generator/LightPopulationTask.php @@ -22,7 +22,7 @@ namespace pocketmine\level\generator; use pocketmine\level\format\Chunk; -use pocketmine\level\format\generic\FullChunk; +use pocketmine\level\format\generic\GenericChunk; use pocketmine\level\Level; use pocketmine\scheduler\AsyncTask; use pocketmine\Server; @@ -41,7 +41,6 @@ class LightPopulationTask extends AsyncTask{ public function onRun(){ /** @var Chunk $chunk */ - $chunk = $this->chunkClass; $chunk = GenericChunk::fastDeserialize($this->chunk); if($chunk === null){ //TODO error @@ -59,7 +58,6 @@ class LightPopulationTask extends AsyncTask{ $level = $server->getLevel($this->levelId); if($level !== null){ /** @var Chunk $chunk */ - $chunk = $this->chunkClass; $chunk = GenericChunk::fastDeserialize($this->chunk, $level->getProvider()); if($chunk === null){ //TODO error diff --git a/src/pocketmine/level/generator/hell/HellBiome.php b/src/pocketmine/level/generator/hell/HellBiome.php index 5fb717e92..9879d1feb 100644 --- a/src/pocketmine/level/generator/hell/HellBiome.php +++ b/src/pocketmine/level/generator/hell/HellBiome.php @@ -28,8 +28,4 @@ class HellBiome extends Biome{ public function getName(){ return "Hell"; } - - public function getColor(){ - return 0; - } } diff --git a/src/pocketmine/level/generator/normal/biome/NormalBiome.php b/src/pocketmine/level/generator/normal/biome/NormalBiome.php index 5e023a70a..e9d647b61 100644 --- a/src/pocketmine/level/generator/normal/biome/NormalBiome.php +++ b/src/pocketmine/level/generator/normal/biome/NormalBiome.php @@ -25,7 +25,4 @@ use pocketmine\level\generator\biome\Biome; abstract class NormalBiome extends Biome{ - public function getColor(){ - return $this->grassColor; - } } diff --git a/src/pocketmine/level/generator/normal/biome/SwampBiome.php b/src/pocketmine/level/generator/normal/biome/SwampBiome.php index 990bfd98e..794e1c648 100644 --- a/src/pocketmine/level/generator/normal/biome/SwampBiome.php +++ b/src/pocketmine/level/generator/normal/biome/SwampBiome.php @@ -35,8 +35,4 @@ class SwampBiome extends GrassyBiome{ public function getName(){ return "Swamp"; } - - public function getColor(){ - return 0x6a7039; - } } \ No newline at end of file diff --git a/src/pocketmine/network/Network.php b/src/pocketmine/network/Network.php index 1a9da8397..f4b382a3b 100644 --- a/src/pocketmine/network/Network.php +++ b/src/pocketmine/network/Network.php @@ -94,7 +94,6 @@ use pocketmine\network\protocol\UpdateBlockPacket; use pocketmine\network\protocol\UseItemPacket; use pocketmine\Player; use pocketmine\Server; -use pocketmine\utils\Binary; use pocketmine\utils\BinaryStream; class Network{ diff --git a/src/pocketmine/network/protocol/ResourcePacksInfoPacket.php b/src/pocketmine/network/protocol/ResourcePacksInfoPacket.php index c4ee1ed29..9ec1b831a 100644 --- a/src/pocketmine/network/protocol/ResourcePacksInfoPacket.php +++ b/src/pocketmine/network/protocol/ResourcePacksInfoPacket.php @@ -21,16 +21,18 @@ namespace pocketmine\network\protocol; +use pocketmine\resourcepacks\ResourcePackInfoEntry; + #include class ResourcePacksInfoPacket extends DataPacket{ const NETWORK_ID = Info::RESOURCE_PACKS_INFO_PACKET; - public $mustAccept = false; //force client to use selected resource packs - /** @var ResourcePackInfoEntry */ - public $behaviourPackEntries = []; - /** @var ResourcePackInfoEntry */ + public $mustAccept = false; //if true, forces client to use selected resource packs + /** @var ResourcePackInfoEntry[] */ + public $behaviorPackEntries = []; + /** @var ResourcePackInfoEntry[] */ public $resourcePackEntries = []; public function decode(){ @@ -41,8 +43,8 @@ class ResourcePacksInfoPacket extends DataPacket{ $this->reset(); $this->putBool($this->mustAccept); - $this->putShort(count($this->behaviourPackEntries)); - foreach($this->behaviourPackEntries as $entry){ + $this->putShort(count($this->behaviorPackEntries)); + foreach($this->behaviorPackEntries as $entry){ $this->putString($entry->getPackId()); $this->putString($entry->getVersion()); $this->putLong($entry->getPackSize());