From eb7131bd126b06c348313de6ab07d5d59f7c79c0 Mon Sep 17 00:00:00 2001
From: "luksor111@gmail.com"
 <luksor111@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>
Date: Mon, 26 Nov 2012 10:03:34 +0000
Subject: Fixed certain blocks crashing clients when mined Fixed rail
 duplication glitch Fixed fall damage calculation Glass no longer drops glass

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1068 0a769ca7-a7f5-676a-18bf-c427514a06d6
---
 source/Blocks/BlockGlass.h     | 26 ++++++++++++++++++++++++++
 source/Blocks/BlockHandler.cpp |  2 ++
 source/Blocks/BlockOre.h       |  2 +-
 source/Blocks/BlockRail.h      |  3 ++-
 4 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 source/Blocks/BlockGlass.h

(limited to 'source/Blocks')

diff --git a/source/Blocks/BlockGlass.h b/source/Blocks/BlockGlass.h
new file mode 100644
index 000000000..d5147af96
--- /dev/null
+++ b/source/Blocks/BlockGlass.h
@@ -0,0 +1,26 @@
+
+#pragma once
+
+#include "BlockHandler.h"
+
+
+
+
+
+class cBlockGlassHandler :
+	public cBlockHandler
+{
+public:
+	cBlockGlassHandler(BLOCKTYPE a_BlockType)
+		: cBlockHandler(a_BlockType)
+	{
+	}
+
+	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
+	{
+	}
+} ;
+
+
+
+
diff --git a/source/Blocks/BlockHandler.cpp b/source/Blocks/BlockHandler.cpp
index 53e9c4a06..3f63de89f 100644
--- a/source/Blocks/BlockHandler.cpp
+++ b/source/Blocks/BlockHandler.cpp
@@ -46,6 +46,7 @@
 #include "BlockFarmland.h"
 #include "BlockMycelium.h"
 #include "BlockRail.h"
+#include "BlockGlass.h"
 
 
 
@@ -104,6 +105,7 @@ cBlockHandler * cBlockHandler::CreateBlockHandler(BLOCKTYPE a_BlockType)
 		case E_BLOCK_FURNACE:               return new cBlockFurnaceHandler         (a_BlockType);
 		case E_BLOCK_GLOWSTONE:             return new cBlockGlowstoneHandler       (a_BlockType);
 		case E_BLOCK_GOLD_ORE:              return new cBlockOreHandler             (a_BlockType);
+		case E_BLOCK_GLASS:                 return new cBlockGlassHandler           (a_BlockType);
 		case E_BLOCK_GRASS:                 return new cBlockDirtHandler            (a_BlockType);
 		case E_BLOCK_GRAVEL:                return new cBlockGravelHandler          (a_BlockType);
 		case E_BLOCK_ICE:                   return new cBlockIceHandler             (a_BlockType);
diff --git a/source/Blocks/BlockOre.h b/source/Blocks/BlockOre.h
index 50f5a88e2..1bfd8d17c 100644
--- a/source/Blocks/BlockOre.h
+++ b/source/Blocks/BlockOre.h
@@ -20,7 +20,7 @@ public:
 
 	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
 	{
-		short ItemType = E_ITEM_EMPTY;
+		short ItemType = m_BlockType;
 		char Count = 1;
 		short Meta = 0;
 		
diff --git a/source/Blocks/BlockRail.h b/source/Blocks/BlockRail.h
index fb2000884..24947c0bc 100644
--- a/source/Blocks/BlockRail.h
+++ b/source/Blocks/BlockRail.h
@@ -58,7 +58,8 @@ public:
 
 	virtual void OnNeighborChanged(cWorld *a_World, int a_BlockX, int a_BlockY, int a_BlockZ) override
 	{
-		if(IsUnstable(a_World, a_BlockX, a_BlockY, a_BlockZ))
+		char Meta = a_World->GetBlockMeta(a_BlockX, a_BlockY, a_BlockZ);
+		if(IsUnstable(a_World, a_BlockX, a_BlockY, a_BlockZ) && Meta != FindMeta(a_World, a_BlockX, a_BlockY, a_BlockZ))
 			a_World->FastSetBlock(a_BlockX, a_BlockY, a_BlockZ, m_BlockType, FindMeta(a_World, a_BlockX, a_BlockY, a_BlockZ));
 	}
 
-- 
cgit v1.2.3