Fixed FS #243, server crash after restart. The blockhandler table and the itemhandler table weren't properly re-initialized.

git-svn-id: http://mc-server.googlecode.com/svn/trunk@830 0a769ca7-a7f5-676a-18bf-c427514a06d6

source/blocks/Block.cpp

@@ -40,22 +40,37 @@
 #include "BlockOre.h"
 #include "BlockNote.h"
 
+
+
+
+
 bool cBlockHandler::m_HandlerInitialized = false;
 cBlockHandler *cBlockHandler::m_BlockHandler[256];
 
+
+
+
+
 cBlockHandler *cBlockHandler::GetBlockHandler(BLOCKTYPE a_BlockID)
 {
-	if(!m_HandlerInitialized)
-	{	//We have to initialize
+	if (!m_HandlerInitialized)
+	{
+		//We have to initialize
 		memset(m_BlockHandler, 0, sizeof(m_BlockHandler));
 		m_HandlerInitialized = true;
 	}
-	if(m_BlockHandler[a_BlockID])
+	if (m_BlockHandler[a_BlockID] != NULL)
+	{
 		return m_BlockHandler[a_BlockID];
+	}
 
 	return m_BlockHandler[a_BlockID] = CreateBlockHandler(a_BlockID);
 }
 
+
+
+
+
 cBlockHandler *cBlockHandler::CreateBlockHandler(BLOCKTYPE a_BlockID)
 {
 	switch(a_BlockID)
@@ -167,32 +182,56 @@ cBlockHandler *cBlockHandler::CreateBlockHandler(BLOCKTYPE a_BlockID)
 	}
 }
 
+
+
+
+
 void cBlockHandler::Deinit()
 {
 	for(int i = 0; i < 256; i++)
 	{
 		delete m_BlockHandler[i];
 	}
+	m_HandlerInitialized = false;
 }
 
+
+
+
+
 cBlockHandler::cBlockHandler(BLOCKTYPE a_BlockID)
 {
 	m_BlockID = a_BlockID;
 }
 
+
+
+
+
 void cBlockHandler::OnUpdate(cWorld *a_World, int a_X, int a_Y, int a_Z)
 {
-
 }
 
+
+
+
+
 void cBlockHandler::OnPlacedByPlayer(cWorld *a_World, cPlayer * a_Player, int a_X, int a_Y, int a_Z, int a_Dir)
 {
 }
 
+
+
+
+
 void cBlockHandler::OnDestroyedByPlayer(cWorld *a_World, cPlayer * a_Player, int a_X, int a_Y, int a_Z)
 {
 }
 
+
+
+
+
 void cBlockHandler::OnPlaced(cWorld *a_World, int a_X, int a_Y, int a_Z, int a_Dir)
 {
 	//Notify the neighbors
@@ -204,6 +243,10 @@ void cBlockHandler::OnPlaced(cWorld *a_World, int a_X, int a_Y, int a_Z, int a_D
 	NeighborChanged(a_World, a_X, a_Y, a_Z + 1);
 }
 
+
+
+
+
 void cBlockHandler::OnDestroyed(cWorld *a_World, int a_X, int a_Y, int a_Z)
 {
 	//Notify the neighbors
@@ -215,47 +258,80 @@ void cBlockHandler::OnDestroyed(cWorld *a_World, int a_X, int a_Y, int a_Z)
 	NeighborChanged(a_World, a_X, a_Y, a_Z + 1);
 }
 
+
+
+
+
 void cBlockHandler::NeighborChanged(cWorld *a_World, int a_X, int a_Y, int a_Z)
 {
 	GetBlockHandler(a_World->GetBlock(a_X, a_Y, a_Z))->OnNeighborChanged(a_World, a_X, a_Y, a_Z);
 }
 
+
+
+
+
 void cBlockHandler::OnNeighborChanged(cWorld *a_World, int a_X, int a_Y, int a_Z)
 {
-
 }
 
+
+
+
+
 void cBlockHandler::OnDigging(cWorld *a_World, cPlayer *a_Player, int a_X, int a_Y, int a_Z)
 {
-
 }
 
+
+
+
+
 void cBlockHandler::OnUse(cWorld *a_World, cPlayer *a_Player, int a_X, int a_Y, int a_Z)
 {
-
 }
 
+
+
+
+
 void cBlockHandler::PlaceBlock(cWorld *a_World, cPlayer *a_Player, NIBBLETYPE a_BlockMeta, int a_X, int a_Y, int a_Z, char a_Dir)
 {
 	a_World->SetBlock(a_X, a_Y, a_Z, m_BlockID, a_BlockMeta);
 	OnPlacedByPlayer(a_World, a_Player, a_X, a_Y, a_Z, a_Dir);
 }
 
+
+
+
+
 char cBlockHandler::GetDropCount()
 {
 	return 1;
 }
 
+
+
+
+
 int cBlockHandler::GetDropID()
 {
 	return m_BlockID;
 }
 
+
+
+
+
 NIBBLETYPE cBlockHandler::GetDropMeta(NIBBLETYPE a_BlockMeta)
 {
 	return a_BlockMeta;		//This keeps most textures. The few other blocks have to override this
 }
 
+
+
+
+
 void cBlockHandler::DropBlock(cWorld *a_World, int a_X, int a_Y, int a_Z)
 {
 	cItems Drops;
@@ -269,47 +345,87 @@ void cBlockHandler::DropBlock(cWorld *a_World, int a_X, int a_Y, int a_Z)
 	}
 }
 
