mirror of
https://github.com/pmmp/PocketMine-MP.git
synced 2025-05-16 02:38:54 +00:00
Moved network check out of level, added server killer for long stops
This commit is contained in:
parent
a53b041984
commit
6e69e15dfd
@ -67,6 +67,7 @@ namespace {
|
|||||||
namespace pocketmine {
|
namespace pocketmine {
|
||||||
use pocketmine\utils\Binary;
|
use pocketmine\utils\Binary;
|
||||||
use pocketmine\utils\MainLogger;
|
use pocketmine\utils\MainLogger;
|
||||||
|
use pocketmine\utils\ServerKiller;
|
||||||
use pocketmine\utils\Terminal;
|
use pocketmine\utils\Terminal;
|
||||||
use pocketmine\utils\Utils;
|
use pocketmine\utils\Utils;
|
||||||
use pocketmine\wizard\Installer;
|
use pocketmine\wizard\Installer;
|
||||||
@ -469,6 +470,10 @@ namespace pocketmine {
|
|||||||
$thread->quit();
|
$thread->quit();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$killer = new ServerKiller();
|
||||||
|
$killer->start();
|
||||||
|
$killer->detach();
|
||||||
|
|
||||||
$logger->shutdown();
|
$logger->shutdown();
|
||||||
$logger->join();
|
$logger->join();
|
||||||
|
|
||||||
|
@ -2479,6 +2479,10 @@ class Server{
|
|||||||
|
|
||||||
$this->checkTickUpdates($this->tickCounter, $tickTime);
|
$this->checkTickUpdates($this->tickCounter, $tickTime);
|
||||||
|
|
||||||
|
foreach($this->players as $player){
|
||||||
|
$player->checkNetwork();
|
||||||
|
}
|
||||||
|
|
||||||
if(($this->tickCounter & 0b1111) === 0){
|
if(($this->tickCounter & 0b1111) === 0){
|
||||||
$this->titleTick();
|
$this->titleTick();
|
||||||
$this->maxTick = 20;
|
$this->maxTick = 20;
|
||||||
|
@ -662,10 +662,6 @@ class Level implements ChunkManager, Metadatable{
|
|||||||
Timings::$tickEntityTimer->stopTiming();
|
Timings::$tickEntityTimer->stopTiming();
|
||||||
$this->timings->entityTick->stopTiming();
|
$this->timings->entityTick->stopTiming();
|
||||||
|
|
||||||
foreach($this->players as $player){
|
|
||||||
$player->checkNetwork();
|
|
||||||
}
|
|
||||||
|
|
||||||
$this->timings->tileEntityTick->startTiming();
|
$this->timings->tileEntityTick->startTiming();
|
||||||
Timings::$tickTileEntityTimer->startTiming();
|
Timings::$tickTileEntityTimer->startTiming();
|
||||||
//Update tiles that need update
|
//Update tiles that need update
|
||||||
|
33
src/pocketmine/utils/ServerKiller.php
Normal file
33
src/pocketmine/utils/ServerKiller.php
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
/*
|
||||||
|
*
|
||||||
|
* ____ _ _ __ __ _ __ __ ____
|
||||||
|
* | _ \ ___ ___| | _____| |_| \/ (_)_ __ ___ | \/ | _ \
|
||||||
|
* | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
|
||||||
|
* | __/ (_) | (__| < __/ |_| | | | | | | | __/_____| | | | __/
|
||||||
|
* |_| \___/ \___|_|\_\___|\__|_| |_|_|_| |_|\___| |_| |_|_|
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Lesser General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* @author PocketMine Team
|
||||||
|
* @link http://www.pocketmine.net/
|
||||||
|
*
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace pocketmine\utils;
|
||||||
|
|
||||||
|
use pocketmine\Thread;
|
||||||
|
|
||||||
|
class ServerKiller extends Thread{
|
||||||
|
|
||||||
|
public function run(){
|
||||||
|
sleep(15);
|
||||||
|
echo "\nTook to long to stop, server was killed forcefully!\n";
|
||||||
|
@\pocketmine\kill(getmypid());
|
||||||
|
}
|
||||||
|
}
|
Loading…
x
Reference in New Issue
Block a user