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/network | |
| 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/network')
| -rw-r--r-- | src/network/networkprotocol.h | 4 | ||||
| -rw-r--r-- | src/network/serverpackethandler.cpp | 21 |
2 files changed, 2 insertions, 23 deletions
diff --git a/src/network/networkprotocol.h b/src/network/networkprotocol.h index 5301cc91c..ea532d9e0 100644 --- a/src/network/networkprotocol.h +++ b/src/network/networkprotocol.h @@ -153,14 +153,14 @@ with this program; if not, write to the Free Software Foundation, Inc., #define LATEST_PROTOCOL_VERSION 30 // Server's supported network protocol range -#define SERVER_PROTOCOL_VERSION_MIN 13 +#define SERVER_PROTOCOL_VERSION_MIN 24 #define SERVER_PROTOCOL_VERSION_MAX LATEST_PROTOCOL_VERSION // Client's supported network protocol range // The minimal version depends on whether // send_pre_v25_init is enabled or not #define CLIENT_PROTOCOL_VERSION_MIN 25 -#define CLIENT_PROTOCOL_VERSION_MIN_LEGACY 13 +#define CLIENT_PROTOCOL_VERSION_MIN_LEGACY 24 #define CLIENT_PROTOCOL_VERSION_MAX LATEST_PROTOCOL_VERSION // Constant that differentiates the protocol from random data and other protocols diff --git a/src/network/serverpackethandler.cpp b/src/network/serverpackethandler.cpp index b707c6fad..e0ea4bf83 100644 --- a/src/network/serverpackethandler.cpp +++ b/src/network/serverpackethandler.cpp @@ -614,20 +614,6 @@ void Server::handleCommand_Init2(NetworkPacket* pkt) u16 protocol_version = m_clients.getProtocolVersion(pkt->getPeerId()); - ///// begin compatibility code - PlayerSAO* playersao = NULL; - if (protocol_version <= 22) { - playersao = StageTwoClientInit(pkt->getPeerId()); - - if (playersao == NULL) { - actionstream - << "TOSERVER_INIT2 stage 2 client init failed for peer " - << pkt->getPeerId() << std::endl; - return; - } - } - ///// end compatibility code - /* Send some initialization data */ @@ -657,13 +643,6 @@ void Server::handleCommand_Init2(NetworkPacket* pkt) float time_speed = g_settings->getFloat("time_speed"); SendTimeOfDay(pkt->getPeerId(), time, time_speed); - ///// begin compatibility code - if (protocol_version <= 22) { - m_clients.event(pkt->getPeerId(), CSE_SetClientReady); - m_script->on_joinplayer(playersao); - } - ///// end compatibility code - // Warnings about protocol version can be issued here if (getClient(pkt->getPeerId())->net_proto_version < LATEST_PROTOCOL_VERSION) { SendChatMessage(pkt->getPeerId(), L"# Server: WARNING: YOUR CLIENT'S " |