mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-05-17 03:08:58 +00:00
Code Issues Projects Releases Wiki Activity

New way to measure Ping

Browse Source
This commit is contained in:
Shoghi Cervantes 2013-06-04 01:12:22 +02:00
parent 03e059a190
commit 566cee2b0b
2 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/API/PlayerAPI.php
View File

@ -157,7 +157,7 @@ class PlayerAPI{
$output .= "Please run this command in-game.\n"; $output .= "Please run this command in-game.\n";
break; break;
} }
$output .= "Lag: ".round($issuer->getLag(), 2)."\n"; $output .= "ping ".round($issuer->getLag(), 2)."ms, packet loss ".round($issuer->getPacketLoss() * 100, 2)."%\n";
break; break;
case "gamemode": case "gamemode":
$player = false; $player = false;

38
src/Player.php
View File

@ -60,7 +60,8 @@ class Player{
public $blocked = true; public $blocked = true;
public $chunksLoaded = array(); public $chunksLoaded = array();
private $chunksOrder = array(); private $chunksOrder = array();
private $lag = array(0, 0); private $lag = array();
private $lagStat = 0;
private $spawnPosition; private $spawnPosition;
private $packetLoss = 0; private $packetLoss = 0;
public $itemEnforcement; public $itemEnforcement;
@ -727,10 +728,8 @@ class Player{
} }
$this->packetLoss = $this->packetStats[1] / max(1, $this->packetStats[0]); $this->packetLoss = $this->packetStats[1] / max(1, $this->packetStats[0]);
$this->packetStats = array(0, 0); $this->packetStats = array(0, 0);
$this->lag[0] = microtime(true) * 1000; $this->lagStat = array_sum($this->lag) / max(1, count($this->lag));
$this->dataPacket(MC_PING, array( $this->lag = array();
"time" => (int) $this->lag[0],
));
$this->sendBuffer(); $this->sendBuffer();
if($this->packetLoss >= PLAYER_MAX_PACKET_LOSS){ if($this->packetLoss >= PLAYER_MAX_PACKET_LOSS){
$this->sendChat("Your connection suffers high packet loss"); $this->sendChat("Your connection suffers high packet loss");
@ -739,7 +738,7 @@ class Player{
} }
public function getLag(){ public function getLag(){
return $this->lag[1] - $this->lag[0]; return $this->lagStat * 1000;
} }
public function getPacketLoss(){ public function getPacketLoss(){
@ -755,6 +754,7 @@ class Player{
if(isset($this->recovery[$count])){ if(isset($this->recovery[$count])){
$this->directDataPacket($this->recovery[$count]["id"], $this->recovery[$count], $this->recovery[$count]["pid"]); $this->directDataPacket($this->recovery[$count]["id"], $this->recovery[$count], $this->recovery[$count]["pid"]);
++$this->packetStats[1]; ++$this->packetStats[1];
$this->lag[] = microtime(true) - $this->recovery[$count]["sendtime"];
unset($this->recovery[$count]); unset($this->recovery[$count]);
} }
} }
@ -763,15 +763,19 @@ class Player{
foreach($data[0] as $count){ foreach($data[0] as $count){
if($count > $this->counter[2]){ if($count > $this->counter[2]){
$this->counter[2] = $count; $this->counter[2] = $count;
}
if(isset($this->recovery[$count])){
$this->lag[] = microtime(true) - $this->recovery[$count]["sendtime"];
unset($this->recovery[$count]);
} }
unset($this->recovery[$count]);
} }
$limit = microtime(true) - 8; //max lag $limit = microtime(true) - 3; //max lag
foreach($this->recovery as $count => $d){ foreach($this->recovery as $count => $d){
$diff = $this->counter[2] - $count; $diff = $this->counter[2] - $count;
if($diff > 16 and $d["sendtime"] < $limit){ if($diff > 16 and $d["sendtime"] < $limit){
$this->directDataPacket($d["id"], $d, $d["pid"]); $this->directDataPacket($d["id"], $d, $d["pid"]);
++$this->packetStats[1]; ++$this->packetStats[1];
$this->lag[] = microtime(true) - $this->recovery[$count]["sendtime"];
unset($this->recovery[$count]); unset($this->recovery[$count]);
} }
} }
@ -826,7 +830,6 @@ class Player{
case 0x01: case 0x01:
break; break;
case MC_PONG: case MC_PONG:
$this->lag[1] = microtime(true) * 1000;
break; break;
case MC_PING: case MC_PING:
$t = (int) (microtime(true) * 1000); $t = (int) (microtime(true) * 1000);
@ -976,7 +979,7 @@ class Player{
$this->evid[] = $this->server->event("player.pickup", array($this, "eventHandler")); $this->evid[] = $this->server->event("player.pickup", array($this, "eventHandler"));
$this->evid[] = $this->server->event("tile.container.slot", array($this, "eventHandler")); $this->evid[] = $this->server->event("tile.container.slot", array($this, "eventHandler"));
$this->evid[] = $this->server->event("tile.update", array($this, "eventHandler")); $this->evid[] = $this->server->event("tile.update", array($this, "eventHandler"));
$this->server->schedule(100, array($this, "measureLag"), array(), true); $this->server->schedule(50, array($this, "measureLag"), array(), true);
console("[INFO] \x1b[33m".$this->username."\x1b[0m[/".$this->ip.":".$this->port."] logged in with entity id ".$this->eid." at (".$this->entity->level->getName().", ".round($this->entity->x, 2).", ".round($this->entity->y, 2).", ".round($this->entity->z, 2).")"); console("[INFO] \x1b[33m".$this->username."\x1b[0m[/".$this->ip.":".$this->port."] logged in with entity id ".$this->eid." at (".$this->entity->level->getName().", ".round($this->entity->x, 2).", ".round($this->entity->y, 2).", ".round($this->entity->z, 2).")");
break; break;
case MC_READY: case MC_READY:
@ -1223,14 +1226,7 @@ class Player{
$this->blocked = false; $this->blocked = false;
$this->server->handle("player.respawn", $this); $this->server->handle("player.respawn", $this);
break; break;
case MC_SET_HEALTH: case MC_SET_HEALTH: //Not used
if($this->spawned === false){
break;
}
if(($this->gamemode & 0x01) === 0x01){
break;
}
//$this->entity->setHealth($data["health"], "client");
break; break;
case MC_ENTITY_EVENT: case MC_ENTITY_EVENT:
if($this->spawned === false){ if($this->spawned === false){
@ -1244,9 +1240,9 @@ class Player{
switch($data["event"]){ switch($data["event"]){
case 9: //Eating case 9: //Eating
$items = array( $items = array(
APPLE => 2, //Apples APPLE => 2,
MUSHROOM_STEW => 10, //Stew MUSHROOM_STEW => 10,
BREAD => 5, //Bread BREAD => 5,
RAW_PORKCHOP => 3, RAW_PORKCHOP => 3,
COOKED_PORKCHOP => 8, COOKED_PORKCHOP => 8,
RAW_BEEF => 3, RAW_BEEF => 3,