From 6f36fa504b55e50770b8e3d840d89b68d2c605f6 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Thu, 14 Feb 2019 16:52:39 +0000 Subject: [PATCH 1/3] TextFormat: make clean() less confusing, deduplicate some regex --- src/pocketmine/utils/TextFormat.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pocketmine/utils/TextFormat.php b/src/pocketmine/utils/TextFormat.php index 7d5b028ac..6e5f817e9 100644 --- a/src/pocketmine/utils/TextFormat.php +++ b/src/pocketmine/utils/TextFormat.php @@ -88,7 +88,7 @@ abstract class TextFormat{ public static function clean(string $string, bool $removeFormat = true) : string{ $string = mb_scrub($string, 'UTF-8'); if($removeFormat){ - return str_replace(TextFormat::ESCAPE, "", preg_replace(["/" . TextFormat::ESCAPE . "[0-9a-fk-or]/u", "/\x1b[\\(\\][[0-9;\\[\\(]+[Bm]/u"], "", $string)); + $string = str_replace(TextFormat::ESCAPE, "", preg_replace("/" . TextFormat::ESCAPE . "[0-9a-fk-or]/u", "", $string)); } return str_replace("\x1b", "", preg_replace("/\x1b[\\(\\][[0-9;\\[\\(]+[Bm]/u", "", $string)); } From 6b971b17613c0df9fda75a951711034ebd28c10b Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Thu, 14 Feb 2019 16:55:44 +0000 Subject: [PATCH 2/3] Release 3.5.12 --- src/pocketmine/PocketMine.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pocketmine/PocketMine.php b/src/pocketmine/PocketMine.php index 16edabd03..5bc20e05e 100644 --- a/src/pocketmine/PocketMine.php +++ b/src/pocketmine/PocketMine.php @@ -38,7 +38,7 @@ namespace pocketmine { const NAME = "PocketMine-MP"; const BASE_VERSION = "3.5.12"; - const IS_DEVELOPMENT_BUILD = true; + const IS_DEVELOPMENT_BUILD = false; const BUILD_NUMBER = 0; const MIN_PHP_VERSION = "7.2.0"; From 8f486ea65d2096145f1456126c70603b0c66a6c9 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Thu, 14 Feb 2019 17:14:34 +0000 Subject: [PATCH 3/3] 3.5.13 is next --- src/pocketmine/PocketMine.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pocketmine/PocketMine.php b/src/pocketmine/PocketMine.php index 5bc20e05e..0886f9a09 100644 --- a/src/pocketmine/PocketMine.php +++ b/src/pocketmine/PocketMine.php @@ -37,8 +37,8 @@ namespace pocketmine { use pocketmine\wizard\SetupWizard; const NAME = "PocketMine-MP"; - const BASE_VERSION = "3.5.12"; - const IS_DEVELOPMENT_BUILD = false; + const BASE_VERSION = "3.5.13"; + const IS_DEVELOPMENT_BUILD = true; const BUILD_NUMBER = 0; const MIN_PHP_VERSION = "7.2.0";