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

Merge branch 'release/3.2' into release/3.3

Browse Source
This commit is contained in:
Dylan K. Taylor 2018-10-11 19:42:18 +01:00
commit b261129788
2 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/pocketmine/network/mcpe/protocol/ResourcePackStackPacket.php
View File

@ -42,20 +42,20 @@ class ResourcePackStackPacket extends DataPacket{
public $resourcePackStack = []; public $resourcePackStack = [];
protected function decodePayload(){ protected function decodePayload(){
/*$this->mustAccept = $this->getBool(); $this->mustAccept = $this->getBool();
$behaviorPackCount = $this->getUnsignedVarInt(); $behaviorPackCount = $this->getUnsignedVarInt();
while($behaviorPackCount-- > 0){ while($behaviorPackCount-- > 0){
$packId = $this->getString(); $this->getString();
$version = $this->getString(); $this->getString();
$this->behaviorPackStack[] = new ResourcePackInfoEntry($packId, $version); $this->getString();
} }
$resourcePackCount = $this->getUnsignedVarInt(); $resourcePackCount = $this->getUnsignedVarInt();
while($resourcePackCount-- > 0){ while($resourcePackCount-- > 0){
$packId = $this->getString(); $this->getString();
$version = $this->getString(); $this->getString();
$this->resourcePackStack[] = new ResourcePackInfoEntry($packId, $version); $this->getString();
}*/ }
} }
protected function encodePayload(){ protected function encodePayload(){

22
src/pocketmine/network/mcpe/protocol/ResourcePacksInfoPacket.php
View File

@ -40,24 +40,26 @@ class ResourcePacksInfoPacket extends DataPacket{
public $resourcePackEntries = []; public $resourcePackEntries = [];
protected function decodePayload(){ protected function decodePayload(){
/*$this->mustAccept = $this->getBool(); $this->mustAccept = $this->getBool();
$behaviorPackCount = $this->getLShort(); $behaviorPackCount = $this->getLShort();
while($behaviorPackCount-- > 0){ while($behaviorPackCount-- > 0){
$id = $this->getString(); $this->getString();
$version = $this->getString(); $this->getString();
$size = $this->getLLong(); $this->getLLong();
$this->behaviorPackEntries[] = new ResourcePackInfoEntry($id, $version, $size); $this->getString();
$this->getString();
$this->getString(); $this->getString();
} }
$resourcePackCount = $this->getLShort(); $resourcePackCount = $this->getLShort();
while($resourcePackCount-- > 0){ while($resourcePackCount-- > 0){
$id = $this->getString();
$version = $this->getString();
$size = $this->getLLong();
$this->resourcePackEntries[] = new ResourcePackInfoEntry($id, $version, $size);
$this->getString(); $this->getString();
}*/ $this->getString();
$this->getLLong();
$this->getString();
$this->getString();
$this->getString();
}
} }
protected function encodePayload(){ protected function encodePayload(){