From 66b10b8226deef70733e3e53e2153c4b6fe3034b Mon Sep 17 00:00:00 2001 From: Tropical <42101043+tropicaaal@users.noreply.github.com> Date: Mon, 9 Mar 2026 09:52:47 -0500 Subject: [PATCH] fix: remove vibecoded socket initialization fix --- .../Platform/Common/Network/GameNetworkManager.cpp | 10 ---------- Minecraft.Client/meson.build | 2 +- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/Minecraft.Client/Platform/Common/Network/GameNetworkManager.cpp b/Minecraft.Client/Platform/Common/Network/GameNetworkManager.cpp index 7ddede2e7..5fa598f74 100644 --- a/Minecraft.Client/Platform/Common/Network/GameNetworkManager.cpp +++ b/Minecraft.Client/Platform/Common/Network/GameNetworkManager.cpp @@ -213,16 +213,6 @@ bool CGameNetworkManager::StartNetworkGame(Minecraft *minecraft, LPVOID lpParame static __int64 sseed = seed; // Create static version so this will be valid until next call to this function & whilst thread is running - // 4J Fix: Ensure host-local socket streams (s_hostInStream / s_hostOutStream) are always - // created before any Socket or Connection objects are allocated. Socket::Initialise normally - // runs on the server thread, but on certain builds the main thread can reach ClientConnection - // creation before that thread has a chance to execute, leaving the stream arrays NULL. - // Calling Initialise(NULL) here (with the server connection unknown yet) will create the - // stream objects on the very first call; all subsequent calls only reset the queue state. - // The server thread's later Initialise(connection) call will then correctly update - // s_serverConnection without touching the already-allocated stream objects. - Socket::Initialise(NULL); - ServerStoppedCreate(false); if( g_NetworkManager.IsHost() ) { diff --git a/Minecraft.Client/meson.build b/Minecraft.Client/meson.build index 5451c79d3..b362462c8 100644 --- a/Minecraft.Client/meson.build +++ b/Minecraft.Client/meson.build @@ -80,7 +80,7 @@ custom_target('copy_assets_to_client', command : [ python, meson.project_source_root() / 'scripts/copy_assets_to_client.py', meson.project_source_root(), - meson.build_root(), + meson.project_build_root(), meson.current_build_dir(), '@INPUT1@', '@OUTPUT@',