From 75a0627bf231f2e627026aaaeb40d3391adb13c6 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Mon, 31 Dec 2018 22:40:13 +0000 Subject: [PATCH] Network: cut this catch-all bullshit out as well If a network interface crashes, it should take out the whole server, not try to keep on ticking. --- src/pocketmine/network/Network.php | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/src/pocketmine/network/Network.php b/src/pocketmine/network/Network.php index b81cc0826..2f102d519 100644 --- a/src/pocketmine/network/Network.php +++ b/src/pocketmine/network/Network.php @@ -26,7 +26,6 @@ declare(strict_types=1); */ namespace pocketmine\network; -use pocketmine\event\server\NetworkInterfaceCrashEvent; use pocketmine\event\server\NetworkInterfaceRegisterEvent; use pocketmine\event\server\NetworkInterfaceUnregisterEvent; use pocketmine\network\mcpe\protocol\PacketPool; @@ -90,18 +89,7 @@ class Network{ } public function processInterface(SourceInterface $interface) : void{ - try{ - $interface->process(); - }catch(\Throwable $e){ - $logger = $this->server->getLogger(); - $logger->logException($e); - - (new NetworkInterfaceCrashEvent($interface, $e))->call(); - - $interface->emergencyShutdown(); - $this->unregisterInterface($interface); - $logger->critical($this->server->getLanguage()->translateString("pocketmine.server.networkError", [get_class($interface), $e->getMessage()])); - } + $interface->process(); } /**