1 files changed, 92 insertions, 92 deletions

diff --git a/Minecraft.Client/MinecraftServer.cpp b/Minecraft.Client/MinecraftServer.cpp
index 54be25ff..bdcc9f81 100644
--- a/Minecraft.Client/MinecraftServer.cpp
+++ b/Minecraft.Client/MinecraftServer.cpp
@@ -66,7 +66,7 @@
 #define DEBUG_SERVER_DONT_SPAWN_MOBS 0
 
 //4J Added
-MinecraftServer *MinecraftServer::server = NULL;
+MinecraftServer *MinecraftServer::server = nullptr;
 bool MinecraftServer::setTimeAtEndOfTick = false;
 int64_t MinecraftServer::setTime = 0;
 bool MinecraftServer::setTimeOfDayAtEndOfTick = false;
@@ -97,17 +97,17 @@ static bool ShouldUseDedicatedServerProperties()
 
 static int GetDedicatedServerInt(Settings *settings, const wchar_t *key, int defaultValue)
 {
-	return (ShouldUseDedicatedServerProperties() && settings != NULL) ? settings->getInt(key, defaultValue) : defaultValue;
+	return (ShouldUseDedicatedServerProperties() && settings != nullptr) ? settings->getInt(key, defaultValue) : defaultValue;
 }
 
 static bool GetDedicatedServerBool(Settings *settings, const wchar_t *key, bool defaultValue)
 {
-	return (ShouldUseDedicatedServerProperties() && settings != NULL) ? settings->getBoolean(key, defaultValue) : defaultValue;
+	return (ShouldUseDedicatedServerProperties() && settings != nullptr) ? settings->getBoolean(key, defaultValue) : defaultValue;
 }
 
 static wstring GetDedicatedServerString(Settings *settings, const wchar_t *key, const wstring &defaultValue)
 {
-	return (ShouldUseDedicatedServerProperties() && settings != NULL) ? settings->getString(key, defaultValue) : defaultValue;
+	return (ShouldUseDedicatedServerProperties() && settings != nullptr) ? settings->getString(key, defaultValue) : defaultValue;
 }
 
 static void PrintConsoleLine(const wchar_t *prefix, const wstring &message)
