Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2026-06-29 10:04:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into web-dashboard-simplier

Browse Source 
# Conflicts:
#	dMasterServer/MasterServer.cpp
This commit is contained in:
Aaron Kimbrell
2026-06-28 01:57:53 -05:00
parent f658da19a3 35337291fa
commit 9e006a0e35
262 changed files with 3943 additions and 2641 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/dCommonTests/AMFDeserializeTests.cpp
View File

@@ -213,7 +213,7 @@ TEST(dCommonTests, AMFDeserializeUnimplementedValuesTest) {
bool caughtException = false;
try {
ReadFromBitStream(testBitStream);
} catch (eAmf unimplementedValueType) {
} catch (std::exception& e) {
caughtException = true;
}