mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-30 23:29:54 +00:00
Code Issues Projects Releases Wiki Activity

AsyncTask: remove $serialize parameter from setResult()

Browse Source 
Whether serialization is necessary can be determined automatically based on the type of variable.
This commit is contained in:
Dylan K. Taylor 2018-11-03 16:56:24 +00:00
parent d257d36e55
commit 9caf62778c
4 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pocketmine/level/format/io/ChunkRequestTask.php
View File

@ -60,7 +60,7 @@ class ChunkRequestTask extends AsyncTask{
$batch->setCompressionLevel($this->compressionLevel); $batch->setCompressionLevel($this->compressionLevel);
$batch->encode(); $batch->encode();
$this->setResult($batch->buffer, false); $this->setResult($batch->buffer);
} }
public function onCompletion(Server $server){ public function onCompletion(Server $server){

2
src/pocketmine/network/CompressBatchedTask.php
View File

@ -51,7 +51,7 @@ class CompressBatchedTask extends AsyncTask{
$batch->setCompressionLevel($this->level); $batch->setCompressionLevel($this->level);
$batch->encode(); $batch->encode();
$this->setResult($batch->buffer, false); $this->setResult($batch->buffer);
} }
public function onCompletion(Server $server){ public function onCompletion(Server $server){

6
src/pocketmine/scheduler/AsyncTask.php
View File

@ -107,11 +107,9 @@ abstract class AsyncTask extends Collectable{
/** /**
* @param mixed $result * @param mixed $result
* @param bool $serialize
*/ */
public function setResult($result, bool $serialize = true){ public function setResult($result){
$this->result = $serialize ? serialize($result) : $result; $this->result = ($this->serialized = !is_scalar($result)) ? serialize($result) : $result;
$this->serialized = $serialize;
} }
public function setTaskId(int $taskId){ public function setTaskId(int $taskId){

2
src/pocketmine/updater/UpdateCheckTask.php
View File

@ -59,7 +59,7 @@ class UpdateCheckTask extends AsyncTask{
isset($response["download_url"]) isset($response["download_url"])
){ ){
$response["details_url"] = $response["details_url"] ?? null; $response["details_url"] = $response["details_url"] ?? null;
$this->setResult($response, true); $this->setResult($response);
}elseif(isset($response["error"])){ }elseif(isset($response["error"])){
$this->error = $response["error"]; $this->error = $response["error"];
}else{ }else{