From 4bd682b08e1cc6fd04fbc1e27e4f7e7b20122067 Mon Sep 17 00:00:00 2001 From: GameHerobrine Date: Fri, 12 Aug 2022 20:02:00 +0300 Subject: [PATCH] curl get requests support custom headers now, event to get content of thread output, shutdown function which saves world if server stopped with error --- src/Player.php | 2 +- src/PocketMinecraftServer.php | 23 ++++++++++++++++++----- src/entity/Entity.php | 7 ++++--- src/utils/Utils.php | 22 ++++++++++++++++++---- src/utils/pthreads.php | 5 ++--- 5 files changed, 43 insertions(+), 16 deletions(-) diff --git a/src/Player.php b/src/Player.php index 06492f09..1be56a19 100755 --- a/src/Player.php +++ b/src/Player.php @@ -1754,7 +1754,7 @@ class Player{ $this->entity->isInMinecart = true; $pk = new SetEntityLinkPacket(); $pk->rider = $target->eid; - $pk->riding = 0; + $pk->riding = $this->entity->eid; $pk->type = 2; $this->dataPacket($pk); $needsBreak = true; diff --git a/src/PocketMinecraftServer.php b/src/PocketMinecraftServer.php index f6b0f674..57da7e2e 100644 --- a/src/PocketMinecraftServer.php +++ b/src/PocketMinecraftServer.php @@ -21,15 +21,17 @@ class PocketMinecraftServer{ $this->serverip = $serverip; $this->load(); } - private function load(){ global $dolog; - EntityRegistry::registerEntities(); + $this->version = new VersionString(); /*if(defined("DEBUG") and DEBUG >= 0){ @cli_set_process_title("NostalgiaCore ".MAJOR_VERSION); }*/ console("[INFO] Starting Minecraft PE server on " . ($this->serverip === "0.0.0.0" ? "*" : $this->serverip) . ":" . $this->port); + + EntityRegistry::registerEntities(); + define("BOOTUP_RANDOM", Utils::getRandomBytes(16)); $this->serverID = $this->serverID === false ? Utils::readLong(substr(Utils::getUniqueID(true, $this->serverip . $this->port), 8)) : $this->serverID; $this->seed = $this->seed === false ? Utils::readInt(Utils::getRandomBytes(4, false)) : $this->seed; @@ -95,7 +97,14 @@ class PocketMinecraftServer{ } $dolog = $this->extraprops->get("save-console-data"); } - + public function onShutdown(){ + console("Saving..."); + $save = $this->saveEnabled; + $this->saveEnabled = true; + $this->api->level->saveAll(); + $this->saveEnabled = $save; + console("Shutting Down..."); + } public function startDatabase(){ $this->preparedSQL = new stdClass(); $this->preparedSQL->entity = new stdClass(); @@ -205,7 +214,7 @@ class PocketMinecraftServer{ ], null); } } - + public function asyncOperation($type, array $data, callable $callable = null){ if(defined("NO_THREADS")){ return false; @@ -214,7 +223,10 @@ class PocketMinecraftServer{ $type = (int) $type; switch($type){ case ASYNC_CURL_GET: - $d .= Utils::writeShort(strlen($data["url"])) . $data["url"] . (isset($data["timeout"]) ? Utils::writeShort($data["timeout"]) : Utils::writeShort(10)); + if(isset($data["headers"])){ + $jsstr = json_encode($data["headers"]); + } + $d .= Utils::writeShort(strlen($data["url"])) . $data["url"] . (isset($data["timeout"]) ? Utils::writeShort($data["timeout"]) : Utils::writeShort(10)) . (isset($data["headers"]) ? Utils::writeShort(strlen($jsstr)) . $jsstr : Utils::writeShort(1) . " "); break; case ASYNC_CURL_POST: $d .= Utils::writeShort(strlen($data["url"])) . $data["url"] . (isset($data["timeout"]) ? Utils::writeShort($data["timeout"]) : Utils::writeShort(10)); @@ -286,6 +298,7 @@ class PocketMinecraftServer{ $len = Utils::readInt(substr($this->asyncThread->output, $offset, 4)); $offset += 4; $data["result"] = substr($this->asyncThread->output, $offset, $len); + $this->dhandle("async.curl.get", ["response" => $data["result"]]); $offset += $len; break; } diff --git a/src/entity/Entity.php b/src/entity/Entity.php index b18fb98c..b8cf8aef 100644 --- a/src/entity/Entity.php +++ b/src/entity/Entity.php @@ -541,13 +541,14 @@ class Entity extends Position{ DATA FLAGS IDS 0 - fire 1 - crouching + 2 - riding - no idea why doesnt it work 4 - inAction(ex.: using a bow) */ public function getMetadata(){ $flags = 0; - $flags |= $this->fire > 0 ? 0b1 : 0; - $flags |= ($this->crouched ? 0b1 : 0) << 1; - $flags |= ($this->inAction ? 0b1:0) << 4; + $flags ^= $this->fire > 0 ? 0b1 : 0; + $flags ^= ($this->crouched ? 0b1 : 0) << 1; + $flags ^= ($this->inAction ? 0b1 : 0) << 4; $d = array( 0 => array("type" => 0, "value" => $flags), 1 => array("type" => 1, "value" => $this->air), diff --git a/src/utils/Utils.php b/src/utils/Utils.php index 7c608955..7e07ad39 100644 --- a/src/utils/Utils.php +++ b/src/utils/Utils.php @@ -127,14 +127,28 @@ class Utils{ return Utils::$ip; } - - public static function curl_get($page, $timeout = 10){ + + public static function makeHeaders($json){ + $arr = json_decode($json); + $rarr = []; + foreach ($arr as $key => $value){ + $rarr[] = $key.": ".$value; + } + return $rarr; + } + + public static function curl_get($page, $timeout = 10, $headers = " "){ if(Utils::$online === false){ return false; } - + + if($headers != " "){ + $headers = Utils::makeHeaders($headers); + }else{ + $headers = ["User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:12.0) Gecko/20100101 Firefox/12.0 PocketMine-MP"]; + } $ch = curl_init($page); - curl_setopt($ch, CURLOPT_HTTPHEADER, ["User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:12.0) Gecko/20100101 Firefox/12.0 PocketMine-MP"]); + curl_setopt($ch, CURLOPT_HTTPHEADER, $headers); curl_setopt($ch, CURLOPT_AUTOREFERER, true); curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false); curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2); diff --git a/src/utils/pthreads.php b/src/utils/pthreads.php index 7909765f..688c531d 100644 --- a/src/utils/pthreads.php +++ b/src/utils/pthreads.php @@ -8,7 +8,6 @@ class AsyncMultipleQueue extends Thread{ public $input; public $output; public $stop; - public function __construct(){ $this->input = ""; $this->output = ""; @@ -24,8 +23,8 @@ class AsyncMultipleQueue extends Thread{ case ASYNC_CURL_GET: $url = $this->get(Utils::readShort($this->get(2), false)); $timeout = Utils::readShort($this->get(2)); - - $res = (string) Utils::curl_get($url, $timeout); + $headers = $this->get(Utils::readShort($this->get(2), false)); + $res = (string) Utils::curl_get($url, $timeout, $headers); //$this->lock(); $this->output .= Utils::writeInt($rID) . Utils::writeShort(ASYNC_CURL_GET) . Utils::writeInt(strlen($res)) . $res; //$this->unlock();