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

Actually for real fix unit tests.

Browse Source 
I promise this time.
Seriously though, who makes unit tests depend on some old,
hardcoded file that isn't even updated anymore.
This commit is contained in:
wizjany 2015-07-17 07:51:41 -04:00
parent 2aad68f80d
commit 1dd6faf786
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
worldedit-core/src/main/java/com/sk89q/worldedit/blocks/BlockData.java
View File

@ -207,6 +207,7 @@ public final class BlockData {
break; break;
case BlockID.TRAP_DOOR: case BlockID.TRAP_DOOR:
case BlockID.IRON_TRAP_DOOR:
int withoutOrientation = data & ~0x3; int withoutOrientation = data & ~0x3;
int orientation = data & 0x3; int orientation = data & 0x3;
switch (orientation) { switch (orientation) {
@ -241,8 +242,8 @@ public final class BlockData {
return ((data + 1) & 0x3) | (data & ~0x3); return ((data + 1) & 0x3) | (data & ~0x3);
case BlockID.ANVIL: case BlockID.ANVIL:
int damage = data & 0x4; int damage = data & ~0x3;
switch (data & ~0x4) { switch (data & 0x3) {
case 0: return 3 | damage; case 0: return 3 | damage;
case 2: return 1 | damage; case 2: return 1 | damage;
case 1: return 0 | damage; case 1: return 0 | damage;
@ -445,6 +446,7 @@ public final class BlockData {
break; break;
case BlockID.TRAP_DOOR: case BlockID.TRAP_DOOR:
case BlockID.IRON_TRAP_DOOR:
int withoutOrientation = data & ~0x3; int withoutOrientation = data & ~0x3;
int orientation = data & 0x3; int orientation = data & 0x3;
switch (orientation) { switch (orientation) {
@ -478,12 +480,12 @@ public final class BlockData {
return ((data + 3) & 0x3) | (data & ~0x3); return ((data + 3) & 0x3) | (data & ~0x3);
case BlockID.ANVIL: case BlockID.ANVIL:
int damage = data & 0x4; int damage = data & ~0x3;
switch (data & ~0x4) { switch (data & 0x3) {
case 0: return 1 | damage; case 0: return 1 | damage;
case 2: return 3 | damage; case 2: return 3 | damage;
case 1: return 0 | damage; case 1: return 2 | damage;
case 3: return 2 | damage; case 3: return 0 | damage;
} }
break; break;
@ -721,6 +723,7 @@ public final class BlockData {
break; break;
case BlockID.TRAP_DOOR: case BlockID.TRAP_DOOR:
case BlockID.IRON_TRAP_DOOR:
switch (data & 0x3) { switch (data & 0x3) {
case 0: case 0:
case 1: case 1:
@ -824,6 +827,18 @@ public final class BlockData {
return data ^ flipX; return data ^ flipX;
} }
break; break;
case BlockID.ANVIL:
switch (data & 0x3) {
case 0:
case 2:
return data ^ flipZ << 1;
case 1:
case 3:
return data ^ flipX << 1;
}
break;
} }
return data; return data;