mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-06 09:56:06 +00:00
Code Issues Projects Releases Wiki Activity

Fixed random timeout #11

Browse Source
This commit is contained in:
Shoghi Cervantes Pueyo
2012-12-21 20:44:53 +01:00
parent 0ed130e7fd
commit 3e54ceb8a3
5 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
classes/PocketMinecraftServer.class.php
View File

@ -298,7 +298,6 @@ class PocketMinecraftServer extends stdClass{
$this->loadEvents();
declare(ticks=15);
register_tick_function(array($this, "tick"));
$this->event("onTick", "tickerFunction", true);
register_shutdown_function(array($this, "close"));
console("[INFO] Server started!");
$this->process();
@ -309,6 +308,7 @@ class PocketMinecraftServer extends stdClass{
if($this->lastTick <= ($time - 0.05)){
$this->tickMeasure[] = $this->lastTick = $time;
array_shift($this->tickMeasure);
$this->tickerFunction($time);
$this->trigger("onTick", $time);
}
}

9
classes/Session.class.php
View File

@ -52,7 +52,10 @@ class Session{
$this->counter = array(0, 0);
}
public function onTick($time){
public function onTick($time, $event){
if($event !== "onTick"){
return;
}
if($time > $this->timeout){
$this->close("timeout");
}else{
@ -169,7 +172,7 @@ class Session{
}
}
public function handle($pid, &$data){
public function handle($pid, $data){
if($this->connected === true){
$this->timeout = microtime(true) + 25;
switch($pid){
@ -397,7 +400,7 @@ class Session{
$this->buffer[$count] = array($id, $data);
}
$data["id"] = $id;
$this->send(0x84, array(
$this->send(0x80, array(
$count,
0x00,
$data,