This repository has been archived by the owner on Feb 23, 2021. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge commit '14a6779e081860548a19fc363747af1b978d76ae' into 3.6
# Conflicts: # src/pocketmine/PocketMine.php
- Loading branch information
Showing
17 changed files
with
389 additions
and
20 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
src/pocketmine/network/mcpe/protocol/AvailableEntityIdentifiersPacket.php
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
59 changes: 59 additions & 0 deletions
59
src/pocketmine/network/mcpe/protocol/LecternUpdatePacket.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,59 @@ | ||
<?php | ||
|
||
/* | ||
* | ||
* ____ _ _ __ __ _ __ __ ____ | ||
* | _ \ ___ ___| | _____| |_| \/ (_)_ __ ___ | \/ | _ \ | ||
* | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) | | ||
* | __/ (_) | (__| < __/ |_| | | | | | | | __/_____| | | | __/ | ||
* |_| \___/ \___|_|\_\___|\__|_| |_|_|_| |_|\___| |_| |_|_| | ||
* | ||
* This program is free software: you can redistribute it and/or modify | ||
* it under the terms of the GNU Lesser General Public License as published by | ||
* the Free Software Foundation, either version 3 of the License, or | ||
* (at your option) any later version. | ||
* | ||
* @author PocketMine Team | ||
* @link http://www.pocketmine.net/ | ||
* | ||
* | ||
*/ | ||
|
||
declare(strict_types=1); | ||
|
||
namespace pocketmine\network\mcpe\protocol; | ||
|
||
#include <rules/DataPacket.h> | ||
|
||
use pocketmine\network\mcpe\NetworkSession; | ||
|
||
class LecternUpdatePacket extends DataPacket/* implements ServerboundPacket*/{ | ||
public const NETWORK_ID = ProtocolInfo::LECTERN_UPDATE_PACKET; | ||
|
||
/** @var int */ | ||
public $page; | ||
/** @var int */ | ||
public $x; | ||
/** @var int */ | ||
public $y; | ||
/** @var int */ | ||
public $z; | ||
/** @var bool */ | ||
public $dropBook; | ||
|
||
protected function decodePayload() : void{ | ||
$this->page = $this->getByte(); | ||
$this->getBlockPosition($this->x, $this->y, $this->z); | ||
$this->dropBook = $this->getBool(); | ||
} | ||
|
||
protected function encodePayload() : void{ | ||
$this->putByte($this->page); | ||
$this->putBlockPosition($this->x, $this->y, $this->z); | ||
$this->putBool($this->dropBook); | ||
} | ||
|
||
public function handle(NetworkSession $session) : bool{ | ||
return $session->handleLecternUpdate($this); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
58 changes: 58 additions & 0 deletions
58
src/pocketmine/network/mcpe/protocol/VideoStreamConnectPacket.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,58 @@ | ||
<?php | ||
|
||
/* | ||
* | ||
* ____ _ _ __ __ _ __ __ ____ | ||
* | _ \ ___ ___| | _____| |_| \/ (_)_ __ ___ | \/ | _ \ | ||
* | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) | | ||
* | __/ (_) | (__| < __/ |_| | | | | | | | __/_____| | | | __/ | ||
* |_| \___/ \___|_|\_\___|\__|_| |_|_|_| |_|\___| |_| |_|_| | ||
* | ||
* This program is free software: you can redistribute it and/or modify | ||
* it under the terms of the GNU Lesser General Public License as published by | ||
* the Free Software Foundation, either version 3 of the License, or | ||
* (at your option) any later version. | ||
* | ||
* @author PocketMine Team | ||
* @link http://www.pocketmine.net/ | ||
* | ||
* | ||
*/ | ||
|
||
declare(strict_types=1); | ||
|
||
namespace pocketmine\network\mcpe\protocol; | ||
|
||
#include <rules/DataPacket.h> | ||
|
||
use pocketmine\network\mcpe\NetworkSession; | ||
|
||
class VideoStreamConnectPacket extends DataPacket/* implements ClientboundPacket*/{ | ||
public const NETWORK_ID = ProtocolInfo::VIDEO_STREAM_CONNECT_PACKET; | ||
|
||
public const ACTION_CONNECT = 0; | ||
public const ACTION_DISCONNECT = 1; | ||
|
||
/** @var string */ | ||
public $serverUri; | ||
/** @var float */ | ||
public $frameSendFrequency; | ||
/** @var int */ | ||
public $action; | ||
|
||
protected function decodePayload() : void{ | ||
$this->serverUri = $this->getString(); | ||
$this->frameSendFrequency = $this->getLFloat(); | ||
$this->action = $this->getByte(); | ||
} | ||
|
||
protected function encodePayload() : void{ | ||
$this->putString($this->serverUri); | ||
$this->putLFloat($this->frameSendFrequency); | ||
$this->putByte($this->action); | ||
} | ||
|
||
public function handle(NetworkSession $session) : bool{ | ||
return $session->handleVideoStreamConnect($this); | ||
} | ||
} |
Oops, something went wrong.