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

Merge remote-tracking branch 'origin/php7-0.14' into attr

Browse Source
This commit is contained in:
PEMapModder 2016-02-17 19:58:48 +08:00
commit 420007cef8
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pocketmine/PocketMine.php
View File

@ -75,8 +75,8 @@ namespace pocketmine {
const VERSION = "1.6dev"; const VERSION = "1.6dev";
const API_VERSION = "2.0.0"; const API_VERSION = "2.0.0";
const CODENAME = "[REDACTED]"; const CODENAME = "[REDACTED]";
const MINECRAFT_VERSION = "v0.14.0.1 alpha"; const MINECRAFT_VERSION = "v0.14.0.7 alpha";
const MINECRAFT_VERSION_NETWORK = "0.14.0.1"; const MINECRAFT_VERSION_NETWORK = "0.14.0.7";
/* /*
* Startup code. Do not look at it, it may harm you. * Startup code. Do not look at it, it may harm you.

2
src/pocketmine/network/protocol/ContainerSetSlotPacket.php
View File

@ -37,7 +37,7 @@ class ContainerSetSlotPacket extends DataPacket{
public function decode(){ public function decode(){
$this->windowid = $this->getByte(); $this->windowid = $this->getByte();
$this->slot = $this->getShort(); $this->slot = $this->getShort();
$this->hotboarSlot = $this->getShort(); $this->hotbarSlot = $this->getShort();
$this->item = $this->getSlot(); $this->item = $this->getSlot();
} }

4
src/pocketmine/network/protocol/Info.php
View File

@ -30,7 +30,7 @@ interface Info{
/** /**
* Actual Minecraft: PE protocol version * Actual Minecraft: PE protocol version
*/ */
const CURRENT_PROTOCOL = 41; const CURRENT_PROTOCOL = 45;
const LOGIN_PACKET = 0x8f; const LOGIN_PACKET = 0x8f;
const PLAY_STATUS_PACKET = 0x90; const PLAY_STATUS_PACKET = 0x90;
@ -91,6 +91,8 @@ interface Info{
// const MAP_INFO_REQUEST_PACKET = 0xc7; // const MAP_INFO_REQUEST_PACKET = 0xc7;
// const REQUEST_CHUNK_RADIUS_PACKET = 0xc8; // const REQUEST_CHUNK_RADIUS_PACKET = 0xc8;
// const CHUNK_RADIUS_UPDATE_PACKET = 0xc9; // const CHUNK_RADIUS_UPDATE_PACKET = 0xc9;
// const ITEM_FRAME_DROP_ITEM_PACKET = 0xca;
// const REPLACE_SELECTED_ITEM_PACKET = 0xcb;
} }

4
src/pocketmine/utils/BinaryStream.php
View File

@ -206,7 +206,7 @@ class BinaryStream extends \stdClass{
$data = $this->getShort(); $data = $this->getShort();
$nbtLen = $this->getShort(); $nbtLen = $this->getLShort();
$nbt = ""; $nbt = "";
@ -232,7 +232,7 @@ class BinaryStream extends \stdClass{
$this->putByte($item->getCount()); $this->putByte($item->getCount());
$this->putShort($item->getDamage() === null ? -1 : $item->getDamage()); $this->putShort($item->getDamage() === null ? -1 : $item->getDamage());
$nbt = $item->getCompoundTag(); $nbt = $item->getCompoundTag();
$this->putShort(strlen($nbt)); $this->putLShort(strlen($nbt));
$this->put($nbt); $this->put($nbt);
} }