Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-23 09:47:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Made hay blocks rotate like logs.

Browse Source 
They're textured like them, too, so it fits.
Also, they no longer violate the "flip twice equals rotate twice" conditions.
This commit is contained in:
TomyLobo 2013-10-02 21:26:24 +02:00
parent 696a2819a7
commit 7dca4d15ef
2 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/sk89q/worldedit/blocks/BlockData.java
View File

@ -169,6 +169,7 @@ public final class BlockData {
} }
break; break;
case BlockID.HAY_BLOCK:
case BlockID.LOG: case BlockID.LOG:
if (data >= 4 && data <= 11) data ^= 0xc; if (data >= 4 && data <= 11) data ^= 0xc;
break; break;
@ -224,11 +225,6 @@ public final class BlockData {
case BlockID.ANVIL: case BlockID.ANVIL:
return data ^ 0x1; 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: case BlockID.BED:
return data & ~0x3 | (data + 1) & 0x3; return data & ~0x3 | (data + 1) & 0x3;
@ -388,6 +384,7 @@ public final class BlockData {
} }
break; break;
case BlockID.HAY_BLOCK:
case BlockID.LOG: case BlockID.LOG:
if (data >= 4 && data <= 11) data ^= 0xc; if (data >= 4 && data <= 11) data ^= 0xc;
break; break;
@ -442,11 +439,6 @@ public final class BlockData {
case BlockID.ANVIL: case BlockID.ANVIL:
return data ^ 0x1; return data ^ 0x1;
case BlockID.HAY_BLOCK:
if (data == 4) return 8;
else if (data == 8) return 4;
else return 0;
case BlockID.BED: case BlockID.BED:
return data & ~0x3 | (data - 1) & 0x3; return data & ~0x3 | (data - 1) & 0x3;

3
src/test/java/com/sk89q/worldedit/blocks/BlockDataTest.java
View File

@ -34,9 +34,6 @@ public class BlockDataTest {
@Test @Test
public void testRotateFlip() { public void testRotateFlip() {
for (int type = 0; type < 256; ++type) { for (int type = 0; type < 256; ++type) {
if (type == BlockID.HAY_BLOCK) {
continue; // not monotonous
}
for (int data = 0; data < 16; ++data) { for (int data = 0; data < 16; ++data) {
final String message = type + "/" + data; final String message = type + "/" + data;