mirror of
https://github.com/smartcmd/MinecraftConsoles.git
synced 2026-08-20 09:57:09 +00:00
Conflict resolution summary: - .gitignore: kept dedicated-server-specific ignore entries (tmp*/, _server_asset_probe/, server-data/) and also kept main-side entries (*.user, /out). - Minecraft.Client/Common/Network/GameNetworkManager.cpp: kept int64_t seed from main and preserved dedicatedNoLocalHostPlayer logic from dedicated-server. - Minecraft.Client/Windows64/Network/WinsockNetLayer.cpp: preserved dedicated-server shutdown flow and also included main-side cleanup for s_smallIdToSocketLock. |
||
|---|---|---|
| .. | ||
| Sony | ||
| GameNetworkManager.cpp | ||
| GameNetworkManager.h | ||
| NetworkPlayerInterface.h | ||
| PlatformNetworkManagerInterface.h | ||
| PlatformNetworkManagerStub.cpp | ||
| PlatformNetworkManagerStub.h | ||
| SessionInfo.h | ||