*/
#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
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 =
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;
+
+ // copy defaults
+ m_cloud_params.density = 0.4f;
+ m_cloud_params.color_bright = video::SColor(229, 240, 240, 255);
+ m_cloud_params.color_ambient = video::SColor(255, 0, 0, 0);
+ m_cloud_params.height = 120.0f;
+ m_cloud_params.thickness = 16.0f;
+ m_cloud_params.speed = v2f(0.0f, -2.0f);
+
+ // Skybox defaults:
+
+ SkyboxDefaults sky_defaults;
+
+ m_skybox_params.sky_color = sky_defaults.getSkyColorDefaults();
+ m_skybox_params.type = "regular";
+ m_skybox_params.clouds = true;
+ m_skybox_params.fog_sun_tint = video::SColor(255, 244, 125, 29);
+ m_skybox_params.fog_moon_tint = video::SColorf(0.5, 0.6, 0.8, 1).toSColor();
+ m_skybox_params.fog_tint_type = "default";
+
+ m_sun_params = sky_defaults.getSunDefaults();
+ m_moon_params = sky_defaults.getMoonDefaults();
+ m_star_params = sky_defaults.getStarDefaults();
}
-void RemotePlayer::save(std::string savedir, IGameDef *gamedef)
+void RemotePlayer::serializeExtraAttributes(std::string &output)
{
- /*
- * 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);
+ assert(m_sao);
+ Json::Value json_root;
+
+ const StringMap &attrs = m_sao->getMeta().getStrings();
+ for (const auto &attr : attrs) {
+ json_root[attr.first] = attr.second;
}
- infostream << "Didn't find free file for player " << m_name << std::endl;
- return;
+ output = fastWriteJson(json_root);
}
+
void RemotePlayer::deSerialize(std::istream &is, const std::string &playername,
PlayerSAO *sao)
{
m_dirty = true;
//args.getS32("version"); // Version field value not used
- std::string name = args.get("name");
+ const std::string &name = args.get("name");
strlcpy(m_name, name.c_str(), PLAYERNAME_SIZE);
if (sao) {
try {
- sao->setHPRaw(args.getS32("hp"));
+ sao->setHPRaw(args.getU16("hp"));
} catch(SettingNotFoundException &e) {
- sao->setHPRaw(PLAYER_MAX_HP);
+ sao->setHPRaw(PLAYER_MAX_HP_DEFAULT);
}
try {
} catch (SettingNotFoundException &e) {}
try {
- sao->setPitch(args.getFloat("pitch"));
+ sao->setLookPitch(args.getFloat("pitch"));
+ } catch (SettingNotFoundException &e) {}
+ try {
+ sao->setPlayerYaw(args.getFloat("yaw"));
} catch (SettingNotFoundException &e) {}
+
try {
- sao->setYaw(args.getFloat("yaw"));
+ sao->setBreath(args.getU16("breath"), false);
} catch (SettingNotFoundException &e) {}
try {
- sao->setBreath(args.getS32("breath"));
+ const std::string &extended_attributes = args.get("extended_attributes");
+ std::istringstream iss(extended_attributes);
+ Json::CharReaderBuilder builder;
+ builder.settings_["collectComments"] = false;
+ std::string errs;
+
+ Json::Value attr_root;
+ Json::parseFromStream(builder, iss, &attr_root, &errs);
+
+ const Json::Value::Members attr_list = attr_root.getMemberNames();
+ for (const auto &it : attr_list) {
+ Json::Value attr_value = attr_root[it];
+ sao->getMeta().setString(it, attr_value.asString());
+ }
+ sao->getMeta().setModified(false);
} catch (SettingNotFoundException &e) {}
}
- inventory.deSerialize(is);
+ try {
+ inventory.deSerialize(is);
+ } catch (SerializationError &e) {
+ errorstream << "Failed to deserialize player inventory. player_name="
+ << name << " " << e.what() << std::endl;
+ }
- if (inventory.getList("craftpreview") == NULL) {
+ if (!inventory.getList("craftpreview") && inventory.getList("craftresult")) {
// Convert players without craftpreview
inventory.addList("craftpreview", 1);
Settings args;
args.setS32("version", 1);
args.set("name", m_name);
- //args.set("password", m_password);
// This should not happen
assert(m_sao);
- args.setS32("hp", m_sao->getHP());
+ args.setU16("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.setFloat("pitch", m_sao->getLookPitch());
+ args.setFloat("yaw", m_sao->getRotation().Y);
+ args.setU16("breath", m_sao->getBreath());
+
+ std::string extended_attrs;
+ serializeExtraAttributes(extended_attrs);
+ args.set("extended_attributes", extended_attrs);
args.writeLines(os);
m_chat_message_allowance -= 1.0f;
return RPLAYER_CHATRESULT_OK;
}
+
+void RemotePlayer::onSuccessfulSave()
+{
+ setModified(false);
+ if (m_sao)
+ m_sao->getMeta().setModified(false);
+}
projects / dragonfireclient.git / blobdiff