]> git.lizzy.rs Git - minetest.git/blobdiff - src/remoteplayer.cpp
Fix crash in commit a69b7abe00fb818fd88f3cd04e7f9997ffd21072
[minetest.git] / src / remoteplayer.cpp
index 60534692802b178ec7cc52c0d9d50a36e0917ea5..20be7a8c81f39a428b3a1aa0649aa5eb30e3abea 100644 (file)
@@ -19,31 +19,26 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 */
 
 #include "remoteplayer.h"
-#include "content_sao.h"
+#include <json/json.h>
 #include "filesys.h"
 #include "gamedef.h"
 #include "porting.h"  // strlcpy
+#include "server.h"
 #include "settings.h"
-
+#include "convert_json.h"
+#include "server/player_sao.h"
 
 /*
        RemotePlayer
 */
+
 // static config cache for remoteplayer
 bool RemotePlayer::m_setting_cache_loaded = false;
 float RemotePlayer::m_setting_chat_message_limit_per_10sec = 0.0f;
 u16 RemotePlayer::m_setting_chat_message_limit_trigger_kick = 0;
 
 RemotePlayer::RemotePlayer(const char *name, IItemDefManager *idef):
-       Player(name, idef),
-       protocol_version(0),
-       m_sao(NULL),
-       m_dirty(false),
-       m_last_chat_message_sent(time(NULL)),
-       m_chat_message_allowance(5.0f),
-       m_message_rate_overhead(0),
-       hud_hotbar_image(""),
-       hud_hotbar_selected_image("")
+       Player(name, idef)
 {
        if (!RemotePlayer::m_setting_cache_loaded) {
                RemotePlayer::m_setting_chat_message_limit_per_10sec =
@@ -52,6 +47,7 @@ RemotePlayer::RemotePlayer(const char *name, IItemDefManager *idef):
                        g_settings->getU16("chat_message_limit_trigger_kick");
                RemotePlayer::m_setting_cache_loaded = true;
        }
+
        movement_acceleration_default   = g_settings->getFloat("movement_acceleration_default")   * BS;
        movement_acceleration_air       = g_settings->getFloat("movement_acceleration_air")       * BS;
        movement_acceleration_fast      = g_settings->getFloat("movement_acceleration_fast")      * BS;
@@ -64,135 +60,17 @@ RemotePlayer::RemotePlayer(const char *name, IItemDefManager *idef):
        movement_liquid_fluidity_smooth = g_settings->getFloat("movement_liquid_fluidity_smooth") * BS;
        movement_liquid_sink            = g_settings->getFloat("movement_liquid_sink")            * BS;
        movement_gravity                = g_settings->getFloat("movement_gravity")                * BS;
-}
-
-void RemotePlayer::save(std::string savedir, IGameDef *gamedef)
-{
-       /*
-        * We have to open all possible player files in the players directory
-        * and check their player names because some file systems are not
-        * case-sensitive and player names are case-sensitive.
-        */
-
-       // A player to deserialize files into to check their names
-       RemotePlayer testplayer("", gamedef->idef());
-
-       savedir += DIR_DELIM;
-       std::string path = savedir + m_name;
-       for (u32 i = 0; i < PLAYER_FILE_ALTERNATE_TRIES; i++) {
-               if (!fs::PathExists(path)) {
-                       // Open file and serialize
-                       std::ostringstream ss(std::ios_base::binary);
-                       serialize(ss);
-                       if (!fs::safeWriteToFile(path, ss.str())) {
-                               infostream << "Failed to write " << path << std::endl;
-                       }
-                       setModified(false);
-                       return;
-               }
-               // Open file and deserialize
-               std::ifstream is(path.c_str(), std::ios_base::binary);
-               if (!is.good()) {
-                       infostream << "Failed to open " << path << std::endl;
-                       return;
-               }
-               testplayer.deSerialize(is, path, NULL);
-               is.close();
-               if (strcmp(testplayer.getName(), m_name) == 0) {
-                       // Open file and serialize
-                       std::ostringstream ss(std::ios_base::binary);
-                       serialize(ss);
-                       if (!fs::safeWriteToFile(path, ss.str())) {
-                               infostream << "Failed to write " << path << std::endl;
-                       }
-                       setModified(false);
-                       return;
-               }
-               path = savedir + m_name + itos(i);
-       }
-
-       infostream << "Didn't find free file for player " << m_name << std::endl;
-       return;
-}
-
-void RemotePlayer::deSerialize(std::istream &is, const std::string &playername,
-               PlayerSAO *sao)
-{
-       Settings args;
-
-       if (!args.parseConfigLines(is, "PlayerArgsEnd")) {
-               throw SerializationError("PlayerArgsEnd of player " + playername + " not found!");
-       }
-
-       m_dirty = true;
-       //args.getS32("version"); // Version field value not used
-       std::string name = args.get("name");
-       strlcpy(m_name, name.c_str(), PLAYERNAME_SIZE);
-
-       if (sao) {
-               try {
-                       sao->setHP(args.getS32("hp"), true);
-               } catch(SettingNotFoundException &e) {
-                       sao->setHP(PLAYER_MAX_HP, true);
-               }
-
-               try {
-                       sao->setBasePosition(args.getV3F("position"));
-               } catch (SettingNotFoundException &e) {}
-
-               try {
-                       sao->setPitch(args.getFloat("pitch"), false);
-               } catch (SettingNotFoundException &e) {}
-               try {
-                       sao->setYaw(args.getFloat("yaw"), false);
-               } catch (SettingNotFoundException &e) {}
-
-               try {
-                       sao->setBreath(args.getS32("breath"));
-               } catch (SettingNotFoundException &e) {}
-       }
 
-       inventory.deSerialize(is);
-
-       if (inventory.getList("craftpreview") == NULL) {
-               // Convert players without craftpreview
-               inventory.addList("craftpreview", 1);
-
-               bool craftresult_is_preview = true;
-               if(args.exists("craftresult_is_preview"))
-                       craftresult_is_preview = args.getBool("craftresult_is_preview");
-               if(craftresult_is_preview)
-               {
-                       // Clear craftresult
-                       inventory.getList("craftresult")->changeItem(0, ItemStack());
-               }
-       }
+       // Skybox defaults:
+       m_cloud_params  = SkyboxDefaults::getCloudDefaults();
+       m_skybox_params = SkyboxDefaults::getSkyDefaults();
+       m_sun_params    = SkyboxDefaults::getSunDefaults();
+       m_moon_params   = SkyboxDefaults::getMoonDefaults();
+       m_star_params   = SkyboxDefaults::getStarDefaults();
 }
 
