* try to resolve merge conflict
* feat: TU19 (Dec 2014) Features & Content (#32)
* December 2014 files
* Working release build
* Fix compilation issues
* Add sound to Windows64Media
* Add DLC content and force Tutorial DLC
* Revert "Add DLC content and force Tutorial DLC"
This reverts commit 97a4399472.
* Disable broken light packing
* Disable breakpoint during DLC texture map load
Allows DLC loading but the DLC textures are still broken
* Fix post build not working
* ...
* fix vs2022 build
* fix cmake build
---------
Co-authored-by: Loki <lokirautio@gmail.com>
51 lines
1.5 KiB
C++
51 lines
1.5 KiB
C++
#pragma once
|
|
class PendingConnection;
|
|
class PlayerConnection;
|
|
class MinecraftServer;
|
|
class Socket;
|
|
class ServerSettingsChangedPacket;
|
|
|
|
using namespace std;
|
|
|
|
class ServerConnection
|
|
{
|
|
// public static Logger logger = Logger.getLogger("Minecraft");
|
|
|
|
private:
|
|
// ServerSocket serverSocket;
|
|
// private Thread listenThread;
|
|
public:
|
|
volatile bool running;
|
|
private:
|
|
int connectionCounter;
|
|
private:
|
|
CRITICAL_SECTION pending_cs; // 4J added
|
|
vector< shared_ptr<PendingConnection> > pending;
|
|
vector< shared_ptr<PlayerConnection> > players;
|
|
|
|
// 4J - When the server requests a texture, it should add it to here while we are waiting for it
|
|
vector<wstring> m_pendingTextureRequests;
|
|
public:
|
|
MinecraftServer *server;
|
|
|
|
public:
|
|
ServerConnection(MinecraftServer *server); // 4J - removed params InetAddress address, int port);
|
|
~ServerConnection();
|
|
void NewIncomingSocket(Socket *socket); // 4J - added
|
|
|
|
void removeSpamProtection(Socket *socket) { }// 4J Stu - Not implemented as not required
|
|
void addPlayerConnection(shared_ptr<PlayerConnection> uc);
|
|
private:
|
|
void handleConnection(shared_ptr<PendingConnection> uc);
|
|
public:
|
|
void stop();
|
|
void tick();
|
|
|
|
// 4J Added
|
|
bool addPendingTextureRequest(const wstring &textureName);
|
|
void handleTextureReceived(const wstring &textureName);
|
|
void handleTextureAndGeometryReceived(const wstring &textureName);
|
|
void handleServerSettingsChanged(shared_ptr<ServerSettingsChangedPacket> packet);
|
|
vector< shared_ptr<PlayerConnection> > *getPlayers();
|
|
};
|