Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2026-10-11 07:13:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(capture): read compressed configs and placed models in replica packets

Browse Source 
A compressed construction config is a u32 uncompressed size, a u32 compressed
size and the zlib bytes: the reader took the first size for the second and lost
its place, so live model constructions never read. It now inflates and reads
the entries.

A model's item component isn't made (Entity::Initialize): its model component
writes the item info. The layout left the registry's item component in, so a
premade model's components read one block twice and didn't match. Live writes
the same bits from its item component, so both now read exactly.

Tested with a live placed model's construction and the server's own model.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Aaron Kimbrell
2026-09-30 08:40:03 -05:00
parent 3c8b7c2807
commit e043a8f6b5
2 changed files with 74 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
dGame/dUtilities/ReplicaDecoder.cpp
View File

@@ -11,6 +11,7 @@
#include "GeneralUtils.h"
#include "magic_enum.hpp"
#include "MessageIdentifiers.h"
#include "ZCompression.h"
namespace {
using json = nlohmann::json;
@@ -62,6 +63,9 @@ namespace {
return name.empty() ? json(value) : json(std::string(name) + " (" + std::to_string(value) + ")");
}
// Larger compressed LDF is not inflated (a construction's config is a few hundred bytes)
constexpr uint32_t MAX_LDF_BYTES = 1024 * 1024;
// LDF entries as the client reads them: "key=type:value"
json ReadLdfEntries(Reader& r, int32_t count) {
json out = json::array();
@@ -88,16 +92,26 @@ namespace {
return out;
}
// u32 size, u8 compressed, then the entries (or the compressed bytes, which are shown as their size)
// u32 size, u8 compressed, then the entries; compressed: u32 uncompressed size, u32 compressed size and the zlib
// bytes of the entries (the count, then each entry)
json ReadLdf(Reader& r) {
const auto size = r.Get<uint32_t>();
const auto compressed = r.Get<uint8_t>();
if (compressed) {
const auto compressedSize = r.Get<uint32_t>();
for (uint32_t i = 0; r.ok && i < compressedSize; i++) r.Get<uint8_t>();
return json{ {"compressed", true}, {"size", size}, {"compressedSize", compressedSize} };
}
return ReadLdfEntries(r, r.Get<int32_t>());
if (!compressed) return ReadLdfEntries(r, r.Get<int32_t>());
const auto uncompressedSize = r.Get<uint32_t>();
const auto compressedSize = r.Get<uint32_t>();
std::vector<uint8_t> bytes;
for (uint32_t i = 0; r.ok && i < compressedSize; i++) bytes.push_back(r.Get<uint8_t>());
json shown{ {"compressed", true}, {"size", size}, {"uncompressedSize", uncompressedSize}, {"compressedSize", compressedSize} };
if (!r.ok || uncompressedSize > MAX_LDF_BYTES) return shown;
std::vector<uint8_t> entries(uncompressedSize);
int32_t error{};
const auto read = ZCompression::Decompress(bytes.data(), compressedSize, entries.data(), uncompressedSize, error);
if (read != static_cast<int32_t>(uncompressedSize)) return shown;
RakNet::BitStream inflated(entries.data(), uncompressedSize, false);
Reader inner{ inflated };
auto out = ReadLdfEntries(inner, inner.Get<int32_t>());
return inner.ok ? out : shown;
}
// Activity user info: object ID and 10 values each
@@ -594,6 +608,9 @@ namespace {
if (has.contains(DESTROYABLE)) has.insert(BUFF);
if (has.contains(CHARACTER)) has.insert({ POSSESSOR, LEVEL_PROGRESSION, PLAYER_FORCED_MOVEMENT });
if (has.contains(PET)) has.erase(MODEL);
// A model's item info is written by its model component (live: by its item component, the same bits in the
// same place), so the item component isn't made for it
if (has.contains(MODEL)) has.erase(ITEM);
// Collectibles get one; a quick build without one writes the same empty bits itself in the same place
const bool destroyable = has.contains(DESTROYABLE) || has.contains(COLLECTIBLE) || has.contains(QUICK_BUILD) || extraDestroyable;
eReplicaComponentType slot = MINI_GAME_CONTROL;