+
+
+
+
 bool cBlockHandler::CanBePlacedAt(cWorld *a_World, int a_X, int a_Y, int a_Z, char a_Dir)
 {
 	return CanBeAt(a_World, a_X, a_Y, a_Z);
 }
 
+
+
+
+
 bool cBlockHandler::CanBeAt(cWorld *a_World, int a_X, int a_Y, int a_Z)
 {
 	return true;
 }
 
+
+
+
+
 bool cBlockHandler::IsUseable()
 {
 	return false;
 }
 
+
+
+
+
 bool cBlockHandler::IsClickedThrough()
 {
 	return false;
 }
 
+
+
+
+
 bool cBlockHandler::IgnoreBuildCollision()
 {
 	return m_BlockID == E_BLOCK_AIR;
 }
 
+
+
+
+
 bool cBlockHandler::NeedsRandomTicks()
 {
 	return false;
 }
 
+
+
+
+
 bool cBlockHandler::AllowBlockOnTop()
 {
 	return true;
 }
 
+
+
+
+
 bool cBlockHandler::CanBePlacedOnSide()
 {
 	return true;
 }
 
+
+
+
+
 bool cBlockHandler::DropOnUnsuitable()
 {
 	return true;
 }
+
+
+
+

source/cChunk.cpp

@@ -580,15 +580,22 @@ void cChunk::TickBlocks(MTRand & a_TickRandom)
 			
 			default:
 			{
-				cBlockHandler *Handler = BlockHandler(ID);
-				if(Handler->NeedsRandomTicks())
-					Handler->OnUpdate(m_World, m_BlockTickX + m_PosX*Width, m_BlockTickY, m_BlockTickZ + m_PosZ*Width);
+				cBlockHandler * Handler = BlockHandler(ID);
+				ASSERT(Handler != NULL);  // Happenned on server restart, FS #243
+				if (Handler->NeedsRandomTicks())
+				{
+					Handler->OnUpdate(m_World, m_BlockTickX + m_PosX * Width, m_BlockTickY, m_BlockTickZ + m_PosZ * Width);
+				}
 				break;
 			}
 		}
 	}
 }
 
+
+
+
+
 void cChunk::TickMelonPumpkin(int a_RelX, int a_RelY, int a_RelZ, int a_BlockIdx, BLOCKTYPE a_BlockType, MTRand & a_TickRandom)
 {
 	NIBBLETYPE Meta = GetMeta(a_BlockIdx);

source/items/Item.cpp

@@ -179,6 +179,7 @@ void cItemHandler::Deinit()
 	{
 		delete m_ItemHandler[i];
 	}
+	m_HandlerInitialized = false;
 }