From 222f4969f0114e540dd496a66d289db6e4e23f98 Mon Sep 17 00:00:00 2001
From: Ilya Zhuravlev <xyzz@mail.ua>
Date: Tue, 15 Nov 2011 16:27:35 +0400
Subject: [PATCH] say no to underground spawn

---
 src/game.cpp   | 8 ++++----
 src/server.cpp | 6 +-----
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/game.cpp b/src/game.cpp
index d666dbc..40ac0d4 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -783,14 +783,14 @@ void the_game(
 
 			// Update client and server
 
-			client.step(0.1);
+			client.step(0.0001);
 
 			if(server != NULL)
-				server->step(0.1);
+				server->step(0.0001);
 			
 			// Delay a bit
-			sleep_ms(100);
-			time_counter += 0.1;
+			sleep_ms(1);
+			time_counter += 0.0001;
 		}
 	}
 	catch(con::PeerNotFoundException &e)
diff --git a/src/server.cpp b/src/server.cpp
index 10872a6..f886403 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -2022,10 +2022,6 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
 			return;
 		}
 
-        // this magic fixes (very dirty-fixes) bug when you are 3 nodes (cubes) down after logout-login
-        v3f position = player->getPosition();
-        position.Y += 3;
-        player->setPosition(position);
 		/*
 			Answer with a TOCLIENT_INIT
 		*/
@@ -4161,7 +4157,7 @@ v3f findSpawnPos(ServerMap &map)
 				-range + (myrand()%(range*2)));
 		//v2s16 sectorpos = getNodeSectorPos(nodepos2d);
 		// Get ground height at point (fallbacks to heightmap function)
-		s16 groundheight = map.findGroundLevel(nodepos2d);
+		s16 groundheight = map.findGroundLevel(nodepos2d) + 1;
 		// Don't go underwater
 		if(groundheight < WATER_LEVEL)
 		{