mirror of
https://github.com/minetest/minetest.git
synced 2024-09-12 08:28:36 +02:00
Revert "Fix a crash (assert) when client set serial version < 24 in INIT command SER_FMT_VER_LOWEST is set to zero, then the test is stupid in INIT because all client works. In mapblock we check if client's serialization version is < 24, but if client sent serialization version < 24 (15 for example) the server set it and tried to send nodes, then BOOM"
nerzhul is (may?) be working on a new solution. For the moment this is reverted because old worlds cannot be loaded (see discussion on github for the commit). This reverts commit 800d19270250bb13cc6b2d330199815bf8e96446.
This commit is contained in:
parent
47aca6f6d1
commit
ca217d0416
@ -526,6 +526,12 @@ void MapBlock::serialize(std::ostream &os, u8 version, bool disk)
|
||||
throw SerializationError("ERROR: Not writing dummy block.");
|
||||
}
|
||||
|
||||
// Can't do this anymore; we have 16-bit dynamically allocated node IDs
|
||||
// in memory; conversion just won't work in this direction.
|
||||
if(version < 24)
|
||||
throw SerializationError("MapBlock::serialize: serialization to "
|
||||
"version < 24 not possible");
|
||||
|
||||
// First byte
|
||||
u8 flags = 0;
|
||||
if(is_underground)
|
||||
|
@ -30,11 +30,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
--------------------------------
|
||||
|
||||
For map data (blocks, nodes, sectors).
|
||||
|
||||
|
||||
NOTE: The goal is to increment this so that saved maps will be
|
||||
loadable by any version. Other compatibility is not
|
||||
maintained.
|
||||
|
||||
|
||||
0: original networked test with 1-byte nodes
|
||||
1: update with 2-byte nodes
|
||||
2: lighting is transmitted in param
|
||||
@ -70,7 +70,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
// Saved on disk version
|
||||
#define SER_FMT_VER_HIGHEST_WRITE 25
|
||||
// Lowest supported serialization version
|
||||
#define SER_FMT_VER_LOWEST 24
|
||||
#define SER_FMT_VER_LOWEST 0
|
||||
|
||||
inline bool ser_ver_supported(s32 v) {
|
||||
return v >= SER_FMT_VER_LOWEST && v <= SER_FMT_VER_HIGHEST_READ;
|
||||
|
Loading…
Reference in New Issue
Block a user