Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2026-10-08 22:03:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(master): a rocket launch preps the clone the player is going to

Browse Source 
Launching to a property started an extra clone 0 instance of the zone besides the property's own, because
the prep only carried the zone. PrepZone now carries the clone when there is one (written only then, so a
plain prep is unchanged).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Aaron Kimbrell
2026-09-29 23:11:20 -05:00
parent 1147b61fcb
commit 79d69bf4ac
6 changed files with 30 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
dNet/MasterPackets.cpp
View File

@@ -201,10 +201,13 @@ namespace MasterPackets {
void PrepZone::Serialize(RakNet::BitStream& bitStream) const {
bitStream.Write(zoneID);
if (cloneID != 0) bitStream.Write(cloneID);
}
bool PrepZone::Deserialize(RakNet::BitStream& bitStream) {
VALIDATE_READ(bitStream.Read(zoneID));
cloneID = 0;
if (bitStream.GetNumberOfUnreadBits() >= 32) VALIDATE_READ(bitStream.Read(cloneID));
return true;
}

4
dNet/MasterPackets.h
View File

@@ -190,9 +190,11 @@ namespace MasterPackets {
bool Deserialize(RakNet::BitStream& bitStream) override;
};
// World -> master: start an instance of zoneID now, players are about to ask for it
// World -> master: start an instance of zoneID now, players are about to ask for it. cloneID: the clone they will ask
// for (a property), written only when not 0 so a plain prep stays as it always was
struct PrepZone : public LUBitStream {
int32_t zoneID{};
uint32_t cloneID{};
PrepZone() : LUBitStream(ServiceType::MASTER, MessageType::Master::PREP_ZONE) {}
void Serialize(RakNet::BitStream& bitStream) const override;