Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-07-08 18:00:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Swapped flipY and flipZ in BlockData.flip and formatted the function more consistently.

Browse Source
This commit is contained in:
TomyLobo 2011-09-23 06:44:31 +02:00
parent 2f19edca2a
commit 4b760fd17b
1 changed files with 31 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -338,11 +338,11 @@ public final class BlockData {
break; break;
case WEST_EAST: case WEST_EAST:
flipY = 1; flipZ = 1;
break; break;
case UP_DOWN: case UP_DOWN:
flipZ = 1; flipY = 1;
break; break;
} }
@ -355,17 +355,17 @@ public final class BlockData {
switch (data & ~0x8) { switch (data & ~0x8) {
case 1: return data + flipX; case 1: return data + flipX;
case 2: return data - flipX; case 2: return data - flipX;
case 3: return data + flipY; case 3: return data + flipZ;
case 4: return data - flipY; case 4: return data - flipZ;
} }
break; break;
case BlockID.MINECART_TRACKS: case BlockID.MINECART_TRACKS:
switch (data) { switch (data) {
case 6: return data + flipX + 3*flipY; case 6: return data + flipX + 3*flipZ;
case 7: return data - flipX + flipY; case 7: return data - flipX + flipZ;
case 8: return data + flipX - flipY; case 8: return data + flipX - flipZ;
case 9: return data - flipX - 3*flipY; case 9: return data - flipX - 3*flipZ;
} }
/* FALL-THROUGH */ /* FALL-THROUGH */
@ -379,15 +379,18 @@ public final class BlockData {
case 2: case 2:
case 3: case 3:
return data ^ flipX; return data ^ flipX;
case 4: case 4:
case 5: case 5:
return data ^ flipY; return data ^ flipZ;
} }
break; break;
case BlockID.WOODEN_STAIRS: case BlockID.WOODEN_STAIRS:
case BlockID.COBBLESTONE_STAIRS: case BlockID.COBBLESTONE_STAIRS:
case BlockID.BRICK_STAIRS:
case BlockID.STONE_BRICK_STAIRS:
switch (data) { switch (data) {
case 0: case 0:
case 1: case 1:
@ -395,18 +398,18 @@ public final class BlockData {
case 2: case 2:
case 3: case 3:
return data ^ flipY; return data ^ flipZ;
} }
break; break;
case BlockID.WOODEN_DOOR: case BlockID.WOODEN_DOOR:
case BlockID.IRON_DOOR: case BlockID.IRON_DOOR:
data ^= flipZ << 3; data ^= flipY << 3;
switch (data & 0x3) { switch (data & 0x3) {
case 0: return data + flipX + 3*flipY; case 0: return data + flipX + 3*flipZ;
case 1: return data - flipX + flipY; case 1: return data - flipX + flipZ;
case 2: return data + flipX - flipY; case 2: return data + flipX - flipZ;
case 3: return data - flipX - 3*flipY; case 3: return data - flipX - 3*flipZ;
} }
break; break;
@ -414,6 +417,7 @@ public final class BlockData {
switch (direction) { switch (direction) {
case NORTH_SOUTH: case NORTH_SOUTH:
return (16-data) & 0xf; return (16-data) & 0xf;
case WEST_EAST: case WEST_EAST:
return (8-data) & 0xf; return (8-data) & 0xf;
} }
@ -427,7 +431,8 @@ public final class BlockData {
switch (data) { switch (data) {
case 2: case 2:
case 3: case 3:
return data ^ flipY; return data ^ flipZ;
case 4: case 4:
case 5: case 5:
return data ^ flipX; return data ^ flipX;
@ -441,7 +446,8 @@ public final class BlockData {
switch (data & 0x3) { switch (data & 0x3) {
case 0: case 0:
case 2: case 2:
return data ^ (flipY<<1); return data ^ (flipZ<<1);
case 1: case 1:
case 3: case 3:
return data ^ (flipX<<1); return data ^ (flipX<<1);
@ -452,7 +458,8 @@ public final class BlockData {
switch (data & 0x3) { switch (data & 0x3) {
case 0: case 0:
case 1: case 1:
return data ^ flipY; return data ^ flipZ;
case 2: case 2:
case 3: case 3:
return data ^ flipX; return data ^ flipX;
@ -462,17 +469,20 @@ public final class BlockData {
case BlockID.PISTON_BASE: case BlockID.PISTON_BASE:
case BlockID.PISTON_STICKY_BASE: case BlockID.PISTON_STICKY_BASE:
case BlockID.PISTON_EXTENSION: case BlockID.PISTON_EXTENSION:
switch(data & ~0x8) { switch (data & ~0x8) {
case 0: case 0:
case 1: case 1:
return data ^ flipZ; return data ^ flipY;
case 2: case 2:
case 3: case 3:
return data ^ flipY; return data ^ flipZ;
case 4: case 4:
case 5: case 5:
return data ^ flipX; return data ^ flipX;
} }
break;
} }
return data; return data;