mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-07-13 21:35:21 +00:00
Code Issues Projects Releases Wiki Activity

Added exception handling to Player->close(), mitigates #1060 and #1101

Browse Source
This commit is contained in:
Dylan K. Taylor 2017-06-19 13:37:38 +01:00
parent bc10edfdd3
commit a724395148
1 changed files with 73 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/pocketmine/Player.php
View File

@ -3645,6 +3645,7 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade
*/ */
final public function close($message = "", $reason = "generic reason", $notify = true){ final public function close($message = "", $reason = "generic reason", $notify = true){
if($this->connected and !$this->closed){ if($this->connected and !$this->closed){
try{
if($notify and strlen((string) $reason) > 0){ if($notify and strlen((string) $reason) > 0){
$pk = new DisconnectPacket(); $pk = new DisconnectPacket();
$pk->message = $reason; $pk->message = $reason;
@ -3657,7 +3658,12 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade
$this->server->getPluginManager()->unsubscribeFromPermission(Server::BROADCAST_CHANNEL_ADMINISTRATIVE, $this); $this->server->getPluginManager()->unsubscribeFromPermission(Server::BROADCAST_CHANNEL_ADMINISTRATIVE, $this);
if($this->joined){ if($this->joined){
try{
$this->save(); $this->save();
}catch(\Throwable $e){
$this->server->getLogger()->critical("Failed to save player data for " . $this->getName());
$this->server->getLogger()->logException($e);
}
$this->server->getPluginManager()->callEvent($ev = new PlayerQuitEvent($this, $message)); $this->server->getPluginManager()->callEvent($ev = new PlayerQuitEvent($this, $message));
if($ev->getQuitMessage() != ""){ if($ev->getQuitMessage() != ""){
@ -3697,9 +3703,6 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade
$this->interface->close($this, $notify ? $reason : ""); $this->interface->close($this, $notify ? $reason : "");
if($this->loggedIn){
$this->server->removeOnlinePlayer($this);
}
$this->loggedIn = false; $this->loggedIn = false;
$this->server->getLogger()->info($this->getServer()->getLanguage()->translateString("pocketmine.player.logOut", [ $this->server->getLogger()->info($this->getServer()->getLanguage()->translateString("pocketmine.player.logOut", [
@ -3721,9 +3724,14 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade
$this->currentTransaction = null; $this->currentTransaction = null;
} }
}catch(\Throwable $e){
$this->server->getLogger()->logException($e);
}finally{
$this->server->removeOnlinePlayer($this);
$this->server->removePlayer($this); $this->server->removePlayer($this);
} }
} }
}
public function __debugInfo(){ public function __debugInfo(){
return []; return [];