From 4f17362aeb80e5339c58a5d3b0fbaeb88d9e701c Mon Sep 17 00:00:00 2001
From: "madmaxoft@gmail.com"
 <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>
Date: Mon, 13 Feb 2012 21:47:03 +0000
Subject: Rewritten most of the code for multithreading; still not 100%, but
 getting there. If this commit proves to be too problematic, we can always
 undo it.

git-svn-id: http://mc-server.googlecode.com/svn/trunk@251 0a769ca7-a7f5-676a-18bf-c427514a06d6
---
 source/cBlockEntity.h | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

(limited to 'source/cBlockEntity.h')

diff --git a/source/cBlockEntity.h b/source/cBlockEntity.h
index e955caff2..dc67306cd 100644
--- a/source/cBlockEntity.h
+++ b/source/cBlockEntity.h
@@ -1,3 +1,4 @@
+
 #pragma once
 
 #ifndef _WIN32
@@ -6,18 +7,26 @@
 enum ENUM_BLOCK_ID;
 #endif
 
-class cChunk;
+
+
+
+
 class cClientHandle;
 class cPlayer;
+class cWorld;
+
+
+
+
+
 class cBlockEntity
 {
 protected:
-	cBlockEntity(ENUM_BLOCK_ID a_BlockType, int a_X, int a_Y, int a_Z, cChunk* a_Chunk) 
+	cBlockEntity(ENUM_BLOCK_ID a_BlockType, int a_X, int a_Y, int a_Z, cWorld * a_World) 
 		: m_PosX( a_X )
 		, m_PosY( a_Y )
 		, m_PosZ( a_Z )
 		, m_BlockType( a_BlockType ) 
-		, m_Chunk( a_Chunk )
 	{}
 public:
 	virtual ~cBlockEntity() {};
@@ -26,9 +35,10 @@ public:
 	int GetPosX() { return m_PosX; }
 	int GetPosY() { return m_PosY; }
 	int GetPosZ() { return m_PosZ; }
-	cChunk* GetChunk() { return m_Chunk; }
 
 	ENUM_BLOCK_ID GetBlockType() { return m_BlockType; }
+	
+	cWorld * GetWorld(void) const {return m_World; }
 
 	virtual void UsedBy( cPlayer & a_Player ) = 0;
 	virtual void SendTo( cClientHandle* a_Client ) { (void)a_Client; }
@@ -38,7 +48,11 @@ protected:
 	int m_PosY;
 	int m_PosZ;
 
-	cChunk* m_Chunk;
-
 	ENUM_BLOCK_ID m_BlockType;
+	
+	cWorld * m_World;
 };
+
+
+
+
-- 
cgit v1.2.3