From 13f4f3285fb129e1d416f39ed6da8b5a07eabca2 Mon Sep 17 00:00:00 2001
From: Shoghi Cervantes Pueyo <shoghicp@gmail.com>
Date: Sat, 12 Jan 2013 10:05:27 +0100
Subject: [PATCH] Re-fixed #45 and other bugs

---
 src/API/PlayerAPI.php        | 5 +++--
 src/classes/Player.class.php | 1 -
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/API/PlayerAPI.php b/src/API/PlayerAPI.php
index 885ad600a..7496c5f2b 100644
--- a/src/API/PlayerAPI.php
+++ b/src/API/PlayerAPI.php
@@ -202,11 +202,12 @@ class PlayerAPI{
 	public function remove($CID){
 		if(isset($this->server->clients[$CID])){
 			$player = $this->server->clients[$CID];
-			unset($this->server->clients[$player->CID]);
+			unset($this->server->clients[$CID]);
+			$player->close();
 			$this->saveOffline($player->username, $player->data);
 			$this->server->query("DELETE FROM players WHERE name = '".$player->username."';");
-			unset($player);
 			$this->server->api->entity->remove($player->eid);
+			unset($player);
 		}
 	}
 
diff --git a/src/classes/Player.class.php b/src/classes/Player.class.php
index e63d8c571..ff5760e1d 100644
--- a/src/classes/Player.class.php
+++ b/src/classes/Player.class.php
@@ -250,7 +250,6 @@ class Player{
 
 							break;
 						case MC_DISCONNECT:
-							$this->connected = false;
 							$this->close("client disconnect");
 							break;
 						case MC_CLIENT_CONNECT: