From 84913299f45a28d3bd6146b3decbf14764449030 Mon Sep 17 00:00:00 2001
From: Tycho <work.tycho+git@gmail.com>
Date: Thu, 27 Feb 2014 11:33:35 -0800
Subject: Added some Metadate rotaters using templated Mixin

---
 src/Blocks/BlockComparator.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/Blocks/BlockComparator.h')

diff --git a/src/Blocks/BlockComparator.h b/src/Blocks/BlockComparator.h
index aba390d9d..7e672eece 100644
--- a/src/Blocks/BlockComparator.h
+++ b/src/Blocks/BlockComparator.h
@@ -9,11 +9,11 @@
 
 
 class cBlockComparatorHandler :
-	public cBlockHandler
+	public cMetaRotater<cBlockHandler,0x03,0x00,0x01,0x02,0x03>
 {
 public:
 	cBlockComparatorHandler(BLOCKTYPE a_BlockType)
-		: cBlockHandler(a_BlockType)
+		: cMetaRotater<cBlockHandler,0x03,0x00,0x01,0x02,0x03>(a_BlockType)
 	{
 	}
 
-- 
cgit v1.2.3


From 65edffd5b04623dcd4cebbd1afb2575e98eee5db Mon Sep 17 00:00:00 2001
From: Tycho <work.tycho+git@gmail.com>
Date: Sat, 1 Mar 2014 10:04:50 -0800
Subject: Implemented Rotations

---
 src/Blocks/BlockComparator.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/Blocks/BlockComparator.h')

diff --git a/src/Blocks/BlockComparator.h b/src/Blocks/BlockComparator.h
index 7e672eece..238e687ab 100644
--- a/src/Blocks/BlockComparator.h
+++ b/src/Blocks/BlockComparator.h
@@ -3,17 +3,18 @@
 
 #include "BlockHandler.h"
 #include "BlockRedstoneRepeater.h"
+#include "MetaRotater.h"
 
 
 
 
 
 class cBlockComparatorHandler :
-	public cMetaRotater<cBlockHandler,0x03,0x00,0x01,0x02,0x03>
+	public cMetaRotater<cBlockHandler,0x03,0x00,0x01,0x02,0x03, true>
 {
 public:
 	cBlockComparatorHandler(BLOCKTYPE a_BlockType)
-		: cMetaRotater<cBlockHandler,0x03,0x00,0x01,0x02,0x03>(a_BlockType)
+		: cMetaRotater<cBlockHandler,0x03,0x00,0x01,0x02,0x03, true>(a_BlockType)
 	{
 	}
 
-- 
cgit v1.2.3


From a38be148ba980e7d54bf72c9056502850d81c77a Mon Sep 17 00:00:00 2001
From: Tycho <work.tycho+git@gmail.com>
Date: Sun, 2 Mar 2014 12:33:08 -0800
Subject: Reformatted

---
 src/Blocks/BlockComparator.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/Blocks/BlockComparator.h')

diff --git a/src/Blocks/BlockComparator.h b/src/Blocks/BlockComparator.h
index 238e687ab..a8536b149 100644
--- a/src/Blocks/BlockComparator.h
+++ b/src/Blocks/BlockComparator.h
@@ -10,11 +10,11 @@
 
 
 class cBlockComparatorHandler :
-	public cMetaRotater<cBlockHandler,0x03,0x00,0x01,0x02,0x03, true>
+	public cMetaRotater<cBlockHandler, 0x03, 0x00, 0x01, 0x02, 0x03, true>
 {
 public:
 	cBlockComparatorHandler(BLOCKTYPE a_BlockType)
-		: cMetaRotater<cBlockHandler,0x03,0x00,0x01,0x02,0x03, true>(a_BlockType)
+		: cMetaRotater<cBlockHandler, 0x03, 0x00, 0x01, 0x02, 0x03, true>(a_BlockType)
 	{
 	}
 
-- 
cgit v1.2.3


From d4a5b16c52c41da59d2fe3405570653521e5d36e Mon Sep 17 00:00:00 2001
From: Howaner <franzi.moos@googlemail.com>
Date: Wed, 5 Mar 2014 15:10:20 +0100
Subject: Add data backsending, when the Client interacts a Block and the
 Interact is cancelled.

---
 src/Blocks/BlockComparator.h | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src/Blocks/BlockComparator.h')

diff --git a/src/Blocks/BlockComparator.h b/src/Blocks/BlockComparator.h
index aba390d9d..b0ac75aaf 100644
--- a/src/Blocks/BlockComparator.h
+++ b/src/Blocks/BlockComparator.h
@@ -26,6 +26,12 @@ public:
 	}
 
 
+	virtual void OnCancelRightClick(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace) override
+	{
+		a_Player->GetWorld()->SendBlockTo(a_BlockX, a_BlockY, a_BlockZ, a_Player);
+	}
+
+
 	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
 	{
 		// Reset meta to 0
-- 
cgit v1.2.3


From 594ddd86a04d895fdecb1cd4767031abc5c8dcca Mon Sep 17 00:00:00 2001
From: Howaner <franzi.moos@googlemail.com>
Date: Wed, 5 Mar 2014 19:33:43 +0100
Subject: Add SendBlockTo to cWorldInterface

---
 src/Blocks/BlockComparator.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/Blocks/BlockComparator.h')

diff --git a/src/Blocks/BlockComparator.h b/src/Blocks/BlockComparator.h
index b0ac75aaf..cea35a864 100644
--- a/src/Blocks/BlockComparator.h
+++ b/src/Blocks/BlockComparator.h
@@ -28,7 +28,8 @@ public:
 
 	virtual void OnCancelRightClick(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace) override
 	{
-		a_Player->GetWorld()->SendBlockTo(a_BlockX, a_BlockY, a_BlockZ, a_Player);
+		UNUSED(a_ChunkInterface);
+		a_WorldInterface.SendBlockTo(a_BlockX, a_BlockY, a_BlockZ, a_Player);
 	}
 
 
-- 
cgit v1.2.3


From 3df4f8609dc2e28c2328ddf448fa53f5483f4262 Mon Sep 17 00:00:00 2001
From: narroo <narroo@vt.edu>
Date: Tue, 25 Mar 2014 17:26:13 -0400
Subject: Fixed spelling; Rotater to Rotator.

---
 src/Blocks/BlockComparator.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/Blocks/BlockComparator.h')

diff --git a/src/Blocks/BlockComparator.h b/src/Blocks/BlockComparator.h
index e570ff302..4dd05366d 100644
--- a/src/Blocks/BlockComparator.h
+++ b/src/Blocks/BlockComparator.h
@@ -3,18 +3,18 @@
 
 #include "BlockHandler.h"
 #include "BlockRedstoneRepeater.h"
-#include "MetaRotater.h"
+#include "MetaRotator.h"
 
 
 
 
 
 class cBlockComparatorHandler :
-	public cMetaRotater<cBlockHandler, 0x03, 0x00, 0x01, 0x02, 0x03, true>
+	public cMetaRotator<cBlockHandler, 0x03, 0x00, 0x01, 0x02, 0x03, true>
 {
 public:
 	cBlockComparatorHandler(BLOCKTYPE a_BlockType)
-		: cMetaRotater<cBlockHandler, 0x03, 0x00, 0x01, 0x02, 0x03, true>(a_BlockType)
+		: cMetaRotator<cBlockHandler, 0x03, 0x00, 0x01, 0x02, 0x03, true>(a_BlockType)
 	{
 	}
 
-- 
cgit v1.2.3