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

Merge commit '0537c66849b307465159306981bad78ba902f30b'

Browse Source 
# Conflicts:
#	resources/vanilla
#	src/scheduler/BulkCurlTask.php
This commit is contained in:
Dylan K. Taylor 2020-01-31 19:47:59 +00:00
commit 9b9b955762
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/scheduler/BulkCurlTask.php
View File

@ -43,6 +43,8 @@ class BulkCurlTask extends AsyncTask{
* $operations accepts an array of arrays. Each member array must contain a string mapped to "page", and optionally, * $operations accepts an array of arrays. Each member array must contain a string mapped to "page", and optionally,
* "timeout", "extraHeaders" and "extraOpts". Documentation of these options are same as those in * "timeout", "extraHeaders" and "extraOpts". Documentation of these options are same as those in
* {@link Utils::simpleCurl}. * {@link Utils::simpleCurl}.
*
* @param mixed[][] $operations
*/ */
public function __construct(array $operations){ public function __construct(array $operations){
$this->operations = serialize($operations); $this->operations = serialize($operations);

3
src/scheduler/SendUsageTask.php
View File

@ -52,6 +52,9 @@ class SendUsageTask extends AsyncTask{
/** @var string */ /** @var string */
public $data; public $data;
/**
* @param string[] $playerList
*/
public function __construct(Server $server, int $type, array $playerList = []){ public function __construct(Server $server, int $type, array $playerList = []){
$endpoint = "http://" . $server->getProperty("anonymous-statistics.host", "stats.pocketmine.net") . "/"; $endpoint = "http://" . $server->getProperty("anonymous-statistics.host", "stats.pocketmine.net") . "/";