@@ -148,12 +148,12 @@ static wstring JoinConsoleCommandTokens(const vector<wstring> &tokens, size_t st
 
 static shared_ptr<ServerPlayer> FindPlayerByName(PlayerList *playerList, const wstring &name)
 {
-	if (playerList == NULL) return nullptr;
+	if (playerList == nullptr) return nullptr;
 
 	for (size_t i = 0; i < playerList->players.size(); ++i)
 	{
 		shared_ptr<ServerPlayer> player = playerList->players[i];
-		if (player != NULL && equalsIgnoreCase(player->getName(), name))
+		if (player != nullptr && equalsIgnoreCase(player->getName(), name))
 		{
 			return player;
 		}
@@ -166,7 +166,7 @@ static void SetAllLevelTimes(MinecraftServer *server, int value)
 {
 	for (unsigned int i = 0; i < server->levels.length; ++i)
 	{
-		if (server->levels[i] != NULL)
+		if (server->levels[i] != nullptr)
 		{
 			server->levels[i]->setDayTime(value);
 		}
@@ -175,7 +175,7 @@ static void SetAllLevelTimes(MinecraftServer *server, int value)
 
 static bool ExecuteConsoleCommand(MinecraftServer *server, const wstring &rawCommand)
 {
-	if (server == NULL)
+	if (server == nullptr)
 		return false;
 
 	wstring command = trimString(rawCommand);
@@ -209,9 +209,9 @@ static bool ExecuteConsoleCommand(MinecraftServer *server, const wstring &rawCom
 
 	if (action == L"list")
 	{
-		wstring playerNames = (playerList != NULL) ? playerList->getPlayerNames() : L"";
+		wstring playerNames = (playerList != nullptr) ? playerList->getPlayerNames() : L"";
 		if (playerNames.empty()) playerNames = L"(none)";
-		server->info(L"Players (" + std::to_wstring((playerList != NULL) ? playerList->getPlayerCount() : 0) + L"): " + playerNames);
+		server->info(L"Players (" + std::to_wstring((playerList != nullptr) ? playerList->getPlayerCount() : 0) + L"): " + playerNames);
 		return true;
 	}
 
@@ -224,9 +224,9 @@ static bool ExecuteConsoleCommand(MinecraftServer *server, const wstring &rawCom
 		}
 
 		wstring message = L"[Server] " + JoinConsoleCommandTokens(tokens, 1);
-		if (playerList != NULL)
+		if (playerList != nullptr)
 		{
-			playerList->broadcastAll(shared_ptr<ChatPacket>(new ChatPacket(message)));
+			playerList->broadcastAll(std::make_shared<ChatPacket>(message));
 		}
 		server->info(message);
 		return true;
@@ -234,9 +234,9 @@ static bool ExecuteConsoleCommand(MinecraftServer *server, const wstring &rawCom
 
 	if (action == L"save-all")
 	{
-		if (playerList != NULL)
+		if (playerList != nullptr)
 		{
-			playerList->saveAll(NULL, false);
+			playerList->saveAll(nullptr, false);
 		}
 		server->info(L"World saved.");
 		return true;
@@ -267,7 +267,7 @@ static bool ExecuteConsoleCommand(MinecraftServer *server, const wstring &rawCom
 
 			for (unsigned int i = 0; i < server->levels.length; ++i)
 			{
-				if (server->levels[i] != NULL)
+				if (server->levels[i] != nullptr)
 				{
 					server->levels[i]->setDayTime(server->levels[i]->getDayTime() + delta);
 				}
@@ -323,7 +323,7 @@ static bool ExecuteConsoleCommand(MinecraftServer *server, const wstring &rawCom
 			return false;
 		}
 
-		if (server->levels[0] == NULL)
+		if (server->levels[0] == nullptr)
 		{
 			server->warn(L"The overworld is not loaded.");
 			return false;
@@ -370,12 +370,12 @@ static bool ExecuteConsoleCommand(MinecraftServer *server, const wstring &rawCom
 
 		shared_ptr<ServerPlayer> subject = FindPlayerByName(playerList, tokens[1]);
 		shared_ptr<ServerPlayer> destination = FindPlayerByName(playerList, tokens[2]);
-		if (subject == NULL)
+		if (subject == nullptr)
 		{
 			server->warn(L"Unknown player: " + tokens[1]);
 			return false;
 		}
-		if (destination == NULL)
+		if (destination == nullptr)
 		{
 			server->warn(L"Unknown player: " + tokens[2]);
 			return false;
@@ -401,7 +401,7 @@ static bool ExecuteConsoleCommand(MinecraftServer *server, const wstring &rawCom
 		}
 
 		shared_ptr<ServerPlayer> player = FindPlayerByName(playerList, tokens[1]);
-		if (player == NULL)
+		if (player == nullptr)
 		{
 			server->warn(L"Unknown player: " + tokens[1]);
 			return false;
@@ -425,7 +425,7 @@ static bool ExecuteConsoleCommand(MinecraftServer *server, const wstring &rawCom
 			server->warn(L"Invalid aux value: " + tokens[4]);
 			return false;
 		}
-		if (itemId <= 0 || Item::items[itemId] == NULL)
+		if (itemId <= 0 || Item::items[itemId] == nullptr)
 		{
 			server->warn(L"Unknown item id: " + std::to_wstring(itemId));
 			return false;
@@ -438,7 +438,7 @@ static bool ExecuteConsoleCommand(MinecraftServer *server, const wstring &rawCom
 
 		shared_ptr<ItemInstance> itemInstance(new ItemInstance(itemId, amount, aux));
 		shared_ptr<ItemEntity> drop = player->drop(itemInstance);
-		if (drop != NULL)
+		if (drop != nullptr)
 		{
 			drop->throwTime = 0;
 		}
@@ -455,7 +455,7 @@ static bool ExecuteConsoleCommand(MinecraftServer *server, const wstring &rawCom
 		}
 
 		shared_ptr<ServerPlayer> player = FindPlayerByName(playerList, tokens[1]);
-		if (player == NULL)
+		if (player == nullptr)
 		{
 			server->warn(L"Unknown player: " + tokens[1]);
 			return false;
@@ -475,14 +475,14 @@ static bool ExecuteConsoleCommand(MinecraftServer *server, const wstring &rawCom
 		}
 
 		shared_ptr<ItemInstance> selectedItem = player->getSelectedItem();
-		if (selectedItem == NULL)
+		if (selectedItem == nullptr)
 		{
 			server->warn(L"The player is not holding an item.");
 			return false;
 		}
 
 		Enchantment *enchantment = Enchantment::enchantments[enchantmentId];
-		if (enchantment == NULL)
+		if (enchantment == nullptr)
 		{
 			server->warn(L"Unknown enchantment id: " + std::to_wstring(enchantmentId));
 			return false;
@@ -499,12 +499,12 @@ static bool ExecuteConsoleCommand(MinecraftServer *server, const wstring &rawCom
 		if (selectedItem->hasTag())
 		{
 			ListTag<CompoundTag> *enchantmentTags = selectedItem->getEnchantmentTags();
-			if (enchantmentTags != NULL)
+			if (enchantmentTags != nullptr)
 			{
 				for (int i = 0; i < enchantmentTags->size(); i++)
 				{
 					int type = enchantmentTags->get(i)->getShort((wchar_t *)ItemInstance::TAG_ENCH_ID);
-					if (Enchantment::enchantments[type] != NULL && !Enchantment::enchantments[type]->isCompatibleWith(enchantment))
+					if (Enchantment::enchantments[type] != nullptr && !Enchantment::enchantments[type]->isCompatibleWith(enchantment))
 					{
 						server->warn(L"That enchantment conflicts with an existing enchantment on the selected item.");
 						return false;
@@ -527,7 +527,7 @@ static bool ExecuteConsoleCommand(MinecraftServer *server, const wstring &rawCom
 		}
 
 		shared_ptr<ServerPlayer> player = FindPlayerByName(playerList, tokens[1]);
-		if (player == NULL)
+		if (player == nullptr)
 		{
 			server->warn(L"Unknown player: " + tokens[1]);
 			return false;
@@ -545,10 +545,10 @@ static bool ExecuteConsoleCommand(MinecraftServer *server, const wstring &rawCom
 MinecraftServer::MinecraftServer()
 {
 	// 4J - added initialisers
-	connection = NULL;
-	settings = NULL;
-	players = NULL;
-	commands = NULL;
+	connection = nullptr;
+	settings = nullptr;
+	players = nullptr;
+	commands = nullptr;
 	running = true;
 	m_bLoaded = false;
 	stopped = false;
@@ -567,7 +567,7 @@ MinecraftServer::MinecraftServer()
 	m_texturePackId = 0;
 	maxBuildHeight = Level::maxBuildHeight;
 	playerIdleTimeout = 0;
-	m_postUpdateThread = NULL;
+	m_postUpdateThread = nullptr;
 	forceGameType = false;
 
 	commandDispatcher = new ServerCommandDispatcher();
@@ -690,10 +690,10 @@ bool MinecraftServer::initServer(int64_t seed, NetworkGameInitData *initData, DW
 #endif
 
 	// 4J-JEV: Need to wait for levelGenerationOptions to load.
-	while ( app.getLevelGenerationOptions() != NULL && !app.getLevelGenerationOptions()->hasLoadedData() )
+	while ( app.getLevelGenerationOptions() != nullptr && !app.getLevelGenerationOptions()->hasLoadedData() )
 		Sleep(1);
 
-	if ( app.getLevelGenerationOptions() != NULL && !app.getLevelGenerationOptions()->ready() )
+	if ( app.getLevelGenerationOptions() != nullptr && !app.getLevelGenerationOptions()->ready() )
 	{
 		// TODO: Stop loading, add error message.
 	}
@@ -704,7 +704,7 @@ bool MinecraftServer::initServer(int64_t seed, NetworkGameInitData *initData, DW
 		wstring levelTypeString;
 
 	bool gameRuleUseFlatWorld = false;
-	if(app.getLevelGenerationOptions() != NULL)
+	if(app.getLevelGenerationOptions() != nullptr)
 	{
 		gameRuleUseFlatWorld = app.getLevelGenerationOptions()->getuseFlatWorld();
 	}
@@ -718,7 +718,7 @@ bool MinecraftServer::initServer(int64_t seed, NetworkGameInitData *initData, DW
 	}
 
 	LevelType *pLevelType = LevelType::getLevelType(levelTypeString);
-	if (pLevelType == NULL)
+	if (pLevelType == nullptr)
 	{
 		pLevelType = LevelType::lvl_normal;
 	}
@@ -773,7 +773,7 @@ int MinecraftServer::runPostUpdate(void* lpParam)
 {
 	ShutdownManager::HasStarted(ShutdownManager::ePostProcessThread);
 
-	MinecraftServer *server = (MinecraftServer *)lpParam;
+	MinecraftServer *server = static_cast<MinecraftServer *>(lpParam);
 	Entity::useSmallIds();		// This thread can end up spawning entities as resources
 	IntCache::CreateNewThreadStorage();
 	AABB::CreateNewThreadStorage();
@@ -868,7 +868,7 @@ void MinecraftServer::postProcessTerminate(ProgressRenderer *mcprogress)
 		}
 	} while ( status == WAIT_TIMEOUT );
 	delete m_postUpdateThread;
-	m_postUpdateThread = NULL;
+	m_postUpdateThread = nullptr;
 	DeleteCriticalSection(&m_postProcessCS);
 }
 
@@ -894,7 +894,7 @@ bool MinecraftServer::loadLevel(LevelStorageSource *storageSource, const wstring
 	// 4J - temp - load existing level
 	shared_ptr<McRegionLevelStorage> storage = nullptr;
 	bool levelChunksNeedConverted = false;
-	if( initData->saveData != NULL )
+	if( initData->saveData != nullptr )
 	{
 		// We are loading a file from disk with the data passed in
 
@@ -910,7 +910,7 @@ bool MinecraftServer::loadLevel(LevelStorageSource *storageSource, const wstring
 			levelChunksNeedConverted = true;
 		pSave->ConvertToLocalPlatform(); // check if we need to convert this file from PS3->PS4
 
-		storage = shared_ptr<McRegionLevelStorage>(new McRegionLevelStorage(pSave, File(L"."), name, true));
+		storage = std::make_shared<McRegionLevelStorage>(pSave, File(L"."), name, true);
 	}
 	else
 	{
@@ -918,13 +918,13 @@ bool MinecraftServer::loadLevel(LevelStorageSource *storageSource, const wstring
 #ifdef SPLIT_SAVES
 		bool bLevelGenBaseSave = false;
 		LevelGenerationOptions *levelGen = app.getLevelGenerationOptions();
-		if( levelGen != NULL && levelGen->requiresBaseSave())
+		if( levelGen != nullptr && levelGen->requiresBaseSave())
 		{
 			DWORD fileSize = 0;
 			LPVOID pvSaveData = levelGen->getBaseSaveData(fileSize);
 			if(pvSaveData && fileSize != 0) bLevelGenBaseSave = true;
 		}
-		ConsoleSaveFileSplit *newFormatSave = NULL;
+		ConsoleSaveFileSplit *newFormatSave = nullptr;
 		if(bLevelGenBaseSave)
 		{
 			ConsoleSaveFileOriginal oldFormatSave( L"" );
@@ -937,7 +937,7 @@ bool MinecraftServer::loadLevel(LevelStorageSource *storageSource, const wstring
 
 		storage = shared_ptr<McRegionLevelStorage>(new McRegionLevelStorage(newFormatSave, File(L"."), name, true));
 #else
-		storage = shared_ptr<McRegionLevelStorage>(new McRegionLevelStorage(new ConsoleSaveFileOriginal( L"" ), File(L"."), name, true));
+		storage = std::make_shared<McRegionLevelStorage>(new ConsoleSaveFileOriginal(L""), File(L"."), name, true);
 #endif
 	}
 
@@ -958,11 +958,11 @@ bool MinecraftServer::loadLevel(LevelStorageSource *storageSource, const wstring
 		if (i == 0)
 		{
 			levels[i] = new ServerLevel(this, storage, name, dimension, levelSettings);
-			if(app.getLevelGenerationOptions() != NULL)
+			if(app.getLevelGenerationOptions() != nullptr)
 			{
 				LevelGenerationOptions *mapOptions = app.getLevelGenerationOptions();
 				Pos *spawnPos = mapOptions->getSpawnPos();
-				if( spawnPos != NULL )
+				if( spawnPos != nullptr )
 				{
 					levels[i]->setSpawnPos( spawnPos );
 				}
@@ -987,7 +987,7 @@ bool MinecraftServer::loadLevel(LevelStorageSource *storageSource, const wstring
 #endif
 		levels[i]->getLevelData()->setGameType(gameType);
 
-		if(app.getLevelGenerationOptions() != NULL)
+		if(app.getLevelGenerationOptions() != nullptr)
 		{
 			LevelGenerationOptions *mapOptions = app.getLevelGenerationOptions();
 			levels[i]->getLevelData()->setHasBeenInCreative(mapOptions->getLevelHasBeenInCreative() );
@@ -1044,7 +1044,7 @@ bool MinecraftServer::loadLevel(LevelStorageSource *storageSource, const wstring
 		ba_gameRules.length = fe->getFileSize();
 		ba_gameRules.data = new BYTE[ ba_gameRules.length ];
 
-		csf->setFilePointer(fe,0,NULL,FILE_BEGIN);
+		csf->setFilePointer(fe,0,nullptr,FILE_BEGIN);
 		csf->readFile(fe, ba_gameRules.data, ba_gameRules.length, &numberOfBytesRead);
 		assert(numberOfBytesRead == ba_gameRules.length);
 
@@ -1355,7 +1355,7 @@ void MinecraftServer::saveAllChunks()
 		// with the data from the nethers leveldata.
 		// Fix for #7418 - Functional: Gameplay: Saving after sleeping in a bed will place player at nighttime when restarting.
 		ServerLevel *level = levels[levels.length - 1 - i];
-		if( level )	// 4J - added check as level can be NULL if we end up in stopServer really early on due to network failure
+		if( level )	// 4J - added check as level can be nullptr if we end up in stopServer really early on due to network failure
 		{
 			level->save(true, Minecraft::GetInstance()->progressRenderer);
 
@@ -1381,14 +1381,14 @@ void MinecraftServer::saveGameRules()
 #endif
 	{
 		byteArray ba;
-		ba.data = NULL;
+		ba.data = nullptr;
 		app.m_gameRules.saveGameRules( &ba.data, &ba.length );
 
-		if (ba.data != NULL)
+		if (ba.data != nullptr)
 		{
 			ConsoleSaveFile *csf = getLevel(0)->getLevelStorage()->getSaveFile();
 			FileEntry *fe = csf->createFile(ConsoleSavePath(GAME_RULE_SAVENAME));
-			csf->setFilePointer(fe, 0, NULL, FILE_BEGIN);
+			csf->setFilePointer(fe, 0, nullptr, FILE_BEGIN);
 			DWORD length;
 			csf->writeFile(fe, ba.data, ba.length, &length );
 
@@ -1407,14 +1407,14 @@ void MinecraftServer::Suspend()
 	LARGE_INTEGER qwTicksPerSec, qwTime, qwNewTime, qwDeltaTime;
 	float fElapsedTime = 0.0f;
 	QueryPerformanceFrequency( &qwTicksPerSec );
-	float fSecsPerTick = 1.0f / (float)qwTicksPerSec.QuadPart;
+	float fSecsPerTick = 1.0f / static_cast<float>(qwTicksPerSec.QuadPart);
 	// Save the start time
 	QueryPerformanceCounter( &qwTime );
 	if(m_bLoaded && ProfileManager.IsFullVersion() && (!StorageManager.GetSaveDisabled()))
 	{
-		if (players != NULL)
+		if (players != nullptr)
 		{
-			players->saveAll(NULL);
+			players->saveAll(nullptr);
 		}
 		for (unsigned int j = 0; j < levels.length; j++)
 		{
@@ -1428,13 +1428,13 @@ void MinecraftServer::Suspend()
 		if( !s_bServerHalted )
 		{
 			saveGameRules();
-			levels[0]->saveToDisc(NULL, true);
+			levels[0]->saveToDisc(nullptr, true);
 		}
 	}
 	QueryPerformanceCounter( &qwNewTime );
 
 	qwDeltaTime.QuadPart = qwNewTime.QuadPart - qwTime.QuadPart;
-	fElapsedTime = fSecsPerTick * ((FLOAT)(qwDeltaTime.QuadPart));
+	fElapsedTime = fSecsPerTick * static_cast<FLOAT>(qwDeltaTime.QuadPart);
 
 	// 4J-JEV: Flush stats and call PlayerSessionExit.
 	for (int iPad = 0; iPad < XUSER_MAX_COUNT; iPad++)
@@ -1487,7 +1487,7 @@ void MinecraftServer::stopServer(bool didInit)
 		// if trial version or saving is disabled, then don't save anything. Also don't save anything if we didn't actually get through the server initialisation.
 		if(m_saveOnExit && ProfileManager.IsFullVersion() && (!StorageManager.GetSaveDisabled()) && didInit)
 		{
-			if (players != NULL)
+			if (players != nullptr)
 			{
 				players->saveAll(Minecraft::GetInstance()->progressRenderer, true);
 			}
@@ -1497,7 +1497,7 @@ void MinecraftServer::stopServer(bool didInit)
 			//for (unsigned int i = levels.length - 1; i >= 0; i--)
 			//{
 			//	ServerLevel *level = levels[i];
-			//	if (level != NULL)
+			//	if (level != nullptr)
 			//	{
 			saveAllChunks();
 			//	}
@@ -1505,7 +1505,7 @@ void MinecraftServer::stopServer(bool didInit)
 
 			saveGameRules();
 			app.m_gameRules.unloadCurrentGameRules();
-			if( levels[0] != NULL )		// This can be null if stopServer happens very quickly due to network error
+			if( levels[0] != nullptr )		// This can be null if stopServer happens very quickly due to network error
 			{
 				levels[0]->saveToDisc(Minecraft::GetInstance()->progressRenderer, false);
 			}
@@ -1528,10 +1528,10 @@ void MinecraftServer::stopServer(bool didInit)
 	unsigned int iServerLevelC=levels.length;
 	for (unsigned int i = 0; i < iServerLevelC; i++)
 	{
-		if(levels[i]!=NULL)
+		if(levels[i]!=nullptr)
 		{
 			delete levels[i];
-			levels[i] = NULL;
+			levels[i] = nullptr;
 		}
 	}
 
@@ -1541,11 +1541,11 @@ void MinecraftServer::stopServer(bool didInit)
 #endif
 
 	delete connection;
-	connection = NULL;
+	connection = nullptr;
 	delete players;
-	players = NULL;
+	players = nullptr;
 	delete settings;
-	settings = NULL;
+	settings = nullptr;
 
 	g_NetworkManager.ServerStopped();
 }
@@ -1703,12 +1703,12 @@ void MinecraftServer::setPlayerIdleTimeout(int playerIdleTimeout)
 extern int c0a, c0b, c1a, c1b, c1c, c2a, c2b;
 void MinecraftServer::run(int64_t seed, void *lpParameter)
 {
-	NetworkGameInitData *initData = NULL;
+	NetworkGameInitData *initData = nullptr;
 	DWORD initSettings = 0;
 	bool findSeed = false;
-	if(lpParameter != NULL)
+	if(lpParameter != nullptr)
 	{
-		initData = (NetworkGameInitData *)lpParameter;
+		initData = static_cast<NetworkGameInitData *>(lpParameter);
 		initSettings = app.GetGameHostOption(eGameHostOption_All);
 		findSeed = initData->findSeed;
 		m_texturePackId = initData->texturePackId;
@@ -1849,9 +1849,9 @@ void MinecraftServer::run(int64_t seed, void *lpParameter)
 						// Save the start time
 						QueryPerformanceCounter( &qwTime );
 
-						if (players != NULL)
+						if (players != nullptr)
 						{
-							players->saveAll(NULL);
+							players->saveAll(nullptr);
 						}
 
 						for (unsigned int j = 0; j < levels.length; j++)
@@ -1862,7 +1862,7 @@ void MinecraftServer::run(int64_t seed, void *lpParameter)
 							// Fix for #7418 - Functional: Gameplay: Saving after sleeping in a bed will place player at nighttime when restarting.
 							ServerLevel *level = levels[levels.length - 1 - j];
 							PIXBeginNamedEvent(0, "Saving level %d",levels.length - 1 - j);
-							level->save(false, NULL, true);
+							level->save(false, nullptr, true);
 							PIXEndNamedEvent();
 						}
 						if( !s_bServerHalted )
@@ -1886,12 +1886,12 @@ void MinecraftServer::run(int64_t seed, void *lpParameter)
 #endif
 				case eXuiServerAction_SaveGame:
 					app.EnterSaveNotificationSection();
-					if (players != NULL)
+					if (players != nullptr)
 					{
 						players->saveAll(Minecraft::GetInstance()->progressRenderer);
 					}
 
-					players->broadcastAll( shared_ptr<UpdateProgressPacket>( new UpdateProgressPacket(20) ) );
+					players->broadcastAll(std::make_shared<UpdateProgressPacket>(20));
 
 					for (unsigned int j = 0; j < levels.length; j++)
 					{
@@ -1902,7 +1902,7 @@ void MinecraftServer::run(int64_t seed, void *lpParameter)
 						ServerLevel *level = levels[levels.length - 1 - j];
 						level->save(true, Minecraft::GetInstance()->progressRenderer, (eAction==eXuiServerAction_AutoSaveGame));
 
-						players->broadcastAll( shared_ptr<UpdateProgressPacket>( new UpdateProgressPacket(33 + (j*33) ) ) );
+						players->broadcastAll(std::make_shared<UpdateProgressPacket>(33 + (j * 33)));
 					}
 					if( !s_bServerHalted )
 					{
@@ -1917,13 +1917,13 @@ void MinecraftServer::run(int64_t seed, void *lpParameter)
 					{
 						shared_ptr<ServerPlayer> player = players->players.at(0);
 						size_t id = (size_t) param;
-						player->drop( shared_ptr<ItemInstance>( new ItemInstance(id, 1, 0 ) ) );
+						player->drop(std::make_shared<ItemInstance>(id, 1, 0));
 					}
 					break;
 				case eXuiServerAction_SpawnMob:
 					{
 						shared_ptr<ServerPlayer> player = players->players.at(0);
-						eINSTANCEOF factory = (eINSTANCEOF)((size_t)param);
+						eINSTANCEOF factory = static_cast<eINSTANCEOF>((size_t)param);
 						shared_ptr<Mob> mob = dynamic_pointer_cast<Mob>(EntityIO::newByEnumType(factory,player->level ));
 						mob->moveTo(player->x+1, player->y, player->z+1, player->level->random->nextFloat() * 360, 0);
 						mob->setDespawnProtected();		// 4J added, default to being protected against despawning (has to be done after initial position is set)
@@ -1952,14 +1952,14 @@ void MinecraftServer::run(int64_t seed, void *lpParameter)
 					}
 					break;
 				case eXuiServerAction_ServerSettingChanged_Gamertags:
-					players->broadcastAll( shared_ptr<ServerSettingsChangedPacket>( new ServerSettingsChangedPacket( ServerSettingsChangedPacket::HOST_OPTIONS, app.GetGameHostOption(eGameHostOption_Gamertags)) ) );
+					players->broadcastAll(std::make_shared<ServerSettingsChangedPacket>(ServerSettingsChangedPacket::HOST_OPTIONS, app.GetGameHostOption(eGameHostOption_Gamertags)));
 					break;
 				case eXuiServerAction_ServerSettingChanged_BedrockFog:
-					players->broadcastAll( shared_ptr<ServerSettingsChangedPacket>( new ServerSettingsChangedPacket( ServerSettingsChangedPacket::HOST_IN_GAME_SETTINGS, app.GetGameHostOption(eGameHostOption_All)) ) );
+					players->broadcastAll(std::make_shared<ServerSettingsChangedPacket>(ServerSettingsChangedPacket::HOST_IN_GAME_SETTINGS, app.GetGameHostOption(eGameHostOption_All)));
 					break;
 
 				case eXuiServerAction_ServerSettingChanged_Difficulty:
-					players->broadcastAll( shared_ptr<ServerSettingsChangedPacket>( new ServerSettingsChangedPacket( ServerSettingsChangedPacket::HOST_DIFFICULTY, Minecraft::GetInstance()->options->difficulty) ) );
+					players->broadcastAll(std::make_shared<ServerSettingsChangedPacket>(ServerSettingsChangedPacket::HOST_DIFFICULTY, Minecraft::GetInstance()->options->difficulty));
 					break;
 				case eXuiServerAction_ExportSchematic:
 #ifndef _CONTENT_PACKAGE
@@ -1969,7 +1969,7 @@ void MinecraftServer::run(int64_t seed, void *lpParameter)
 
 					if( !s_bServerHalted )
 					{
-						ConsoleSchematicFile::XboxSchematicInitParam *initData = (ConsoleSchematicFile::XboxSchematicInitParam *)param;
+						ConsoleSchematicFile::XboxSchematicInitParam *initData = static_cast<ConsoleSchematicFile::XboxSchematicInitParam *>(param);
 #ifdef _XBOX
 						File targetFileDir(File::pathRoot + File::pathSeparator + L"Schematics");
 #else
@@ -1995,7 +1995,7 @@ void MinecraftServer::run(int64_t seed, void *lpParameter)
 				case eXuiServerAction_SetCameraLocation:
 #ifndef _CONTENT_PACKAGE
 					{
-						DebugSetCameraPosition *pos = (DebugSetCameraPosition *)param;
+						DebugSetCameraPosition *pos = static_cast<DebugSetCameraPosition *>(param);
 
 						app.DebugPrintf(	"DEBUG: Player=%i\n", pos->player );
 						app.DebugPrintf(	"DEBUG: Teleporting to pos=(%f.2, %f.2, %f.2), looking at=(%f.2,%f.2)\n",
@@ -2060,14 +2060,14 @@ void MinecraftServer::run(int64_t seed, void *lpParameter)
 
 void MinecraftServer::broadcastStartSavingPacket()
 {
-	players->broadcastAll( shared_ptr<GameEventPacket>( new GameEventPacket(GameEventPacket::START_SAVING, 0) ) );;
+	players->broadcastAll(std::make_shared<GameEventPacket>(GameEventPacket::START_SAVING, 0));;
 }
 
 void MinecraftServer::broadcastStopSavingPacket()
 {
 	if( !s_bServerHalted )
 	{
-		players->broadcastAll( shared_ptr<GameEventPacket>( new GameEventPacket(GameEventPacket::STOP_SAVING, 0) ) );;
+		players->broadcastAll(std::make_shared<GameEventPacket>(GameEventPacket::STOP_SAVING, 0));;
 	}
 }
 
@@ -2122,13 +2122,13 @@ void MinecraftServer::tick()
 
 			if (tickCount % 20 == 0)
 			{
-				players->broadcastAll( shared_ptr<SetTimePacket>( new SetTimePacket(level->getGameTime(), level->getDayTime(), level->getGameRules()->getBoolean(GameRules::RULE_DAYLIGHT) ) ), level->dimension->id);
+				players->broadcastAll(std::make_shared<SetTimePacket>(level->getGameTime(), level->getDayTime(), level->getGameRules()->getBoolean(GameRules::RULE_DAYLIGHT)), level->dimension->id);
 			}
 			// #ifndef __PS3__
 			static int64_t stc = 0;
 			int64_t st0 = System::currentTimeMillis();
 			PIXBeginNamedEvent(0,"Level tick %d",i);
-			((Level *)level)->tick();
+			static_cast<Level *>(level)->tick();
 			int64_t st1 = System::currentTimeMillis();
 			PIXEndNamedEvent();
 			PIXBeginNamedEvent(0,"Update lights %d",i);
@@ -2182,7 +2182,7 @@ void MinecraftServer::tick()
 
 	// 4J - removed
 #if 0
-	for (int i = 0; i < tickables.size(); i++) {
+	for (size_t i = 0; i < tickables.size(); i++) {
 		tickables.get(i)-tick();
 	}
 #endif
@@ -2224,14 +2224,14 @@ void MinecraftServer::main(int64_t seed, void *lpParameter)
 	server = new MinecraftServer();
 	server->run(seed, lpParameter);
 	delete server;
-	server = NULL;
+	server = nullptr;
 	ShutdownManager::HasFinished(ShutdownManager::eServerThread );
 }
 
 void MinecraftServer::HaltServer(bool bPrimaryPlayerSignedOut)
 {
 	s_bServerHalted = true;
-	if( server != NULL )
+	if( server != nullptr )
 	{
 		m_bPrimaryPlayerSignedOut=bPrimaryPlayerSignedOut;
 		server->halt();
@@ -2277,9 +2277,9 @@ void MinecraftServer::setLevel(int dimension, ServerLevel *level)
 bool MinecraftServer::chunkPacketManagement_CanSendTo(INetworkPlayer *player)
 {
 	if( s_hasSentEnoughPackets ) return false;
-	if( player == NULL ) return false;
+	if( player == nullptr ) return false;
 
-	for( int i = 0; i < s_sentTo.size(); i++ )
+	for( size_t i = 0; i < s_sentTo.size(); i++ )
 	{
 		if( s_sentTo[i]->IsSameSystem(player) )
 		{
@@ -2361,7 +2361,7 @@ void MinecraftServer::chunkPacketManagement_PostTick()
 // not GetSessionIndex() (smallId), so reused smallIds after many connect/disconnects still get chunk sends.
 bool MinecraftServer::chunkPacketManagement_CanSendTo(INetworkPlayer *player)
 {
-	if( player == NULL ) return false;
+	if( player == nullptr ) return false;
 
 	int time = GetTickCount();
 	DWORD currentPlayerCount = g_NetworkManager.GetPlayerCount();
@@ -2407,7 +2407,7 @@ void MinecraftServer::cycleSlowQueueIndex()
 	if( !g_NetworkManager.IsInSession() ) return;
 
 	int startingIndex = s_slowQueuePlayerIndex;
-	INetworkPlayer *currentPlayer = NULL;
+	INetworkPlayer *currentPlayer = nullptr;
 	DWORD currentPlayerCount = 0;
 	do
 	{
@@ -2429,7 +2429,7 @@ void MinecraftServer::cycleSlowQueueIndex()
 	} while ( g_NetworkManager.IsInSession() &&
 		currentPlayerCount > 0 &&
 		s_slowQueuePlayerIndex != startingIndex &&
-		currentPlayer != NULL &&
+		currentPlayer != nullptr &&
 		currentPlayer->IsLocal()
 		);
 //	app.DebugPrintf("Cycled slow queue index to %d\n", s_slowQueuePlayerIndex);