diff --git a/src/pocketmine/command/defaults/TimingsCommand.php b/src/pocketmine/command/defaults/TimingsCommand.php index 98c91b831..50ff20046 100644 --- a/src/pocketmine/command/defaults/TimingsCommand.php +++ b/src/pocketmine/command/defaults/TimingsCommand.php @@ -30,6 +30,7 @@ use pocketmine\Player; use pocketmine\scheduler\BulkCurlTask; use pocketmine\Server; use pocketmine\timings\TimingsHandler; +use pocketmine\utils\InternetException; class TimingsCommand extends VanillaCommand{ @@ -132,7 +133,7 @@ class TimingsCommand extends VanillaCommand{ return; } $result = $this->getResult()[0]; - if($result instanceof \RuntimeException){ + if($result instanceof InternetException){ $sender->getServer()->getLogger()->logException($result); return; } diff --git a/src/pocketmine/scheduler/BulkCurlTask.php b/src/pocketmine/scheduler/BulkCurlTask.php index b181dc33b..51682efcf 100644 --- a/src/pocketmine/scheduler/BulkCurlTask.php +++ b/src/pocketmine/scheduler/BulkCurlTask.php @@ -24,11 +24,12 @@ declare(strict_types=1); namespace pocketmine\scheduler; use pocketmine\utils\Internet; +use pocketmine\utils\InternetException; /** * Executes a consecutive list of cURL operations. * - * The result of this AsyncTask is an array of arrays (returned from {@link Utils::simpleCurl}) or RuntimeException objects. + * The result of this AsyncTask is an array of arrays (returned from {@link Utils::simpleCurl}) or InternetException objects. * * @package pocketmine\scheduler */ @@ -54,7 +55,7 @@ class BulkCurlTask extends AsyncTask{ foreach($operations as $op){ try{ $results[] = Internet::simpleCurl($op["page"], $op["timeout"] ?? 10, $op["extraHeaders"] ?? [], $op["extraOpts"] ?? []); - }catch(\RuntimeException $e){ + }catch(InternetException $e){ $results[] = $e; } } diff --git a/src/pocketmine/utils/Internet.php b/src/pocketmine/utils/Internet.php index 093b3b94f..3f3baf5c3 100644 --- a/src/pocketmine/utils/Internet.php +++ b/src/pocketmine/utils/Internet.php @@ -86,7 +86,7 @@ class Internet{ try{ list($ret, $headers, $httpCode) = self::simpleCurl($page, $timeout, $extraHeaders); return $ret; - }catch(\RuntimeException $ex){ + }catch(InternetException $ex){ $err = $ex->getMessage(); return false; } @@ -113,7 +113,7 @@ class Internet{ CURLOPT_POSTFIELDS => $args ]); return $ret; - }catch(\RuntimeException $ex){ + }catch(InternetException $ex){ $err = $ex->getMessage(); return false; }