LegacyConsole/GabsPuNs-MinecraftConsoles
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/GabsPuNs-MinecraftConsoles.git synced 2026-07-02 05:24:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "NULL to nullptr"

Browse Source 
This reverts commit 4b4b20a84b.
This commit is contained in:
GabsPuNs
2026-03-21 00:04:26 -04:00
parent 0d0ca31dfc
commit 180b4a117b
69 changed files with 4178 additions and 4176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Minecraft.Server/Windows64/ServerMain.cpp
View File

@@ -183,10 +183,10 @@ using ServerRuntime::WorldBootstrapResult;
static bool ParseIntArg(const char *value, int *outValue)
{
if (value == nullptr || *value == 0)
if (value == NULL || *value == 0)
return false;
char *end = nullptr;
char *end = NULL;
long parsed = strtol(value, &end, 10);
if (end == value || *end != 0)
return false;
@@ -197,10 +197,10 @@ static bool ParseIntArg(const char *value, int *outValue)
static bool ParseInt64Arg(const char *value, __int64 *outValue)
{
if (value == nullptr || *value == 0)
if (value == NULL || *value == 0)
return false;
char *end = nullptr;
char *end = NULL;
__int64 parsed = _strtoi64(value, &end, 10);
if (end == value || *end != 0)
return false;
@@ -277,9 +277,9 @@ static bool ParseCommandLine(int argc, char **argv, DedicatedServerConfig *confi
static void SetExeWorkingDirectory()
{
char exePath[MAX_PATH] = {};
GetModuleFileNameA(nullptr, exePath, MAX_PATH);
GetModuleFileNameA(NULL, exePath, MAX_PATH);
char *slash = strrchr(exePath, '\\');
if (slash != nullptr)
if (slash != NULL)
{
*(slash + 1) = 0;
SetCurrentDirectoryA(exePath);
@@ -288,7 +288,7 @@ static void SetExeWorkingDirectory()
static void ApplyServerPropertiesToDedicatedConfig(const ServerPropertiesConfig &serverProperties, DedicatedServerConfig *config)
{
if (config == nullptr)
if (config == NULL)
{
return;
}
@@ -420,7 +420,7 @@ int main(int argc, char **argv)
#endif
LogStartupStep("registering hidden window class");
HINSTANCE hInstance = GetModuleHandle(nullptr);
HINSTANCE hInstance = GetModuleHandle(NULL);
MyRegisterClass(hInstance);
LogStartupStep("creating hidden window");
@@ -490,7 +490,7 @@ int main(int argc, char **argv)
LogStartupStep("creating Minecraft singleton");
Minecraft::main();
Minecraft *minecraft = Minecraft::GetInstance();
if (minecraft == nullptr)
if (minecraft == NULL)
{
LogError("startup", "Minecraft initialization failed.");
CleanupDevice();
@@ -685,11 +685,11 @@ int main(int argc, char **argv)
LogInfof("shutdown", "Dedicated server stopped");
MinecraftServer *server = MinecraftServer::getInstance();
if (server != nullptr)
if (server != NULL)
{
server->setSaveOnExit(true);
}
if (server != nullptr)
if (server != NULL)
{
LogWorldIO("requesting save before shutdown");
LogWorldIO("using saveOnExit for shutdown");
@@ -699,7 +699,7 @@ int main(int argc, char **argv)
if (g_NetworkManager.ServerStoppedValid())
{
C4JThread waitThread(&WaitForServerStoppedThreadProc, nullptr, "WaitServerStopped");
C4JThread waitThread(&WaitForServerStoppedThreadProc, NULL, "WaitServerStopped");
waitThread.Run();
waitThread.WaitForCompletion(INFINITE);
}