Source image tracking in tile generation (#12514)

[minetest.git] / src / network / clientpackethandler.cpp

diff --git a/src/network/clientpackethandler.cpp b/src/network/clientpackethandler.cpp
index 8a323872ac0c0a2a9c54fbed9bc4017a4ecb1faf..9c9d8276e834ea3600c598f78a111ab18b3229ca 100644 (file)
--- a/src/network/clientpackethandler.cpp
+++ b/src/network/clientpackethandler.cpp
@@ -1592,14 +1592,6 @@ void Client::handleCommand_MediaPush(NetworkPacket *pkt)
                verbosestream << "with " << filedata.size() << " bytes ";
        verbosestream << "(cached=" << cached << ")" << std::endl;
 
-       if (m_media_pushed_files.count(filename) != 0) {
-               // Ignore (but acknowledge). Previously this was for sync purposes,
-               // but even in new versions media cannot be replaced at runtime.
-               if (m_proto_ver >= 40)
-                       sendHaveMedia({ token });
-               return;
-       }
-
        if (!filedata.empty()) {
                // LEGACY CODEPATH
                // Compute and check checksum of data
@@ -1618,7 +1610,6 @@ void Client::handleCommand_MediaPush(NetworkPacket *pkt)
 
                // Actually load media
                loadMedia(filedata, filename, true);
-               m_media_pushed_files.insert(filename);
 
                // Cache file for the next time when this client joins the same server
                if (cached)
@@ -1626,8 +1617,6 @@ void Client::handleCommand_MediaPush(NetworkPacket *pkt)
                return;
        }
 
-       m_media_pushed_files.insert(filename);
-
        // create a downloader for this file
        auto downloader(std::make_shared<SingleMediaDownloader>(cached));
        m_pending_media_downloads.emplace_back(token, downloader);