From 303b1a9c45cb74a656c9a099d669c89b92e74098 Mon Sep 17 00:00:00 2001
From: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Wed, 14 Aug 2013 11:44:02 +0100
Subject: Buncha bugfixes [SEE DESC]

Fixed generation values not being written
Fixed piston being able to push water
Fixed ice creating a non-source block (still doesn't update though)
Removed problematic piston code
---
 source/Piston.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'source/Piston.cpp')

diff --git a/source/Piston.cpp b/source/Piston.cpp
index 161f2b38c..d75cd4989 100644
--- a/source/Piston.cpp
+++ b/source/Piston.cpp
@@ -12,11 +12,13 @@
 #include "Server.h"
 #include "Blocks/BlockHandler.h"
 
+/*
 #ifdef _WIN32
 #include <windows.h> 
 #else
 #include <unistd.h>
 #endif
+*/
 
 
 //Athar from http://www.cplusplus.com/forum/unices/60161/ helped with the sleep code.
@@ -128,11 +130,13 @@ void cPiston::ExtendPiston( int pistx, int pisty, int pistz )
 
 	AddDir(extx, exty, extz, pistonMeta & 7, 1)
 
+	/*
 	#ifdef _WIN32
 	Sleep(100);
 	#else
 	usleep(static_cast<useconds_t>(100)*1000);
 	#endif
+	*/
 
 	m_World->SetBlock(extx, exty, extz, E_BLOCK_PISTON_EXTENSION, isSticky + pistonMeta & 7);
 }
@@ -178,22 +182,26 @@ void cPiston::RetractPiston( int pistx, int pisty, int pistz )
 			// These cannot be moved by the sticky piston, bail out
 			return;
 		}
+		/*
 		#ifdef _WIN32
 		Sleep(100);
 		#else
 		usleep(static_cast<useconds_t>(100)*1000);
 		#endif
+		*/
 
 		m_World->SetBlock(pistx, pisty, pistz, tempblock, tempmeta);
 		m_World->SetBlock(tempx, tempy, tempz, E_BLOCK_AIR, 0);
 	}
 	else
 	{
+		/*
 		#ifdef _WIN32
 		Sleep(100);
 		#else
 		usleep(static_cast<useconds_t>(100)*1000);
 		#endif
+		*/
 
 		m_World->SetBlock(pistx, pisty, pistz, E_BLOCK_AIR, 0);
 	}
-- 
cgit v1.2.3