-void RemotePlayer::serialize(std::ostream &os)
-{
-       // Utilize a Settings object for storing values
-       Settings args;
-       args.setS32("version", 1);
-       args.set("name", m_name);
-       //args.set("password", m_password);
-
-       if (m_sao) {
-               args.setS32("hp", m_sao->getHP());
-               args.setV3F("position", m_sao->getBasePosition());
-               args.setFloat("pitch", m_sao->getPitch());
-               args.setFloat("yaw", m_sao->getYaw());
-               args.setS32("breath", m_sao->getBreath());
-       }
-
-       args.writeLines(os);
 
-       os<<"PlayerArgsEnd\n";
-
-       inventory.serialize(os);
-}
-
-const RemotePlayerChatResult RemotePlayer::canSendChatMessage()
+RemotePlayerChatResult RemotePlayer::canSendChatMessage()
 {
        // Rate limit messages
        u32 now = time(NULL);
@@ -230,3 +108,10 @@ const RemotePlayerChatResult RemotePlayer::canSendChatMessage()
        m_chat_message_allowance -= 1.0f;
        return RPLAYER_CHATRESULT_OK;
 }
+
+void RemotePlayer::onSuccessfulSave()
+{
+       setModified(false);
+       if (m_sao)
+               m_sao->getMeta().setModified(false);
+}