mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-05-11 16:29:40 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'release/3.5'

Browse Source
This commit is contained in:
Dylan K. Taylor 2019-01-01 14:08:20 +00:00
commit c6a32ccf2a
5 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pocketmine/Server.php
View File

@ -2529,9 +2529,7 @@ class Server{
$this->logger->debug("Unhandled raw packet from $address $port: " . bin2hex($payload)); $this->logger->debug("Unhandled raw packet from $address $port: " . bin2hex($payload));
} }
}catch(\Throwable $e){ }catch(\Throwable $e){
if(\pocketmine\DEBUG > 1){ $this->logger->logException($e);
$this->logger->logException($e);
}
$this->getNetwork()->blockAddress($address, 600); $this->getNetwork()->blockAddress($address, 600);
} }

3
src/pocketmine/event/server/NetworkInterfaceCrashEvent.php
View File

@ -26,7 +26,8 @@ namespace pocketmine\event\server;
use pocketmine\network\NetworkInterface; use pocketmine\network\NetworkInterface;
/** /**
* Called when a network interface crashes, with relevant crash information. * Never called. Should never have come into this world. Nothing to see here.
* @deprecated
*/ */
class NetworkInterfaceCrashEvent extends NetworkInterfaceEvent{ class NetworkInterfaceCrashEvent extends NetworkInterfaceEvent{
/** /**

16
src/pocketmine/network/Network.php
View File

@ -26,7 +26,6 @@ declare(strict_types=1);
*/ */
namespace pocketmine\network; namespace pocketmine\network;
use pocketmine\event\server\NetworkInterfaceCrashEvent;
use pocketmine\event\server\NetworkInterfaceRegisterEvent; use pocketmine\event\server\NetworkInterfaceRegisterEvent;
use pocketmine\event\server\NetworkInterfaceUnregisterEvent; use pocketmine\event\server\NetworkInterfaceUnregisterEvent;
use pocketmine\network\mcpe\NetworkSession; use pocketmine\network\mcpe\NetworkSession;
@ -86,20 +85,7 @@ class Network{
public function tick() : void{ public function tick() : void{
foreach($this->interfaces as $interface){ foreach($this->interfaces as $interface){
try{ $interface->tick();
$interface->tick();
}catch(\Exception $e){
$logger = $this->server->getLogger();
if(\pocketmine\DEBUG > 1){
$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()]));
}
} }
foreach($this->updateSessions as $k => $session){ foreach($this->updateSessions as $k => $session){

1
src/pocketmine/network/NetworkInterface.php
View File

@ -71,6 +71,7 @@ interface NetworkInterface{
public function shutdown() : void; public function shutdown() : void;
/** /**
* @deprecated
* Shuts down the network interface in an emergency situation, such as due to a crash. * Shuts down the network interface in an emergency situation, such as due to a crash.
*/ */
public function emergencyShutdown() : void; public function emergencyShutdown() : void;

1
src/pocketmine/network/mcpe/RakLibInterface.php
View File

@ -84,7 +84,6 @@ class RakLibInterface implements ServerInstance, AdvancedNetworkInterface{
public function start() : void{ public function start() : void{
$this->server->getTickSleeper()->addNotifier($this->sleeper, function() : void{ $this->server->getTickSleeper()->addNotifier($this->sleeper, function() : void{
//this should not throw any exception. If it does, this should crash the server since it's a fault condition.
while($this->interface->handlePacket()); while($this->interface->handlePacket());
}); });
$this->rakLib->start(PTHREADS_INHERIT_CONSTANTS); //HACK: MainLogger needs constants for exception logging $this->rakLib->start(PTHREADS_INHERIT_CONSTANTS); //HACK: MainLogger needs constants for exception logging