mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-10-19 04:15:04 +00:00
Code Issues Projects Releases Wiki Activity

New ACK/NACK structure & Packet multiple ressend issue

Browse Source
This commit is contained in:
Shoghi Cervantes Pueyo
2013-03-28 13:56:11 +01:00
parent c68b4ebda6
commit f1a28f23ae
3 changed files with 29 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/Player.php
View File

@@ -529,46 +529,26 @@ class Player{
$this->timeout = microtime(true) + 20;
switch($pid){
case 0xa0: //NACK
if(isset($this->recovery[$data[2]])){
$this->directDataPacket($this->recovery[$data[2]]["id"], $this->recovery[$data[2]], $data[2]);
}
if(isset($data[3])){
if(isset($this->recovery[$data[3]])){
$this->directDataPacket($this->recovery[$data[3]]["id"], $this->recovery[$data[3]], $data[3]);
foreach($data[0] as $count){
if(isset($this->recovery[$count])){
$this->directDataPacket($this->recovery[$count]["id"], $this->recovery[$count], $count);
}
}
break;
case 0xc0: //ACK
/*$diff = $data[2] - $this->counter[2];
if($diff > 8){ //Packet recovery
$this->directDataPacket($this->recovery[$this->counter[2]]["id"], $this->recovery[$this->counter[2]]);
}*/
if($data[2] > $this->counter[2]){
$this->counter[2] = $data[2];
}
$this->recovery[$data[2]] = null;
unset($this->recovery[$data[2]]);
if(isset($data[3])){
/*$diff = $data[3] - $this->counter[2];
if($diff > 8){ //Packet recovery
$this->directDataPacket($this->recovery[$this->counter[2]]["id"], $this->recovery[$this->counter[2]]);
}*/
if($data[3] > $this->counter[2]){
$this->counter[2] = $data[3];
foreach($data[0] as $count){
if($count > $this->counter[2]){
$this->counter[2] = $count;
}
$this->recovery[$data[3]] = null;
unset($this->recovery[$data[3]]);
$this->recovery[$count] = null;
unset($this->recovery[$count]);
}
$cnt = 0;
$limit = microtime(true) - 0.5; //max lag
$limit = microtime(true) - 1; //max lag
foreach($this->recovery as $count => $d){
$diff = $this->counter[2] - $count;
if($diff > 16 and $cnt < 16 and $d["sendtime"] < $limit){
if($diff > 16 and $d["sendtime"] < $limit){
++$cnt;
$this->directDataPacket($d["id"], $d, $count);
}else{
break;
}
}
break;