Merge branch 'main' into pr/win64-world-saves

# Conflicts:
#	Minecraft.Client/MinecraftServer.cpp
#	README.md

1 files changed, 19 insertions, 18 deletions

diff --git a/Minecraft.Client/PendingConnection.h b/Minecraft.Client/PendingConnection.h
index 02d706f9..e8a493b0 100644
--- a/Minecraft.Client/PendingConnection.h
+++ b/Minecraft.Client/PendingConnection.h
@@ -11,10 +11,10 @@ class PendingConnection : public PacketListener
 {
 private:
 	static const int FAKE_LAG = 0;
-    static const int MAX_TICKS_BEFORE_LOGIN = 20 * 30;
+	static const int MAX_TICKS_BEFORE_LOGIN = 20 * 30;
 
-//    public static Logger logger = Logger.getLogger("Minecraft");
-    static Random *random;
+	//    public static Logger logger = Logger.getLogger("Minecraft");
+	static Random *random;
 
 public:
 	Connection *connection;
@@ -22,26 +22,27 @@ public:
 	bool done;
 private:
 	MinecraftServer *server;
-    int _tick;
-    wstring name;
-    shared_ptr<LoginPacket> acceptedLogin;
-    wstring loginKey;
+	int _tick;
+	wstring name;
+	shared_ptr<LoginPacket> acceptedLogin;
+	wstring loginKey;
 
 public:
-    PendingConnection(MinecraftServer *server, Socket *socket, const wstring& id);
+	PendingConnection(MinecraftServer *server, Socket *socket, const wstring& id);
 	~PendingConnection();
-    void tick();
-    void disconnect(DisconnectPacket::eDisconnectReason reason);
-    virtual void handlePreLogin(shared_ptr<PreLoginPacket> packet);
-    virtual void handleLogin(shared_ptr<LoginPacket> packet);
-    virtual void handleAcceptedLogin(shared_ptr<LoginPacket> packet);
-    virtual void onDisconnect(DisconnectPacket::eDisconnectReason reason, void *reasonObjects);
+	void tick();
+	void disconnect(DisconnectPacket::eDisconnectReason reason);
+	virtual void handlePreLogin(shared_ptr<PreLoginPacket> packet);
+	virtual void handleLogin(shared_ptr<LoginPacket> packet);
+	virtual void handleAcceptedLogin(shared_ptr<LoginPacket> packet);
+	virtual void onDisconnect(DisconnectPacket::eDisconnectReason reason, void *reasonObjects);
 	virtual void handleGetInfo(shared_ptr<GetInfoPacket> packet);
 	virtual void handleKeepAlive(shared_ptr<KeepAlivePacket> packet);
-    virtual void onUnhandledPacket(shared_ptr<Packet> packet);
-    void send(shared_ptr<Packet> packet);
-    wstring getName();
-    virtual bool isServerPacketListener();
+	virtual void onUnhandledPacket(shared_ptr<Packet> packet);
+	void send(shared_ptr<Packet> packet);
+	wstring getName();
+	virtual bool isServerPacketListener();
+	virtual bool isDisconnected();
 
 private:
 	void sendPreLoginResponse();