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 'php/7.0' into mcpe-1.2

Browse Source
This commit is contained in:
Dylan K. Taylor
2017-09-01 23:10:58 +01:00
parent 67ad2d25b9 2603f5cc63
commit 5d75d3d5b6
54 changed files with 462 additions and 382 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/pocketmine/network/mcpe/RakLibInterface.php
View File

@ -133,6 +133,8 @@ class RakLibInterface implements ServerInstance, AdvancedSourceInterface{
public function handleEncapsulated($identifier, EncapsulatedPacket $packet, $flags){
if(isset($this->players[$identifier])){
//get this now for blocking in case the player was closed before the exception was raised
$address = $this->players[$identifier]->getAddress();
try{
if($packet->buffer !== ""){
$pk = $this->getPacket($packet->buffer);
@ -143,7 +145,7 @@ class RakLibInterface implements ServerInstance, AdvancedSourceInterface{
$logger->debug("Packet " . (isset($pk) ? get_class($pk) : "unknown") . " 0x" . bin2hex($packet->buffer));
$logger->logException($e);
$this->interface->blockAddress($this->players[$identifier]->getAddress(), 5);
$this->interface->blockAddress($address, 5);
}
}
}

11
src/pocketmine/network/mcpe/protocol/PlaySoundPacket.php
View File

@ -34,11 +34,11 @@ class PlaySoundPacket extends DataPacket{
/** @var string */
public $soundName;
/** @var int */
/** @var float */
public $x;
/** @var int */
/** @var float */
public $y;
/** @var int */
/** @var float */
public $z;
/** @var float */
public $volume;
@ -48,13 +48,16 @@ class PlaySoundPacket extends DataPacket{
protected function decodePayload(){
$this->soundName = $this->getString();
$this->getBlockPosition($this->x, $this->y, $this->z);
$this->x /= 8;
$this->y /= 8;
$this->z /= 8;
$this->volume = $this->getLFloat();
$this->pitch = $this->getLFloat();
}
protected function encodePayload(){
$this->putString($this->soundName);
$this->putBlockPosition($this->x, $this->y, $this->z);
$this->putBlockPosition((int) ($this->x * 8), (int) ($this->y * 8), (int) ($this->z * 8));
$this->putLFloat($this->volume);
$this->putLFloat($this->pitch);
}