Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2025-11-03 22:21:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Even more proper handling...

Browse Source
This commit is contained in:
EmosewaMC
2022-09-07 01:39:54 -07:00
parent 96d3af3fcc
commit 9f156d59e1
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
dCommon/BrickByBrickFix.cpp
View File

@@ -15,6 +15,7 @@
std::unique_ptr<sql::ResultSet> GetModelsFromDatabase(); std::unique_ptr<sql::ResultSet> GetModelsFromDatabase();
void WriteSd0Magic(char* input, uint32_t chunkSize); void WriteSd0Magic(char* input, uint32_t chunkSize);
bool CheckSd0Magic(sql::Blob* streamToCheck);
/** /**
* @brief Truncates all models with broken data from the database. * @brief Truncates all models with broken data from the database.
@@ -36,9 +37,7 @@ uint32_t BrickByBrickFix::TruncateBrokenBrickByBrickXml() {
std::unique_ptr<sql::Blob> modelAsSd0(modelsToTruncate->getBlob(2)); std::unique_ptr<sql::Blob> modelAsSd0(modelsToTruncate->getBlob(2));
Game::logger->Log("BrickByBrickFix", "Checking brick-by-brick model %llu", modelId); Game::logger->Log("BrickByBrickFix", "Checking brick-by-brick model %llu", modelId);
// Check that header is sd0 by checking for the sd0 magic. // Check that header is sd0 by checking for the sd0 magic.
if ( if (CheckSd0Magic(modelAsSd0.get())) {
modelAsSd0->get() == 's' && modelAsSd0->get() == 'd' && modelAsSd0->get() == '0' &&
modelAsSd0->get() == 0x01 && modelAsSd0->get() == 0xFF) {
while (true) { while (true) {
uint32_t chunkSize{}; uint32_t chunkSize{};
modelAsSd0->read(reinterpret_cast<char*>(&chunkSize), sizeof(uint32_t)); // Extract chunk size from istream modelAsSd0->read(reinterpret_cast<char*>(&chunkSize), sizeof(uint32_t)); // Extract chunk size from istream
@@ -78,6 +77,7 @@ uint32_t BrickByBrickFix::TruncateBrokenBrickByBrickXml() {
if (document->Parse(completeUncompressedModel.c_str(), completeUncompressedModel.size()) == tinyxml2::XML_SUCCESS) { if (document->Parse(completeUncompressedModel.c_str(), completeUncompressedModel.size()) == tinyxml2::XML_SUCCESS) {
Game::logger->Log("BrickByBrickFix", "Model %llu is a valid brick-by-brick model!", modelId); Game::logger->Log("BrickByBrickFix", "Model %llu is a valid brick-by-brick model!", modelId);
} else { } else {
// Change this to just look for </LXFML> near the end of the function. Should rely on human interference for this...
Game::logger->Log( Game::logger->Log(
"BrickByBrickFix", "Potentially invalid lxfml found. Last 15 characters are ||%s||." "BrickByBrickFix", "Potentially invalid lxfml found. Last 15 characters are ||%s||."
"If the string between the bars does not end in </LXFML> then press y and enter.", "If the string between the bars does not end in </LXFML> then press y and enter.",
@@ -186,3 +186,7 @@ void WriteSd0Magic(char* input, uint32_t chunkSize) {
input[4] = 0xFF; input[4] = 0xFF;
*reinterpret_cast<uint32_t*>(input + 5) = chunkSize; // Write the integer to the character array *reinterpret_cast<uint32_t*>(input + 5) = chunkSize; // Write the integer to the character array
} }
bool CheckSd0Magic(sql::Blob* streamToCheck) {
return streamToCheck->get() == 's' && streamToCheck->get() == 'd' && streamToCheck->get() == '0' && streamToCheck->get() == 0x01 && streamToCheck->get() == 0xFF;
}