diff options
| author | Loïc Blot <nerzhul@users.noreply.github.com> | 2017-03-19 08:44:29 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-19 08:44:29 +0100 |
| commit | f8ad01ab7c4cf012781bd4caa821544e676c9267 (patch) | |
| tree | af8664302b0dccfb1fa28f0d5479d47e0a57c4ab /src/mapblock.h | |
| parent | b8484ef24e8e1ec90a2967372808ab2bea538c7c (diff) | |
| download | minetest-f8ad01ab7c4cf012781bd4caa821544e676c9267.tar.gz minetest-f8ad01ab7c4cf012781bd4caa821544e676c9267.tar.bz2 minetest-f8ad01ab7c4cf012781bd4caa821544e676c9267.zip | |
Update server min protocol version to v24 (#5411)
* Update server min protocol version to v24
It's based on @sfan5 stats. See https://kitsunemimi.pw/tmp/serverlist_stats_2017-03-17.txt
v24 was bumped 25/08/14 and 0.4.11 was released 25/12/14
* Drop protocol v23 and lesser code
Diffstat (limited to 'src/mapblock.h')
| -rw-r--r-- | src/mapblock.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mapblock.h b/src/mapblock.h index bec3b6f56..8a7dfc11d 100644 --- a/src/mapblock.h +++ b/src/mapblock.h @@ -541,7 +541,7 @@ public: // unknown blocks from id-name mapping to wndef void deSerialize(std::istream &is, u8 version, bool disk); - void serializeNetworkSpecific(std::ostream &os, u16 net_proto_version); + void serializeNetworkSpecific(std::ostream &os); void deSerializeNetworkSpecific(std::istream &is); private: /* @@ -698,11 +698,11 @@ inline bool blockpos_over_limit(v3s16 p) { const u16 map_gen_limit = MYMIN(MAX_MAP_GENERATION_LIMIT, g_settings->getU16("map_generation_limit")); - return (p.X * MAP_BLOCKSIZE < -map_gen_limit + return (p.X * MAP_BLOCKSIZE < -map_gen_limit || (p.X + 1) * MAP_BLOCKSIZE - 1 > map_gen_limit - || p.Y * MAP_BLOCKSIZE < -map_gen_limit + || p.Y * MAP_BLOCKSIZE < -map_gen_limit || (p.Y + 1) * MAP_BLOCKSIZE - 1 > map_gen_limit - || p.Z * MAP_BLOCKSIZE < -map_gen_limit + || p.Z * MAP_BLOCKSIZE < -map_gen_limit || (p.Z + 1) * MAP_BLOCKSIZE - 1 > map_gen_limit); } |