X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fcontent_sao.cpp;h=4ee92f4d34255408e83f1159cfadb73f359fb26b;hb=8852333eb3042580592ade478e5def20f8ed5d4c;hp=85ab8d307abe4bb4e36682eea48f92ffe6a6c8bc;hpb=4feea0ac6845ea025e8784f63f48e567d1d24c22;p=oweals%2Fminetest.git

diff --git a/src/content_sao.cpp b/src/content_sao.cpp
index 85ab8d307..4ee92f4d3 100644
--- a/src/content_sao.cpp
+++ b/src/content_sao.cpp
@@ -191,7 +191,7 @@ public:
 	}
 
 	ItemSAO(ServerEnvironment *env, v3f pos,
-			const std::string itemstring):
+			const std::string &itemstring):
 		ServerActiveObject(env, pos),
 		m_itemstring(itemstring),
 		m_itemstring_changed(false),
@@ -350,7 +350,7 @@ private:
 ItemSAO proto_ItemSAO(NULL, v3f(0,0,0), "");
 
 ServerActiveObject* createItemSAO(ServerEnvironment *env, v3f pos,
-		const std::string itemstring)
+                                  const std::string &itemstring)
 {
 	return new ItemSAO(env, pos, itemstring);
 }
@@ -969,6 +969,8 @@ PlayerSAO::PlayerSAO(ServerEnvironment *env_, Player *player_, u16 peer_id_,
 	m_physics_override_speed(1),
 	m_physics_override_jump(1),
 	m_physics_override_gravity(1),
+	m_physics_override_sneak(true),
+	m_physics_override_sneak_glitch(true),
 	m_physics_override_sent(false)
 {
 	assert(m_player);
@@ -1025,6 +1027,8 @@ void PlayerSAO::removingFromEnvironment()
 	{
 		m_player->setPlayerSAO(NULL);
 		m_player->peer_id = 0;
+		m_env->savePlayer(m_player->getName());
+		m_env->removePlayer(m_player->getName());
 	}
 }
 
@@ -1060,7 +1064,9 @@ std::string PlayerSAO::getClientInitializationData(u16 protocol_version)
 			os<<serializeLongString(gob_cmd_update_bone_position((*ii).first, (*ii).second.X, (*ii).second.Y)); // m_bone_position.size
 		}
 		os<<serializeLongString(gob_cmd_update_attachment(m_attachment_parent_id, m_attachment_bone, m_attachment_position, m_attachment_rotation)); // 4
-		os<<serializeLongString(gob_cmd_update_physics_override(m_physics_override_speed, m_physics_override_jump, m_physics_override_gravity)); // 5
+		os<<serializeLongString(gob_cmd_update_physics_override(m_physics_override_speed,
+				m_physics_override_jump, m_physics_override_gravity, m_physics_override_sneak,
+				m_physics_override_sneak_glitch)); // 5
 	}
 	else
 	{
@@ -1187,7 +1193,9 @@ void PlayerSAO::step(float dtime, bool send_recommended)
 
 	if(m_physics_override_sent == false){
 		m_physics_override_sent = true;
-		std::string str = gob_cmd_update_physics_override(m_physics_override_speed, m_physics_override_jump, m_physics_override_gravity);
+		std::string str = gob_cmd_update_physics_override(m_physics_override_speed,
+				m_physics_override_jump, m_physics_override_gravity,
+				m_physics_override_sneak, m_physics_override_sneak_glitch);
 		// create message and add to list
 		ActiveObjectMessage aom(getId(), true, str);
 		m_messages_out.push_back(aom);