mirror of
https://github.com/pmmp/PocketMine-MP.git
synced 2025-05-14 17:59:41 +00:00
Remove remnants of needACK functionality
this has been broken for a long time and hasn't been used for even longer.
This commit is contained in:
parent
0fecb79add
commit
3cd105ff33
@ -1902,7 +1902,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
|
|||||||
$pk = new PlayStatusPacket();
|
$pk = new PlayStatusPacket();
|
||||||
$pk->status = $status;
|
$pk->status = $status;
|
||||||
$pk->protocol = $this->protocol;
|
$pk->protocol = $this->protocol;
|
||||||
$this->sendDataPacket($pk, false, $immediate);
|
$this->sendDataPacket($pk, $immediate);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function onVerifyCompleted(LoginPacket $packet, ?string $error, bool $signedByMojang) : void{
|
public function onVerifyCompleted(LoginPacket $packet, ?string $error, bool $signedByMojang) : void{
|
||||||
@ -2997,12 +2997,11 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* @param DataPacket $packet
|
* @param DataPacket $packet
|
||||||
* @param bool $needACK
|
|
||||||
* @param bool $immediate
|
* @param bool $immediate
|
||||||
*
|
*
|
||||||
* @return bool|int
|
* @return bool
|
||||||
*/
|
*/
|
||||||
public function sendDataPacket(DataPacket $packet, bool $needACK = false, bool $immediate = false){
|
public function sendDataPacket(DataPacket $packet, bool $immediate = false) : bool{
|
||||||
if(!$this->isConnected()){
|
if(!$this->isConnected()){
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -3017,22 +3016,20 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* @param DataPacket $packet
|
* @param DataPacket $packet
|
||||||
* @param bool $needACK
|
|
||||||
*
|
*
|
||||||
* @return bool|int
|
* @return bool
|
||||||
*/
|
*/
|
||||||
public function dataPacket(DataPacket $packet, bool $needACK = false){
|
public function dataPacket(DataPacket $packet) : bool{
|
||||||
return $this->sendDataPacket($packet, $needACK, false);
|
return $this->sendDataPacket($packet, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param DataPacket $packet
|
* @param DataPacket $packet
|
||||||
* @param bool $needACK
|
|
||||||
*
|
*
|
||||||
* @return bool|int
|
* @return bool
|
||||||
*/
|
*/
|
||||||
public function directDataPacket(DataPacket $packet, bool $needACK = false){
|
public function directDataPacket(DataPacket $packet) : bool{
|
||||||
return $this->sendDataPacket($packet, $needACK, true);
|
return $this->sendDataPacket($packet, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -1893,7 +1893,7 @@ class Server{
|
|||||||
*/
|
*/
|
||||||
public function broadcastPacketsCallback(string $payload, array $players, bool $immediate = false){
|
public function broadcastPacketsCallback(string $payload, array $players, bool $immediate = false){
|
||||||
foreach($players as $i){
|
foreach($players as $i){
|
||||||
$i->getNetworkSession()->getInterface()->putPacket($i, $payload, false, $immediate);
|
$i->getNetworkSession()->getInterface()->putPacket($i, $payload, $immediate);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -43,12 +43,9 @@ interface NetworkInterface{
|
|||||||
*
|
*
|
||||||
* @param Player $player
|
* @param Player $player
|
||||||
* @param string $payload
|
* @param string $payload
|
||||||
* @param bool $needACK
|
|
||||||
* @param bool $immediate
|
* @param bool $immediate
|
||||||
*
|
|
||||||
* @return int|null
|
|
||||||
*/
|
*/
|
||||||
public function putPacket(Player $player, string $payload, bool $needACK = false, bool $immediate = true) : ?int;
|
public function putPacket(Player $player, string $payload, bool $immediate = true) : void;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Terminates the connection
|
* Terminates the connection
|
||||||
|
@ -62,9 +62,6 @@ class RakLibInterface implements ServerInstance, AdvancedNetworkInterface{
|
|||||||
/** @var string[] */
|
/** @var string[] */
|
||||||
private $identifiers = [];
|
private $identifiers = [];
|
||||||
|
|
||||||
/** @var int[] */
|
|
||||||
private $identifiersACK = [];
|
|
||||||
|
|
||||||
/** @var ServerHandler */
|
/** @var ServerHandler */
|
||||||
private $interface;
|
private $interface;
|
||||||
|
|
||||||
@ -111,7 +108,6 @@ class RakLibInterface implements ServerInstance, AdvancedNetworkInterface{
|
|||||||
$player = $this->players[$identifier];
|
$player = $this->players[$identifier];
|
||||||
unset($this->identifiers[spl_object_hash($player)]);
|
unset($this->identifiers[spl_object_hash($player)]);
|
||||||
unset($this->players[$identifier]);
|
unset($this->players[$identifier]);
|
||||||
unset($this->identifiersACK[$identifier]);
|
|
||||||
$player->close($player->getLeaveMessage(), $reason);
|
$player->close($player->getLeaveMessage(), $reason);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -119,7 +115,6 @@ class RakLibInterface implements ServerInstance, AdvancedNetworkInterface{
|
|||||||
public function close(Player $player, string $reason = "unknown reason") : void{
|
public function close(Player $player, string $reason = "unknown reason") : void{
|
||||||
if(isset($this->identifiers[$h = spl_object_hash($player)])){
|
if(isset($this->identifiers[$h = spl_object_hash($player)])){
|
||||||
unset($this->players[$this->identifiers[$h]]);
|
unset($this->players[$this->identifiers[$h]]);
|
||||||
unset($this->identifiersACK[$this->identifiers[$h]]);
|
|
||||||
$this->interface->closeSession($this->identifiers[$h], $reason);
|
$this->interface->closeSession($this->identifiers[$h], $reason);
|
||||||
unset($this->identifiers[$h]);
|
unset($this->identifiers[$h]);
|
||||||
}
|
}
|
||||||
@ -142,7 +137,6 @@ class RakLibInterface implements ServerInstance, AdvancedNetworkInterface{
|
|||||||
|
|
||||||
$player = new $class($this, $ev->getAddress(), $ev->getPort());
|
$player = new $class($this, $ev->getAddress(), $ev->getPort());
|
||||||
$this->players[$identifier] = $player;
|
$this->players[$identifier] = $player;
|
||||||
$this->identifiersACK[$identifier] = 0;
|
|
||||||
$this->identifiers[spl_object_hash($player)] = $identifier;
|
$this->identifiers[spl_object_hash($player)] = $identifier;
|
||||||
$this->server->addPlayer($player);
|
$this->server->addPlayer($player);
|
||||||
}
|
}
|
||||||
@ -214,21 +208,17 @@ class RakLibInterface implements ServerInstance, AdvancedNetworkInterface{
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public function putPacket(Player $player, string $payload, bool $needACK = false, bool $immediate = true) : ?int{
|
public function putPacket(Player $player, string $payload, bool $immediate = true) : void{
|
||||||
if(isset($this->identifiers[$h = spl_object_hash($player)])){
|
if(isset($this->identifiers[$h = spl_object_hash($player)])){
|
||||||
$identifier = $this->identifiers[$h];
|
$identifier = $this->identifiers[$h];
|
||||||
|
|
||||||
$pk = new EncapsulatedPacket();
|
$pk = new EncapsulatedPacket();
|
||||||
$pk->identifierACK = $this->identifiersACK[$identifier]++;
|
|
||||||
$pk->buffer = self::MCPE_RAKNET_PACKET_ID . $payload;
|
$pk->buffer = self::MCPE_RAKNET_PACKET_ID . $payload;
|
||||||
$pk->reliability = PacketReliability::RELIABLE_ORDERED;
|
$pk->reliability = PacketReliability::RELIABLE_ORDERED;
|
||||||
$pk->orderChannel = 0;
|
$pk->orderChannel = 0;
|
||||||
|
|
||||||
$this->interface->sendEncapsulated($identifier, $pk, ($needACK ? RakLib::FLAG_NEED_ACK : 0) | ($immediate ? RakLib::PRIORITY_IMMEDIATE : RakLib::PRIORITY_NORMAL));
|
$this->interface->sendEncapsulated($identifier, $pk, ($immediate ? RakLib::PRIORITY_IMMEDIATE : RakLib::PRIORITY_NORMAL));
|
||||||
return $pk->identifierACK;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public function updatePing(string $identifier, int $pingMS) : void{
|
public function updatePing(string $identifier, int $pingMS) : void{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user