diff --git a/src/pocketmine/PocketMine.php b/src/pocketmine/PocketMine.php index 8ef717c07..6f728b682 100644 --- a/src/pocketmine/PocketMine.php +++ b/src/pocketmine/PocketMine.php @@ -75,6 +75,7 @@ namespace pocketmine { const API_VERSION = "1.12.0"; const CODENAME = "活発(Kappatsu)フグ(Fugu)"; const MINECRAFT_VERSION = "v0.11.0 alpha build 8"; + const MINECRAFT_VERSION_NETWORK = "0.11.0.8"; /* * Startup code. Do not look at it, it may harm you. diff --git a/src/pocketmine/level/format/anvil/ChunkRequestTask.php b/src/pocketmine/level/format/anvil/ChunkRequestTask.php index f982fadcf..4c32cfcf9 100644 --- a/src/pocketmine/level/format/anvil/ChunkRequestTask.php +++ b/src/pocketmine/level/format/anvil/ChunkRequestTask.php @@ -84,7 +84,7 @@ class ChunkRequestTask extends AsyncTask{ $biomeColors = pack("N*", ...$chunk->getBiomeColorArray()); - $ordered = $orderedIds . $orderedData . $orderedSkyLight . $orderedLight . $chunk->getBiomeIdArray() . $biomeColors . $this->tiles; + $ordered = $orderedIds . $orderedData . $orderedSkyLight . $orderedLight . $biomeColors . $this->tiles; $this->setResult($ordered, false); } diff --git a/src/pocketmine/level/format/leveldb/LevelDB.php b/src/pocketmine/level/format/leveldb/LevelDB.php index 92a3e5624..91e323b69 100644 --- a/src/pocketmine/level/format/leveldb/LevelDB.php +++ b/src/pocketmine/level/format/leveldb/LevelDB.php @@ -152,7 +152,6 @@ class LevelDB extends BaseLevelProvider{ $chunk->getBlockDataArray() . $chunk->getBlockSkyLightArray() . $chunk->getBlockLightArray() . - $chunk->getBiomeIdArray() . $biomeColors . $tiles; diff --git a/src/pocketmine/level/format/mcregion/McRegion.php b/src/pocketmine/level/format/mcregion/McRegion.php index 020e2228e..f1d87fb9f 100644 --- a/src/pocketmine/level/format/mcregion/McRegion.php +++ b/src/pocketmine/level/format/mcregion/McRegion.php @@ -31,6 +31,7 @@ use pocketmine\nbt\tag\Compound; use pocketmine\nbt\tag\Int; use pocketmine\nbt\tag\Long; use pocketmine\nbt\tag\String; +use pocketmine\network\protocol\FullChunkDataPacket; use pocketmine\tile\Spawnable; use pocketmine\utils\Binary; use pocketmine\utils\ChunkException; @@ -133,7 +134,6 @@ class McRegion extends BaseLevelProvider{ $chunk->getBlockDataArray() . $chunk->getBlockSkyLightArray() . $chunk->getBlockLightArray() . - $chunk->getBiomeIdArray() . $biomeColors . $tiles; diff --git a/src/pocketmine/network/RakLibInterface.php b/src/pocketmine/network/RakLibInterface.php index 848adf673..de64906de 100644 --- a/src/pocketmine/network/RakLibInterface.php +++ b/src/pocketmine/network/RakLibInterface.php @@ -24,6 +24,7 @@ namespace pocketmine\network; use pocketmine\event\player\PlayerCreationEvent; use pocketmine\network\protocol\DataPacket; use pocketmine\network\protocol\Info as ProtocolInfo; +use pocketmine\network\protocol\Info; use pocketmine\network\protocol\UnknownPacket; use pocketmine\Player; use pocketmine\Server; @@ -179,7 +180,7 @@ class RakLibInterface implements ServerInstance, AdvancedSourceInterface{ } public function setName($name){ - $this->interface->sendOption("name", "MCCPP;Demo;$name"); + $this->interface->sendOption("name", "MCPE;".addcslashes($name, ";").";".Info::CURRENT_PROTOCOL.";".\pocketmine\MINECRAFT_VERSION_NETWORK); } public function setPortCheck($name){ diff --git a/src/pocketmine/network/protocol/Info.php b/src/pocketmine/network/protocol/Info.php index ff99f112d..594cb6701 100644 --- a/src/pocketmine/network/protocol/Info.php +++ b/src/pocketmine/network/protocol/Info.php @@ -30,7 +30,7 @@ interface Info{ /** * Actual Minecraft: PE protocol version */ - const CURRENT_PROTOCOL = 24; + const CURRENT_PROTOCOL = 25; const LOGIN_PACKET = 0x82; const PLAY_STATUS_PACKET = 0x83;