]> git.lizzy.rs Git - minetest.git/commitdiff
PlayerDatabaseFiles: Fix segfault while saving a player
authorSmallJoker <mk939@ymail.com>
Fri, 29 Jan 2021 17:02:40 +0000 (18:02 +0100)
committerSmallJoker <mk939@ymail.com>
Fri, 29 Jan 2021 17:02:40 +0000 (18:02 +0100)
Corrects a typo introduced in 5e9dd166

src/database/database-files.cpp

index d9e8f24eab8263fa9279fe5bbed68f704baca1a8..d9d113b4e8b0ad0addfe2a7a410cf7d696bb2cb0 100644 (file)
@@ -121,9 +121,9 @@ void PlayerDatabaseFiles::serialize(RemotePlayer *p, std::ostream &os)
        args.setS32("version", 1);
        args.set("name", p->m_name);
 
-       // This should not happen
        PlayerSAO *sao = p->getPlayerSAO();
-       assert(sao);
+       // This should not happen
+       sanity_check(sao);
        args.setU16("hp", sao->getHP());
        args.setV3F("position", sao->getBasePosition());
        args.setFloat("pitch", sao->getLookPitch());
@@ -189,7 +189,7 @@ void PlayerDatabaseFiles::savePlayer(RemotePlayer *player)
 
        // Open and serialize file
        std::ostringstream ss(std::ios_base::binary);
-       serialize(&testplayer, ss);
+       serialize(player, ss);
        if (!fs::safeWriteToFile(path, ss.str())) {
                infostream << "Failed to write " << path << std::endl;
        }