From 42d529653347e2ea4ed6949fe43908582c6af9ee Mon Sep 17 00:00:00 2001 From: Shoghi Cervantes Pueyo Date: Thu, 28 Mar 2013 11:20:40 +0100 Subject: [PATCH] Fixed invalid ACK/NACK handling --- src/Player.php | 4 ++-- src/network/Packet.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Player.php b/src/Player.php index b02a0087..2057f7ec 100644 --- a/src/Player.php +++ b/src/Player.php @@ -541,7 +541,7 @@ class Player{ case 0xc0: //ACK $diff = $data[2] - $this->counter[2]; if($diff > 8){ //Packet recovery - $this->directDataPacket($this->recovery[$data[2]]["id"], $this->recovery[$data[2]]); + $this->directDataPacket($this->recovery[$this->counter[2]]["id"], $this->recovery[$this->counter[2]]); } $this->counter[2] = $data[2]; $this->recovery[$data[2]] = null; @@ -550,7 +550,7 @@ class Player{ if(isset($data[3])){ $diff = $data[3] - $this->counter[2]; if($diff > 8){ //Packet recovery - $this->directDataPacket($this->recovery[$data[3]]["id"], $this->recovery[$data[3]]); + $this->directDataPacket($this->recovery[$this->counter[2]]["id"], $this->recovery[$this->counter[2]]); } $this->counter[2] = $data[3]; $this->recovery[$data[3]] = null; diff --git a/src/network/Packet.php b/src/network/Packet.php index dcbada2f..11405e32 100644 --- a/src/network/Packet.php +++ b/src/network/Packet.php @@ -62,7 +62,7 @@ class Packet{ case 0xc0: case 0xa0: if($this->data[1] === false){ - $this->addRaw($this->data[$field]); + $this->addRaw(strrev(Utils::writeTriad($this->data[$field]))); } break; case 0x05: @@ -174,7 +174,7 @@ class Packet{ case 0xc0: case 0xa0: if($this->data[1] === false){ - $this->data[] = $this->get(3); + $this->data[] = Utils::readTriad(strrev($this->get(3))); } break; case 0x05: