From 9a177f009b4ed8d4e9f88d36e65d8b06b2c390e6 Mon Sep 17 00:00:00 2001 From: SmallJoker Date: Fri, 29 Jan 2021 18:02:40 +0100 Subject: [PATCH] PlayerDatabaseFiles: Fix segfault while saving a player Corrects a typo introduced in 5e9dd166 --- src/database/database-files.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/database/database-files.cpp b/src/database/database-files.cpp index d9e8f24ea..d9d113b4e 100644 --- a/src/database/database-files.cpp +++ b/src/database/database-files.cpp @@ -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; }