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:
@@ -158,7 +158,7 @@ bool StrongholdFeature::isFeatureChunk(int x, int z,bool bIsSuperflat)
|
||||
#ifndef _CONTENT_PACKAGE
|
||||
if(position->x > 2560 || position->x < -2560 || position->z > 2560 || position->z < -2560)
|
||||
{
|
||||
__debugbreak();
|
||||
DEBUG_BREAK();
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
Reference in New Issue
Block a user