Merge remote-tracking branch 'Revelations/main' into upstream-merge
# Conflicts: # .github/workflows/nightly.yml # CMakeLists.txt # Minecraft.Client/CMakeLists.txt # Minecraft.Client/StringTable.cpp # Minecraft.Server/FourKitNatives.cpp # Minecraft.Server/Windows64/ServerMain.cpp # Minecraft.World/BiomeDecorator.cpp # Minecraft.World/BiomeSource.cpp # Minecraft.World/cmake/sources/Common.cmake # README.md # cmake/ServerTarget.cmake
This commit is contained in:
@@ -1036,7 +1036,7 @@ bool Chunk::isEmpty()
|
||||
void Chunk::setDirty()
|
||||
{
|
||||
// 4J - not used, but if this starts being used again then we'll need to investigate how best to handle it.
|
||||
__debugbreak();
|
||||
DEBUG_BREAK();
|
||||
levelRenderer->setGlobalChunkFlag(x, y, z, level, LevelRenderer::CHUNK_FLAG_DIRTY);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user