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:
@@ -94,7 +94,7 @@ void Enchantment::_init(int id)
|
||||
{
|
||||
app.DebugPrintf("Duplicate enchantment id!");
|
||||
#ifndef _CONTENT_PACKAGE
|
||||
__debugbreak();
|
||||
DEBUG_BREAK();
|
||||
#endif
|
||||
//throw new IllegalArgumentException("Duplicate enchantment id!");
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user