mirror of
https://github.com/DarkflameUniverse/DarkflameServer.git
synced 2026-11-17 01:05:28 +00:00
revert(master): the edit mode flag on a private instance
This reverts commit 4cf0909d. Nothing starts an edit mode instance any more. Its two
fixes that had nothing to do with edit mode come back in the next commit.
Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
This commit is contained in:
@@ -16,12 +16,7 @@ namespace {
|
||||
uint32_t length{};
|
||||
VALIDATE_READ(bitStream.Read(length));
|
||||
value.resize(std::min(length, maxLength));
|
||||
if (!value.empty() && !bitStream.ReadBits(reinterpret_cast<unsigned char*>(value.data()), BYTES_TO_BITS(value.size()), true)) return false;
|
||||
const uint32_t rest = length - static_cast<uint32_t>(value.size());
|
||||
if (rest == 0) return true;
|
||||
if (BITS_TO_BYTES(bitStream.GetNumberOfUnreadBits()) < rest) return false;
|
||||
bitStream.IgnoreBits(BYTES_TO_BITS(rest));
|
||||
return true;
|
||||
return value.empty() || bitStream.ReadBits(reinterpret_cast<unsigned char*>(value.data()), BYTES_TO_BITS(value.size()), true);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -152,15 +147,12 @@ namespace MasterPackets {
|
||||
bitStream.Write(zoneID);
|
||||
bitStream.Write(cloneID);
|
||||
BitStreamUtils::WriteLengthPrefixed<uint32_t>(bitStream, password);
|
||||
if (editMode != 0) bitStream.Write(editMode);
|
||||
}
|
||||
|
||||
bool CreatePrivateZone::Deserialize(RakNet::BitStream& bitStream) {
|
||||
VALIDATE_READ(bitStream.Read(zoneID));
|
||||
VALIDATE_READ(bitStream.Read(cloneID));
|
||||
VALIDATE_READ(ReadCappedString(bitStream, password, MAX_PASSWORD_LENGTH));
|
||||
editMode = 0;
|
||||
if (bitStream.GetNumberOfUnreadBits() >= 8) VALIDATE_READ(bitStream.Read(editMode));
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@@ -146,9 +146,6 @@ namespace MasterPackets {
|
||||
uint32_t zoneID{};
|
||||
uint32_t cloneID{};
|
||||
std::string password; // u32 length, then 1 byte per character
|
||||
// A GM's edit mode: the instance's world server constructs none of the zone's objects (docs/EditMode.md). Written
|
||||
// only when set, so a plain private zone stays as it always was
|
||||
uint8_t editMode{};
|
||||
|
||||
CreatePrivateZone() : LUBitStream(ServiceType::MASTER, MessageType::Master::CREATE_PRIVATE_ZONE) {}
|
||||
void Serialize(RakNet::BitStream& bitStream) const override;
|
||||
|
||||
@@ -1009,7 +1009,6 @@ json ToJson(const MasterPackets::CreatePrivateZone& m) {
|
||||
json j = json::object();
|
||||
j["zoneID"] = ToJson(m.zoneID);
|
||||
j["cloneID"] = ToJson(m.cloneID);
|
||||
j["editMode"] = ToJson(m.editMode);
|
||||
return j;
|
||||
}
|
||||
json ToJson(const MasterPackets::RequestPrivateZone& m) {
|
||||
|
||||
@@ -35,12 +35,11 @@ void ZoneInstanceManager::HandleRequestZoneTransferResponse(const MasterPackets:
|
||||
}
|
||||
}
|
||||
|
||||
void ZoneInstanceManager::CreatePrivateZone(dServer* server, uint32_t zoneID, uint32_t zoneClone, const std::string& password, const bool editMode) {
|
||||
void ZoneInstanceManager::CreatePrivateZone(dServer* server, uint32_t zoneID, uint32_t zoneClone, const std::string& password) {
|
||||
MasterPackets::CreatePrivateZone request;
|
||||
request.zoneID = zoneID;
|
||||
request.cloneID = zoneClone;
|
||||
request.password = password;
|
||||
request.editMode = editMode ? 1 : 0;
|
||||
MasterPackets::SendToMaster(request, server);
|
||||
}
|
||||
|
||||
|
||||
@@ -62,8 +62,7 @@ public:
|
||||
*/
|
||||
void HandleRequestZoneTransferResponse(const MasterPackets::RequestZoneTransferResponse& response);
|
||||
|
||||
// editMode: a GM's edit mode instance, whose world server constructs none of the zone's objects
|
||||
void CreatePrivateZone(dServer* server, uint32_t zoneID, uint32_t zoneClone, const std::string& password, bool editMode = false);
|
||||
void CreatePrivateZone(dServer* server, uint32_t zoneID, uint32_t zoneClone, const std::string& password);
|
||||
|
||||
void RequestPrivateZone(dServer* server, bool mythranShift, const std::string& password, TransferCallback callback);
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user