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

NetworkSession: tidy up common disconnection logic

Browse Source
This commit is contained in:
Dylan K. Taylor 2022-12-24 20:36:18 +00:00
parent 80832ff763
commit b1c0eae1f6
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/network/mcpe/NetworkSession.php
View File

@ -544,6 +544,8 @@ class NetworkSession{
$this->disconnectGuard = true; $this->disconnectGuard = true;
$func(); $func();
$this->disconnectGuard = false; $this->disconnectGuard = false;
$this->flushSendBuffer(true);
$this->sender->close("");
foreach($this->disposeHooks as $callback){ foreach($this->disposeHooks as $callback){
$callback(); $callback();
} }
@ -567,10 +569,12 @@ class NetworkSession{
*/ */
public function disconnect(string $reason, bool $notify = true) : void{ public function disconnect(string $reason, bool $notify = true) : void{
$this->tryDisconnect(function() use ($reason, $notify) : void{ $this->tryDisconnect(function() use ($reason, $notify) : void{
if($notify){
$this->sendDataPacket(DisconnectPacket::create($reason));
}
if($this->player !== null){ if($this->player !== null){
$this->player->onPostDisconnect($reason, null); $this->player->onPostDisconnect($reason, null);
} }
$this->doServerDisconnect($reason, $notify);
}, $reason); }, $reason);
} }
@ -583,7 +587,6 @@ class NetworkSession{
if($this->player !== null){ if($this->player !== null){
$this->player->onPostDisconnect($reason, null); $this->player->onPostDisconnect($reason, null);
} }
$this->doServerDisconnect($reason, false);
}, $reason); }, $reason);
} }
@ -592,21 +595,10 @@ class NetworkSession{
*/ */
public function onPlayerDestroyed(string $reason) : void{ public function onPlayerDestroyed(string $reason) : void{
$this->tryDisconnect(function() use ($reason) : void{ $this->tryDisconnect(function() use ($reason) : void{
$this->doServerDisconnect($reason, true); $this->sendDataPacket(DisconnectPacket::create($reason));
}, $reason); }, $reason);
} }
/**
* Internal helper function used to handle server disconnections.
*/
private function doServerDisconnect(string $reason, bool $notify = true) : void{
if($notify){
$this->sendDataPacket(DisconnectPacket::create($reason !== "" ? $reason : null), true);
}
$this->sender->close($notify ? $reason : "");
}
/** /**
* Called by the network interface to close the session when the client disconnects without server input, for * Called by the network interface to close the session when the client disconnects without server input, for
* example in a timeout condition or voluntary client disconnect. * example in a timeout condition or voluntary client disconnect.