From cade15e2dd6eed9da62363750a0149d045b717a4 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Sun, 24 Jun 2018 16:34:19 +0100 Subject: [PATCH 1/3] disable dev flag for release --- 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 9db840ee1..8d3bb65a0 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.0.3"; - const IS_DEVELOPMENT_BUILD = true; + const IS_DEVELOPMENT_BUILD = false; const BUILD_NUMBER = 0; const MIN_PHP_VERSION = "7.2.0"; From 8dae497610a26d2ac3a8e789abdb25420e3271cb Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Sun, 24 Jun 2018 17:32:33 +0100 Subject: [PATCH 2/3] back to dev --- 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 8d3bb65a0..b424b53ac 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.0.3"; - const IS_DEVELOPMENT_BUILD = false; + const BASE_VERSION = "3.0.4"; + const IS_DEVELOPMENT_BUILD = true; const BUILD_NUMBER = 0; const MIN_PHP_VERSION = "7.2.0"; From 6b2250cbcee22fcc8ae6db9c30037b8bf19b2d4b Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Sun, 24 Jun 2018 17:31:18 +0100 Subject: [PATCH 3/3] RCONInstance: terminate session on ECONNRESET errors --- src/pocketmine/network/rcon/RCONInstance.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/pocketmine/network/rcon/RCONInstance.php b/src/pocketmine/network/rcon/RCONInstance.php index 56a780edd..570fda9f9 100644 --- a/src/pocketmine/network/rcon/RCONInstance.php +++ b/src/pocketmine/network/rcon/RCONInstance.php @@ -84,6 +84,9 @@ class RCONInstance extends Thread{ if($this->stop){ return false; }elseif($d === false){ + if(socket_last_error($client) === SOCKET_ECONNRESET){ //client crashed, terminate connection + return false; + } return null; }elseif($d === "" or strlen($d) < 4){ return false;