Consistent HP and damage types (#8167)

[minetest.git] / src / database / database-postgresql.cpp

diff --git a/src/database/database-postgresql.cpp b/src/database/database-postgresql.cpp
index 2d9c3b49ef982c61c7b56e0b8d2e960ec1219f98..d7c94ff15b4ed52dcd0c5358e9d15a6c8aeae833 100644 (file)
--- a/src/database/database-postgresql.cpp
+++ b/src/database/database-postgresql.cpp
@@ -454,8 +454,8 @@ void PlayerDatabasePostgreSQL::savePlayer(RemotePlayer *player)
        verifyDatabase();
 
        v3f pos = sao->getBasePosition();
-       std::string pitch = ftos(sao->getPitch());
-       std::string yaw = ftos(sao->getYaw());
+       std::string pitch = ftos(sao->getLookPitch());
+       std::string yaw = ftos(sao->getRotation().Y);
        std::string posx = ftos(pos.X);
        std::string posy = ftos(pos.Y);
        std::string posz = ftos(pos.Z);
@@ -527,8 +527,9 @@ void PlayerDatabasePostgreSQL::savePlayer(RemotePlayer *player)
                };
                execPrepared("save_player_metadata", 3, meta_values);
        }
-       sao->getMeta().setModified(false);
        endSave();
+
+       player->onSuccessfulSave();
 }
 
 bool PlayerDatabasePostgreSQL::loadPlayer(RemotePlayer *player, PlayerSAO *sao)
@@ -545,14 +546,14 @@ bool PlayerDatabasePostgreSQL::loadPlayer(RemotePlayer *player, PlayerSAO *sao)
                return false;
        }
 
-       sao->setPitch(pg_to_float(results, 0, 0));
-       sao->setYaw(pg_to_float(results, 0, 1));
+       sao->setLookPitch(pg_to_float(results, 0, 0));
+       sao->setRotation(v3f(0, pg_to_float(results, 0, 1), 0));
        sao->setBasePosition(v3f(
                pg_to_float(results, 0, 2),
                pg_to_float(results, 0, 3),
                pg_to_float(results, 0, 4))
        );
-       sao->setHPRaw((s16) pg_to_int(results, 0, 5));
+       sao->setHPRaw((u16) pg_to_int(results, 0, 5));
        sao->setBreath((u16) pg_to_int(results, 0, 6), false);
 
        PQclear(results);