Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-06-11 20:13:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added a test case for BlockData.

Browse Source 
Fixed some non-breaking inaccuracies to make the test case work.
This commit is contained in:
TomyLobo
2011-09-25 06:03:55 +02:00
parent 63fa72af5e
commit 93f36955ca
2 changed files with 71 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/main/java/com/sk89q/worldedit/data/BlockData.java
View File

@ -145,13 +145,13 @@ public final class BlockData {
break;
case BlockID.TRAP_DOOR:
int open = data & 0x4;
int withoutOpen = data & ~0x4;
switch (withoutOpen) {
case 0: return 3 | open;
case 1: return 2 | open;
case 2: return 0 | open;
case 3: return 1 | open;
int withoutOrientation = data & ~0x3;
int orientation = data & 0x3;
switch (orientation) {
case 0: return 3 | withoutOrientation;
case 1: return 2 | withoutOrientation;
case 2: return 0 | withoutOrientation;
case 3: return 1 | withoutOrientation;
}
break;
@ -302,13 +302,13 @@ public final class BlockData {
break;
case BlockID.TRAP_DOOR:
int open = data & 0x4;
int withoutOpen = data & ~0x4;
switch (withoutOpen) {
case 3: return 0 | open;
case 2: return 1 | open;
case 0: return 2 | open;
case 1: return 3 | open;
int withoutOrientation = data & ~0x3;
int orientation = data & 0x3;
switch (orientation) {
case 3: return 0 | withoutOrientation;
case 2: return 1 | withoutOrientation;
case 0: return 2 | withoutOrientation;
case 1: return 3 | withoutOrientation;
}
case BlockID.PISTON_BASE:
@ -380,6 +380,10 @@ public final class BlockData {
case BlockID.TORCH:
case BlockID.REDSTONE_TORCH_OFF:
case BlockID.REDSTONE_TORCH_ON:
if (data > 4)
break;
/* FALL-THROUGH */
case BlockID.LEVER:
case BlockID.STONE_BUTTON:
switch (data & ~0x8) {
@ -470,6 +474,10 @@ public final class BlockData {
case BlockID.PUMPKIN:
case BlockID.JACKOLANTERN:
if (data > 3)
break;
/* FALL-THROUGH */
case BlockID.REDSTONE_REPEATER_OFF:
case BlockID.REDSTONE_REPEATER_ON:
switch (data & 0x3) {