Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@
<br>
This is a fork of <a href="https://github.com/pmmp/PocketMine-MP/tree/3.28.0">PocketMine-MP</a> and <a href="https://github.com/unresolved3169/Altay">Altay</a>.
<br><br>
<i>This fork was created due to the inactivity of Altay and currently supports Minecraft: Bedrock Edition v1.21.120</i>
<i>This fork was created due to the inactivity of Altay and currently supports Minecraft: Bedrock Edition v1.21.124</i>
<br><br>

<p align="center">
<a href="https://discord.gg/spquK3Q66W">
<img src="https://img.shields.io/discord/930544524655202317?color=5865F2&logo=discord&logoColor=white" alt="Discord">
</a>
<a href="https://www.minecraft.net/en-us/article/minecraft--bedrock-edition-1-21-120">
<img src="https://img.shields.io/badge/Minecraft_1.21.120-blue?style=flat-square" alt="Minecraft">
<a href="https://feedback.minecraft.net/hc/en-us/articles/41224903492621-Minecraft-1-21-124-Bedrock">
<img src="https://img.shields.io/badge/Minecraft_1.21.124-blue?style=flat-square" alt="Minecraft">
</a>
<a href="https://github.com/Mojang/bedrock-protocol-docs">
<img src="https://img.shields.io/badge/protocol-859-yellow?style=flat-square" alt="Protocol">
<img src="https://img.shields.io/badge/protocol-860-yellow?style=flat-square" alt="Protocol">
</a>
<a href="https://github.com/Benedikt05/BetterAltay/releases">
<img src="https://img.shields.io/github/v/release/Benedikt05/BetterAltay?color=green&label=Latest%20Release&logo=github" alt="Latest Release">
Expand Down
12 changes: 6 additions & 6 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/pocketmine/Player.php
Original file line number Diff line number Diff line change
Expand Up @@ -2160,7 +2160,7 @@ protected function initEntity() : void{

public function handleRequestNetworkSettings(RequestNetworkSettingsPacket $packet) : bool{
$protocolVersion = $packet->protocolVersion;
if($protocolVersion !== ProtocolInfo::CURRENT_PROTOCOL){
if($protocolVersion !== ProtocolInfo::CURRENT_PROTOCOL && $protocolVersion !== ProtocolInfo::PROTOCOL_1_21_120){
$this->sendPlayStatus($protocolVersion < ProtocolInfo::CURRENT_PROTOCOL ? PlayStatusPacket::LOGIN_FAILED_CLIENT : PlayStatusPacket::LOGIN_FAILED_SERVER, true);
//This pocketmine disconnect message will only be seen by the console (PlayStatusPacket causes the messages to be shown for the client)
$this->close("", $this->server->getLanguage()->translateString("pocketmine.disconnect.incompatibleProtocol", [$protocolVersion]), false);
Expand Down
7 changes: 5 additions & 2 deletions src/pocketmine/network/mcpe/protocol/ProtocolInfo.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,14 @@ interface ProtocolInfo{
*/

/** Actual Minecraft: PE protocol version */
public const CURRENT_PROTOCOL = 859;
public const CURRENT_PROTOCOL = 860;
/** Temporary support for Minecraft 1.21.120 */
public const PROTOCOL_1_21_120 = 859;

/** Current Minecraft PE version reported by the server. This is usually the earliest currently supported version. */
public const MINECRAFT_VERSION = 'v' . self::MINECRAFT_VERSION_NETWORK;
/** Version number sent to clients in ping responses. */
public const MINECRAFT_VERSION_NETWORK = '1.21.120';
public const MINECRAFT_VERSION_NETWORK = '1.21.124';

public const LOGIN_PACKET = 0x01;
public const PLAY_STATUS_PACKET = 0x02;
Expand Down