6 files changed, 10 insertions, 5 deletions

diff --git a/source/AllToLua.bat b/source/AllToLua.bat
index 75a028228..f7867fadb 100644
--- a/source/AllToLua.bat
+++ b/source/AllToLua.bat
@@ -8,8 +8,10 @@
 
 
 :: If there was a Git conflict, resolve it by resetting to HEAD; we're regenerating the files from scratch anyway
-git checkout -- Bindings.cpp
-git checkout -- Bindings.h
+git checkout --ours Bindings.cpp
+git add -u Bindings.cpp
+git checkout --ours Bindings.h
+git add -u Bindings.h
 
 
 
diff --git a/source/Bindings.cpp b/source/Bindings.cpp
index 0424d5f41..e7a71ce76 100644
--- a/source/Bindings.cpp
+++ b/source/Bindings.cpp
@@ -1,6 +1,6 @@
 /*
 ** Lua binding: AllToLua
-** Generated automatically by tolua++-1.0.92 on 08/12/13 21:48:05.
+** Generated automatically by tolua++-1.0.92 on 08/13/13 23:00:22.
 */
 
 #ifndef __cplusplus
@@ -28856,6 +28856,7 @@ TOLUA_API int tolua_AllToLua_open (lua_State* tolua_S)
   tolua_constant(tolua_S,"E_BLOCK_NETHER_QUARTZ_ORE",E_BLOCK_NETHER_QUARTZ_ORE);
   tolua_constant(tolua_S,"E_BLOCK_HOPPER",E_BLOCK_HOPPER);
   tolua_constant(tolua_S,"E_BLOCK_QUARTZ_BLOCK",E_BLOCK_QUARTZ_BLOCK);
+  tolua_constant(tolua_S,"E_BLOCK_QUARTZ_STAIR",E_BLOCK_QUARTZ_STAIR);
   tolua_constant(tolua_S,"E_BLOCK_ACTIVATOR_RAIL",E_BLOCK_ACTIVATOR_RAIL);
   tolua_constant(tolua_S,"E_BLOCK_DROPPER",E_BLOCK_DROPPER);
   tolua_constant(tolua_S,"E_BLOCK_CARPET",E_BLOCK_CARPET);
diff --git a/source/Bindings.h b/source/Bindings.h
index 90043e826..1e5ad7e84 100644
--- a/source/Bindings.h
+++ b/source/Bindings.h
@@ -1,6 +1,6 @@
 /*
 ** Lua binding: AllToLua
-** Generated automatically by tolua++-1.0.92 on 08/12/13 21:48:06.
+** Generated automatically by tolua++-1.0.92 on 08/13/13 23:00:22.
 */
 
 /* Exported function */
diff --git a/source/BlockID.h b/source/BlockID.h
index 6f75e4859..571087ab7 100644
--- a/source/BlockID.h
+++ b/source/BlockID.h
@@ -165,6 +165,7 @@ enum ENUM_BLOCK_ID
 	E_BLOCK_NETHER_QUARTZ_ORE = 153,
 	E_BLOCK_HOPPER = 154,
 	E_BLOCK_QUARTZ_BLOCK = 155,
+	E_BLOCK_QUARTZ_STAIR = 156,
 	E_BLOCK_ACTIVATOR_RAIL = 157,
 	
 	E_BLOCK_DROPPER = 158,
diff --git a/source/Blocks/BlockHandler.cpp b/source/Blocks/BlockHandler.cpp
index b4fc5ab2d..cbca5a4ec 100644
--- a/source/Blocks/BlockHandler.cpp
+++ b/source/Blocks/BlockHandler.cpp
@@ -152,6 +152,7 @@ cBlockHandler * cBlockHandler::CreateBlockHandler(BLOCKTYPE a_BlockType)
 		case E_BLOCK_PISTON_EXTENSION:      return new cBlockPistonHeadHandler      ();
 		case E_BLOCK_PLANKS:                return new cBlockWoodHandler            (a_BlockType);
 		case E_BLOCK_PUMPKIN_STEM:          return new cBlockStemsHandler           (a_BlockType);
+		case E_BLOCK_QUARTZ_STAIR:          return new cBlockStairsHandler          (a_BlockType);
 		case E_BLOCK_RAIL:                  return new cBlockRailHandler            (a_BlockType);
 		case E_BLOCK_POTATOES:              return new cBlockCropsHandler           (a_BlockType);
 		case E_BLOCK_POWERED_RAIL:          return new cBlockRailHandler            (a_BlockType);
diff --git a/source/Player.cpp b/source/Player.cpp
index 9ca619cf7..365a0396f 100644
--- a/source/Player.cpp
+++ b/source/Player.cpp
@@ -791,8 +791,8 @@ void cPlayer::SendMessage(const AString & a_Message)
 
 void cPlayer::TeleportToCoords(double a_PosX, double a_PosY, double a_PosZ)
 {
-	m_LastGroundHeight = (float)a_PosY;
 	SetPosition( a_PosX, a_PosY, a_PosZ );
+	m_LastGroundHeight = (float)a_PosY;
 
 	m_World->BroadcastTeleportEntity(*this, GetClientHandle());
 	m_ClientHandle->SendPlayerMoveLook();