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

Heap of bugfixes, cleanup and PHP 7 upgrades

Browse Source
This commit is contained in:
Dylan K. Taylor
2017-07-13 19:18:56 +01:00
parent c2a7c2c6cd
commit 2a7b736f18
49 changed files with 114 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/pocketmine/network/mcpe/CachedEncapsulatedPacket.php
View File

@ -30,6 +30,6 @@ class CachedEncapsulatedPacket extends EncapsulatedPacket{
private $internalData = null;
public function toBinary($internal = false){
return $this->internalData === null ? ($this->internalData = parent::toBinary($internal)) : $this->internalData;
return $this->internalData ?? ($this->internalData = parent::toBinary($internal));
}
}

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

@ -85,7 +85,7 @@ class BatchPacket extends DataPacket{
return false;
}
if(strlen($str) === 0){
if($str === ""){
throw new \InvalidStateException("Decoded BatchPacket payload is empty");
}

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

@ -94,8 +94,7 @@ class LoginPacket extends DataPacket{
}
public function decodeToken($token){
$tokens = explode(".", $token);
list($headB64, $payloadB64, $sigB64) = $tokens;
list($headB64, $payloadB64, $sigB64) = explode(".", $token);
return json_decode(base64_decode($payloadB64), true);
}

4
src/pocketmine/network/mcpe/protocol/UpdateBlockPacket.php
View File

@ -37,8 +37,8 @@ class UpdateBlockPacket extends DataPacket{
const FLAG_NOGRAPHIC = 0b0100;
const FLAG_PRIORITY = 0b1000;
const FLAG_ALL = (self::FLAG_NEIGHBORS | self::FLAG_NETWORK);
const FLAG_ALL_PRIORITY = (self::FLAG_ALL | self::FLAG_PRIORITY);
const FLAG_ALL = self::FLAG_NEIGHBORS | self::FLAG_NETWORK;
const FLAG_ALL_PRIORITY = self::FLAG_ALL | self::FLAG_PRIORITY;
public $x;
public $z;