Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2024-11-22 05:27:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1265 from DarkflameUniverse/ugc_patch

Browse Source 
fix: Ugc Remove async and second id usage
This commit is contained in:
Gie "Max" Vanommeslaeghe 2023-11-07 19:09:37 +01:00 committed by GitHub
commit 4c10faa852
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 119 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

253
dGame/dGameMessages/GameMessages.cpp
View File

@ -2523,15 +2523,9 @@ void GameMessages::HandleBBBSaveRequest(RakNet::BitStream* inStream, Entity* ent
inStream->Read(sd0Size); inStream->Read(sd0Size);
std::shared_ptr<char[]> sd0Data(new char[sd0Size]); std::shared_ptr<char[]> sd0Data(new char[sd0Size]);
if (sd0Data == nullptr) { if (sd0Data == nullptr) return;
return;
}
for (uint32_t i = 0; i < sd0Size; ++i) { inStream->ReadAlignedBytes(reinterpret_cast<unsigned char*>(sd0Data.get()), sd0Size);
uint8_t c;
inStream->Read(c);
sd0Data[i] = c;
}
uint32_t timeTaken; uint32_t timeTaken;
inStream->Read(timeTaken); inStream->Read(timeTaken);
@ -2565,165 +2559,156 @@ void GameMessages::HandleBBBSaveRequest(RakNet::BitStream* inStream, Entity* ent
//We runs this in async because the http library here is blocking, meaning it'll halt the thread. //We runs this in async because the http library here is blocking, meaning it'll halt the thread.
//But we don't want the server to go unresponsive, because then the client would disconnect. //But we don't want the server to go unresponsive, because then the client would disconnect.
auto returnVal = std::async(std::launch::async, [&]() {
//We need to get a new ID for our model first: //We need to get a new ID for our model first:
ObjectIDManager::Instance()->RequestPersistentID([=](uint32_t newID) { ObjectIDManager::Instance()->RequestPersistentID([=](uint32_t newID) {
LWOOBJID newIDL = newID; LWOOBJID newIDL = newID;
GeneralUtils::SetBit(newIDL, eObjectBits::CHARACTER); GeneralUtils::SetBit(newIDL, eObjectBits::CHARACTER);
GeneralUtils::SetBit(newIDL, eObjectBits::PERSISTENT); GeneralUtils::SetBit(newIDL, eObjectBits::PERSISTENT);
ObjectIDManager::Instance()->RequestPersistentID([=](uint32_t blueprintIDSmall) { uint32_t blueprintIDSmall = ObjectIDManager::Instance()->GenerateRandomObjectID();
blueprintIDSmall = ObjectIDManager::Instance()->GenerateRandomObjectID(); LWOOBJID blueprintID = blueprintIDSmall;
LWOOBJID blueprintID = blueprintIDSmall; GeneralUtils::SetBit(blueprintID, eObjectBits::CHARACTER);
GeneralUtils::SetBit(blueprintID, eObjectBits::CHARACTER); GeneralUtils::SetBit(blueprintID, eObjectBits::PERSISTENT);
GeneralUtils::SetBit(blueprintID, eObjectBits::PERSISTENT);
//We need to get the propertyID: (stolen from Wincent's propertyManagementComp) //We need to get the propertyID: (stolen from Wincent's propertyManagementComp)
const auto& worldId = Game::zoneManager->GetZone()->GetZoneID(); const auto& worldId = Game::zoneManager->GetZone()->GetZoneID();
const auto zoneId = worldId.GetMapID(); const auto zoneId = worldId.GetMapID();
const auto cloneId = worldId.GetCloneID(); const auto cloneId = worldId.GetCloneID();
auto query = CDClientDatabase::CreatePreppedStmt( auto query = CDClientDatabase::CreatePreppedStmt(
"SELECT id FROM PropertyTemplate WHERE mapID = ?;"); "SELECT id FROM PropertyTemplate WHERE mapID = ?;");
query.bind(1, (int)zoneId); query.bind(1, (int)zoneId);
auto result = query.execQuery(); auto result = query.execQuery();
if (result.eof() || result.fieldIsNull(0)) return; if (result.eof() || result.fieldIsNull(0)) return;
int templateId = result.getIntField(0); int templateId = result.getIntField(0);
result.finalize(); auto* propertyLookup = Database::CreatePreppedStmt("SELECT * FROM properties WHERE template_id = ? AND clone_id = ?;");
auto* propertyLookup = Database::CreatePreppedStmt("SELECT * FROM properties WHERE template_id = ? AND clone_id = ?;"); propertyLookup->setInt(1, templateId);
propertyLookup->setInt64(2, cloneId);
propertyLookup->setInt(1, templateId); auto* propertyEntry = propertyLookup->executeQuery();
propertyLookup->setInt64(2, cloneId); uint64_t propertyId = 0;
auto* propertyEntry = propertyLookup->executeQuery(); if (propertyEntry->next()) {
uint64_t propertyId = 0; propertyId = propertyEntry->getUInt64(1);
}
if (propertyEntry->next()) { delete propertyEntry;
propertyId = propertyEntry->getUInt64(1); delete propertyLookup;
}
delete propertyEntry; //Insert into ugc:
delete propertyLookup; auto ugcs = Database::CreatePreppedStmt("INSERT INTO `ugc`(`id`, `account_id`, `character_id`, `is_optimized`, `lxfml`, `bake_ao`, `filename`) VALUES (?,?,?,?,?,?,?)");
ugcs->setUInt(1, blueprintIDSmall);
ugcs->setInt(2, entity->GetParentUser()->GetAccountID());
ugcs->setInt(3, entity->GetCharacter()->GetID());
ugcs->setInt(4, 0);
//Insert into ugc: //whacky stream biz
auto ugcs = Database::CreatePreppedStmt("INSERT INTO `ugc`(`id`, `account_id`, `character_id`, `is_optimized`, `lxfml`, `bake_ao`, `filename`) VALUES (?,?,?,?,?,?,?)"); std::string s(sd0Data.get(), sd0Size);
ugcs->setUInt(1, blueprintIDSmall); std::istringstream iss(s);
ugcs->setInt(2, entity->GetParentUser()->GetAccountID());
ugcs->setInt(3, entity->GetCharacter()->GetID());
ugcs->setInt(4, 0);
//whacky stream biz ugcs->setBlob(5, &iss);
std::string s(sd0Data.get(), sd0Size); ugcs->setBoolean(6, false);
std::istringstream iss(s); ugcs->setString(7, "weedeater.lxfml");
std::istream& stream = iss; ugcs->execute();
delete ugcs;
ugcs->setBlob(5, &iss); //Insert into the db as a BBB model:
ugcs->setBoolean(6, false); auto* stmt = Database::CreatePreppedStmt("INSERT INTO `properties_contents` VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
ugcs->setString(7, "weedeater.lxfml"); stmt->setUInt64(1, newIDL);
ugcs->execute(); stmt->setUInt64(2, propertyId);
delete ugcs; stmt->setUInt(3, blueprintIDSmall);
stmt->setUInt(4, 14); // 14 is the lot the BBB models use
stmt->setDouble(5, 0.0f); // x
stmt->setDouble(6, 0.0f); // y
stmt->setDouble(7, 0.0f); // z
stmt->setDouble(8, 0.0f); // rx
stmt->setDouble(9, 0.0f); // ry
stmt->setDouble(10, 0.0f); // rz
stmt->setDouble(11, 0.0f); // rw
stmt->setString(12, "Objects_14_name"); // Model name. TODO make this customizable
stmt->setString(13, ""); // Model description. TODO implement this.
stmt->setDouble(14, 0); // behavior 1. TODO implement this.
stmt->setDouble(15, 0); // behavior 2. TODO implement this.
stmt->setDouble(16, 0); // behavior 3. TODO implement this.
stmt->setDouble(17, 0); // behavior 4. TODO implement this.
stmt->setDouble(18, 0); // behavior 5. TODO implement this.
stmt->execute();
delete stmt;
//Insert into the db as a BBB model: /*
auto* stmt = Database::CreatePreppedStmt("INSERT INTO `properties_contents` VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"); Commented out until UGC server would be updated to use a sd0 file instead of lxfml stream.
stmt->setUInt64(1, newIDL); (or you uncomment the lxfml decomp stuff above)
stmt->setUInt64(2, propertyId); */
stmt->setUInt(3, blueprintIDSmall);
stmt->setUInt(4, 14); // 14 is the lot the BBB models use
stmt->setDouble(5, 0.0f); // x
stmt->setDouble(6, 0.0f); // y
stmt->setDouble(7, 0.0f); // z
stmt->setDouble(8, 0.0f); // rx
stmt->setDouble(9, 0.0f); // ry
stmt->setDouble(10, 0.0f); // rz
stmt->setDouble(11, 0.0f); // rw
stmt->setString(12, "Objects_14_name"); // Model name. TODO make this customizable
stmt->setString(13, ""); // Model description. TODO implement this.
stmt->setDouble(14, 0); // behavior 1. TODO implement this.
stmt->setDouble(15, 0); // behavior 2. TODO implement this.
stmt->setDouble(16, 0); // behavior 3. TODO implement this.
stmt->setDouble(17, 0); // behavior 4. TODO implement this.
stmt->setDouble(18, 0); // behavior 5. TODO implement this.
stmt->execute();
delete stmt;
/* ////Send off to UGC for processing, if enabled:
Commented out until UGC server would be updated to use a sd0 file instead of lxfml stream. //if (Game::config->GetValue("ugc_remote") == "1") {
(or you uncomment the lxfml decomp stuff above) // std::string ugcIP = Game::config->GetValue("ugc_ip");
*/ // int ugcPort = std::stoi(Game::config->GetValue("ugc_port"));
////Send off to UGC for processing, if enabled: // httplib::Client cli(ugcIP, ugcPort); //connect to UGC HTTP server using our config above ^
//if (Game::config->GetValue("ugc_remote") == "1") {
// std::string ugcIP = Game::config->GetValue("ugc_ip");
// int ugcPort = std::stoi(Game::config->GetValue("ugc_port"));
// httplib::Client cli(ugcIP, ugcPort); //connect to UGC HTTP server using our config above ^ // //Send out a request:
// std::string request = "/3dservices/UGCC150/150" + std::to_string(blueprintID) + ".lxfml";
// cli.Put(request.c_str(), lxfml.c_str(), "text/lxfml");
// //Send out a request: // //When the "put" above returns, it means that the UGC HTTP server is done processing our model &
// std::string request = "/3dservices/UGCC150/150" + std::to_string(blueprintID) + ".lxfml"; // //the nif, hkx and checksum files are ready to be downloaded from cache.
// cli.Put(request.c_str(), lxfml.c_str(), "text/lxfml"); //}
// //When the "put" above returns, it means that the UGC HTTP server is done processing our model & //Tell the client their model is saved: (this causes us to actually pop out of our current state):
// //the nif, hkx and checksum files are ready to be downloaded from cache. CBITSTREAM;
//} BitStreamUtils::WriteHeader(bitStream, eConnectionType::CLIENT, eClientMessageType::BLUEPRINT_SAVE_RESPONSE);
bitStream.Write(localId);
bitStream.Write(eBlueprintSaveResponseType::EverythingWorked);
bitStream.Write<uint32_t>(1);
bitStream.Write(blueprintID);
//Tell the client their model is saved: (this causes us to actually pop out of our current state): bitStream.Write<uint32_t>(sd0Size);
CBITSTREAM;
BitStreamUtils::WriteHeader(bitStream, eConnectionType::CLIENT, eClientMessageType::BLUEPRINT_SAVE_RESPONSE);
bitStream.Write(localId);
bitStream.Write(eBlueprintSaveResponseType::EverythingWorked);
bitStream.Write<uint32_t>(1);
bitStream.Write(blueprintID);
bitStream.Write<uint32_t>(sd0Size); bitStream.WriteAlignedBytes(reinterpret_cast<unsigned char*>(sd0Data.get()), sd0Size);
for (size_t i = 0; i < sd0Size; ++i) { SEND_PACKET;
bitStream.Write(sd0Data[i]);
}
SEND_PACKET; //Now we have to construct this object:
//Now we have to construct this object: EntityInfo info;
info.lot = 14;
info.pos = {};
info.rot = {};
info.spawner = nullptr;
info.spawnerID = entity->GetObjectID();
info.spawnerNodeID = 0;
EntityInfo info; LDFBaseData* ldfBlueprintID = new LDFData<LWOOBJID>(u"blueprintid", blueprintID);
info.lot = 14; LDFBaseData* componentWhitelist = new LDFData<int>(u"componentWhitelist", 1);
info.pos = {}; LDFBaseData* modelType = new LDFData<int>(u"modelType", 2);
info.rot = {}; LDFBaseData* propertyObjectID = new LDFData<bool>(u"propertyObjectID", true);
info.spawner = nullptr; LDFBaseData* userModelID = new LDFData<LWOOBJID>(u"userModelID", newIDL);
info.spawnerID = entity->GetObjectID();
info.spawnerNodeID = 0;
LDFBaseData* ldfBlueprintID = new LDFData<LWOOBJID>(u"blueprintid", blueprintID); info.settings.push_back(ldfBlueprintID);
LDFBaseData* componentWhitelist = new LDFData<int>(u"componentWhitelist", 1); info.settings.push_back(componentWhitelist);
LDFBaseData* modelType = new LDFData<int>(u"modelType", 2); info.settings.push_back(modelType);
LDFBaseData* propertyObjectID = new LDFData<bool>(u"propertyObjectID", true); info.settings.push_back(propertyObjectID);
LDFBaseData* userModelID = new LDFData<LWOOBJID>(u"userModelID", newIDL); info.settings.push_back(userModelID);
info.settings.push_back(ldfBlueprintID); Entity* newEntity = Game::entityManager->CreateEntity(info, nullptr);
info.settings.push_back(componentWhitelist); if (newEntity) {
info.settings.push_back(modelType); Game::entityManager->ConstructEntity(newEntity);
info.settings.push_back(propertyObjectID);
info.settings.push_back(userModelID);
Entity* newEntity = Game::entityManager->CreateEntity(info, nullptr); //Make sure the propMgmt doesn't delete our model after the server dies
if (newEntity) { //Trying to do this after the entity is constructed. Shouldn't really change anything but
Game::entityManager->ConstructEntity(newEntity); //there was an issue with builds not appearing since it was placed above ConstructEntity.
PropertyManagementComponent::Instance()->AddModel(newEntity->GetObjectID(), newIDL);
}
//Make sure the propMgmt doesn't delete our model after the server dies });
//Trying to do this after the entity is constructed. Shouldn't really change anything but
//there was an issue with builds not appearing since it was placed above ConstructEntity.
PropertyManagementComponent::Instance()->AddModel(newEntity->GetObjectID(), newIDL);
}
});
});
});
} }
void GameMessages::HandlePropertyEntranceSync(RakNet::BitStream* inStream, Entity* entity, const SystemAddress& sysAddr) { void GameMessages::HandlePropertyEntranceSync(RakNet::BitStream* inStream, Entity* entity, const SystemAddress& sysAddr) {