mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-07-12 04:45:12 +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-09 22:51:40 +01:00
commit de6d62aba2
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/pocketmine/Player.php
View File

@ -3340,6 +3340,9 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
$pk = new ModalFormRequestPacket(); $pk = new ModalFormRequestPacket();
$pk->formId = $id; $pk->formId = $id;
$pk->formData = json_encode($form); $pk->formData = json_encode($form);
if($pk->formData === false){
throw new \InvalidArgumentException("Failed to encode form JSON: " . json_last_error_msg());
}
if($this->dataPacket($pk)){ if($this->dataPacket($pk)){
$this->forms[$id] = $form; $this->forms[$id] = $form;
} }

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

@ -79,6 +79,10 @@ class PlayerNetworkSessionAdapter extends NetworkSession{
} }
public function handleDataPacket(DataPacket $packet){ public function handleDataPacket(DataPacket $packet){
if(!$this->player->isConnected()){
return;
}
$timings = Timings::getReceiveDataPacketTimings($packet); $timings = Timings::getReceiveDataPacketTimings($packet);
$timings->startTiming(); $timings->startTiming();