LegacyConsole/4jcraft
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-05-30 20:05:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: replace NULL with nullptr across C++ codebase

Browse Source 
Excludes vendored C libs (zlib, Miles, DirectXMath, boost, Iggy).
This commit is contained in:
MatthewBeshay
2026-03-30 16:25:52 +11:00
parent a330ecdcbb
commit dfb0e3b03e
752 changed files with 5396 additions and 5396 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
Minecraft.Client/Level/ServerLevel.cpp
View File

@@ -43,7 +43,7 @@
WeighedTreasureArray ServerLevel::RANDOM_BONUS_ITEMS;
C4JThread* ServerLevel::m_updateThread = NULL;
C4JThread* ServerLevel::m_updateThread = nullptr;
C4JThread::EventArray* ServerLevel::m_updateTrigger;
CRITICAL_SECTION ServerLevel::m_updateCS[3];
@@ -63,7 +63,7 @@ void ServerLevel::staticCtor() {
InitializeCriticalSection(&m_updateCS[1]);
InitializeCriticalSection(&m_updateCS[2]);
m_updateThread = new C4JThread(runUpdate, NULL, "Tile update");
m_updateThread = new C4JThread(runUpdate, nullptr, "Tile update");
m_updateThread->SetProcessor(CPU_CORE_TILE_UPDATE);
m_updateThread->Run();
@@ -141,7 +141,7 @@ ServerLevel::ServerLevel(MinecraftServer* server,
// shared_ptr<ScoreboardSaveData> scoreboardSaveData =
// std::dynamic_pointer_cast<ScoreboardSaveData>(
// savedDataStorage->get(typeid(ScoreboardSaveData),
// ScoreboardSaveData::FILE_ID) ); if (scoreboardSaveData == NULL)
// ScoreboardSaveData::FILE_ID) ); if (scoreboardSaveData == nullptr)
//{
// scoreboardSaveData = shared_ptr<ScoreboardSaveData>( new
// ScoreboardSaveData() );
@@ -292,7 +292,7 @@ void ServerLevel::tick() {
{
// app.DebugPrintf("Incremental save\n");
PIXBeginNamedEvent(0, "Incremental save");
save(false, NULL);
save(false, nullptr);
PIXEndNamedEvent();
}
@@ -351,7 +351,7 @@ Biome::MobSpawnerData* ServerLevel::getRandomMobSpawnAt(
MobCategory* mobCategory, int x, int y, int z) {
std::vector<Biome::MobSpawnerData*>* mobList =
getChunkSource()->getMobsAt(mobCategory, x, y, z);
if (mobList == NULL || mobList->empty()) return NULL;
if (mobList == nullptr || mobList->empty()) return nullptr;
return (Biome::MobSpawnerData*)WeighedRandom::getRandomItem(
random, (std::vector<WeighedRandomItem*>*)mobList);
@@ -462,7 +462,7 @@ void ServerLevel::tickTiles() {
int z = m_updateTileZ[iLev][i];
if (hasChunkAt(x, y, z)) {
int id = getTile(x, y, z);
if (Tile::tiles[id] != NULL && Tile::tiles[id]->isTicking()) {
if (Tile::tiles[id] != nullptr && Tile::tiles[id]->isTicking()) {
/*if(id == 2) ++grassTicks;
else if(id == 11) ++lavaTicks;
else ++otherTicks;*/
@@ -759,7 +759,7 @@ void ServerLevel::tick(std::shared_ptr<Entity> e, bool actual) {
e->remove();
}
if (!server->isNpcsEnabled() &&
(std::dynamic_pointer_cast<Npc>(e) != NULL)) {
(std::dynamic_pointer_cast<Npc>(e) != nullptr)) {
e->remove();
}
Level::tick(e, actual);
@@ -838,7 +838,7 @@ void ServerLevel::setInitialSpawn(LevelSettings* levelSettings) {
int minXZ = -(dimension->getXZSize() * 16) / 2;
int maxXZ = (dimension->getXZSize() * 16) / 2 - 1;
if (findBiome != NULL) {
if (findBiome != nullptr) {
xSpawn = findBiome->x;
zSpawn = findBiome->z;
delete findBiome;
@@ -888,7 +888,7 @@ void ServerLevel::generateBonusItemsNearSpawn() {
std::shared_ptr<ChestTileEntity> chest =
std::dynamic_pointer_cast<ChestTileEntity>(
getTileEntity(x, y, z));
if (chest != NULL) {
if (chest != nullptr) {
if (chest->isBonusChest) {
return;
}
@@ -929,7 +929,7 @@ void ServerLevel::save(bool force, ProgressListener* progressListener,
// 4J-PB - check that saves are enabled
if (StorageManager.GetSaveDisabled()) return;
if (progressListener != NULL) {
if (progressListener != nullptr) {
if (bAutosave) {
progressListener->progressStartNoAbort(
IDS_PROGRESS_AUTOSAVING_LEVEL);
@@ -941,7 +941,7 @@ void ServerLevel::save(bool force, ProgressListener* progressListener,
saveLevelData();
PIXEndNamedEvent();
if (progressListener != NULL)
if (progressListener != nullptr)
progressListener->progressStage(IDS_PROGRESS_SAVING_CHUNKS);
{
@@ -967,7 +967,7 @@ void ServerLevel::save(bool force, ProgressListener* progressListener,
// if( force && !isClientSide )
//{
// if (progressListener != NULL)
// if (progressListener != nullptr)
// progressListener->progressStage(IDS_PROGRESS_SAVING_TO_DISC);
// levelStorage->flushSaveFile();
// }
@@ -992,7 +992,7 @@ void ServerLevel::saveToDisc(ProgressListener* progressListener,
}
}
if (progressListener != NULL)
if (progressListener != nullptr)
progressListener->progressStage(IDS_PROGRESS_SAVING_TO_DISC);
levelStorage->flushSaveFile(autosave);
}
@@ -1008,7 +1008,7 @@ void ServerLevel::entityAdded(std::shared_ptr<Entity> e) {
Level::entityAdded(e);
entitiesById[e->entityId] = e;
std::vector<std::shared_ptr<Entity> >* es = e->getSubEntities();
if (es != NULL) {
if (es != nullptr) {
// for (int i = 0; i < es.length; i++)
for (AUTO_VAR(it, es->begin()); it != es->end(); ++it) {
entitiesById.insert(
@@ -1022,7 +1022,7 @@ void ServerLevel::entityRemoved(std::shared_ptr<Entity> e) {
Level::entityRemoved(e);
entitiesById.erase(e->entityId);
std::vector<std::shared_ptr<Entity> >* es = e->getSubEntities();
if (es != NULL) {
if (es != nullptr) {
// for (int i = 0; i < es.length; i++)
for (AUTO_VAR(it, es->begin()); it != es->end(); ++it) {
entitiesById.erase((*it)->entityId);
@@ -1078,14 +1078,14 @@ std::shared_ptr<Explosion> ServerLevel::explode(std::shared_ptr<Entity> source,
bool knockbackOnly = false;
if (sentTo.size()) {
INetworkPlayer* thisPlayer = player->connection->getNetworkPlayer();
if (thisPlayer == NULL) {
if (thisPlayer == nullptr) {
continue;
} else {
for (unsigned int j = 0; j < sentTo.size(); j++) {
std::shared_ptr<ServerPlayer> player2 = sentTo[j];
INetworkPlayer* otherPlayer =
player2->connection->getNetworkPlayer();
if (otherPlayer != NULL &&
if (otherPlayer != nullptr &&
thisPlayer->IsSameSystem(otherPlayer)) {
knockbackOnly = true;
}
@@ -1530,7 +1530,7 @@ int ServerLevel::runUpdate(void* lpParam) {
// 4J Stu - Added shouldTileTick as some tiles won't even do
// anything if they are set to tick and use up one of our
// updates
if (Tile::tiles[id] != NULL &&
if (Tile::tiles[id] != nullptr &&
Tile::tiles[id]->isTicking() &&
Tile::tiles[id]->shouldTileTick(
m_level[iLev], x + (cx * 16), y, z + (cz * 16))) {