From 7dca4d15ef036a4693329c804efacba6184147aa Mon Sep 17 00:00:00 2001
From: TomyLobo <tomylobo@nurfuerspam.de>
Date: Wed, 2 Oct 2013 21:26:24 +0200
Subject: [PATCH] Made hay blocks rotate like logs.

They're textured like them, too, so it fits.
Also, they no longer violate the "flip twice equals rotate twice" conditions.
---
 .../java/com/sk89q/worldedit/blocks/BlockData.java   | 12 ++----------
 .../com/sk89q/worldedit/blocks/BlockDataTest.java    |  3 ---
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/sk89q/worldedit/blocks/BlockData.java b/src/main/java/com/sk89q/worldedit/blocks/BlockData.java
index 49479c7e0..3dbd9e1c7 100644
--- a/src/main/java/com/sk89q/worldedit/blocks/BlockData.java
+++ b/src/main/java/com/sk89q/worldedit/blocks/BlockData.java
@@ -169,6 +169,7 @@ public final class BlockData {
             }
             break;
 
+        case BlockID.HAY_BLOCK:
         case BlockID.LOG:
             if (data >= 4 && data <= 11) data ^= 0xc;
             break;
@@ -224,11 +225,6 @@ public final class BlockData {
         case BlockID.ANVIL:
             return data ^ 0x1;
 
-        case BlockID.HAY_BLOCK:
-            if (data == 4) return 8;
-            else if (data == 8) return 4;
-            else return 0; // sanitize extraneous data values since hay blocks are weird
-
         case BlockID.BED:
             return data & ~0x3 | (data + 1) & 0x3;
 
@@ -388,6 +384,7 @@ public final class BlockData {
             }
             break;
 
+        case BlockID.HAY_BLOCK:
         case BlockID.LOG:
             if (data >= 4 && data <= 11) data ^= 0xc;
             break;
@@ -442,11 +439,6 @@ public final class BlockData {
         case BlockID.ANVIL:
             return data ^ 0x1;
 
-        case BlockID.HAY_BLOCK:
-            if (data == 4) return 8;
-            else if (data == 8) return 4;
-            else return 0;
-
         case BlockID.BED:
             return data & ~0x3 | (data - 1) & 0x3;
 
diff --git a/src/test/java/com/sk89q/worldedit/blocks/BlockDataTest.java b/src/test/java/com/sk89q/worldedit/blocks/BlockDataTest.java
index 1b82117c3..4820ef717 100644
--- a/src/test/java/com/sk89q/worldedit/blocks/BlockDataTest.java
+++ b/src/test/java/com/sk89q/worldedit/blocks/BlockDataTest.java
@@ -34,9 +34,6 @@ public class BlockDataTest {
     @Test
     public void testRotateFlip() {
         for (int type = 0; type < 256; ++type) {
-            if (type == BlockID.HAY_BLOCK) {
-                continue; // not monotonous
-            }
             for (int data = 0; data < 16; ++data) {
                 final String message = type + "/" + data;