aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.Client/MinecraftServer.h
diff options
context:
space:
mode:
Diffstat (limited to 'Minecraft.Client/MinecraftServer.h')
-rw-r--r--Minecraft.Client/MinecraftServer.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/Minecraft.Client/MinecraftServer.h b/Minecraft.Client/MinecraftServer.h
index 28909791..a33888bc 100644
--- a/Minecraft.Client/MinecraftServer.h
+++ b/Minecraft.Client/MinecraftServer.h
@@ -52,9 +52,9 @@ typedef struct _NetworkGameInitData
_NetworkGameInitData()
{
seed = 0;
- saveData = NULL;
+ saveData = nullptr;
settings = 0;
- levelGen = NULL;
+ levelGen = nullptr;
texturePackId = 0;
findSeed = false;
xzSize = LEVEL_LEGACY_WIDTH;
@@ -236,8 +236,7 @@ private:
public:
void addPostProcessRequest(ChunkSource *chunkSource, int x, int z);
-public:
- static PlayerList *getPlayerList() { if( server != NULL ) return server->players; else return NULL; }
+ static PlayerList *getPlayerList() { if( server != nullptr) return server->players; else return nullptr; }
static void SetTimeOfDay(int64_t time) { setTimeOfDayAtEndOfTick = true; setTimeOfDay = time; }
static void SetTime(int64_t time) { setTimeAtEndOfTick = true; setTime = time; }