mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-06 09:56:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'release/3.3' into release/3.4

Browse Source
This commit is contained in:
Dylan K. Taylor
2018-10-21 18:17:07 +01:00
parent b35759cc25 5e68858ebf
commit 6dd2597934
62 changed files with 120 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/pocketmine/network/mcpe/protocol/AvailableCommandsPacket.php
View File

@ -329,7 +329,7 @@ class AvailableCommandsPacket extends DataPacket{
foreach($commandData->overloads as $overload){
/**
* @var CommandParameter[] $overload
* @var CommandParameter $parameter
* @var CommandParameter $parameter
*/
foreach($overload as $parameter){
if($parameter->enum !== null){

2
src/pocketmine/network/mcpe/protocol/LoginPacket.php
View File

@ -87,7 +87,7 @@ class LoginPacket extends DataPacket{
}
$logger = MainLogger::getLogger();
$logger->debug(get_class($e) . " was thrown while decoding connection request in login (protocol version " . ($this->protocol ?? "unknown") . "): " . $e->getMessage());
$logger->debug(get_class($e) . " was thrown while decoding connection request in login (protocol version " . ($this->protocol ?? "unknown") . "): " . $e->getMessage());
foreach(Utils::getTrace(0, $e->getTrace()) as $line){
$logger->debug($line);
}

2
src/pocketmine/network/mcpe/protocol/PacketPool.php
View File

@ -160,6 +160,7 @@ class PacketPool{
/**
* @param int $pid
*
* @return DataPacket
*/
public static function getPacketById(int $pid) : DataPacket{
@ -168,6 +169,7 @@ class PacketPool{
/**
* @param string $buffer
*
* @return DataPacket
*/
public static function getPacket(string $buffer) : DataPacket{

2
src/pocketmine/network/mcpe/protocol/StartGamePacket.php
View File

@ -64,7 +64,7 @@ class StartGamePacket extends DataPacket{
public $difficulty;
/** @var int */
public $spawnX;
/** @var int*/
/** @var int */
public $spawnY;
/** @var int */
public $spawnZ;

1
src/pocketmine/network/mcpe/protocol/types/NetworkInventoryAction.php
View File

@ -92,6 +92,7 @@ class NetworkInventoryAction{
/**
* @param InventoryTransactionPacket $packet
*
* @return $this
*/
public function read(InventoryTransactionPacket $packet){