diff options
| -rw-r--r-- | src/Blocks/BlockHandler.cpp | 2 | ||||
| -rw-r--r-- | src/Blocks/Mixins.h | 22 |
2 files changed, 9 insertions, 15 deletions
diff --git a/src/Blocks/BlockHandler.cpp b/src/Blocks/BlockHandler.cpp index fd7ca2f52..2033923cd 100644 --- a/src/Blocks/BlockHandler.cpp +++ b/src/Blocks/BlockHandler.cpp @@ -97,7 +97,7 @@ -using cBlockGlazedTerracottaHandler = cClearMetaOnDrop<cYawRotator<cBlockHandler, 0x03, 0x01, 0x03, 0x00, 0x02>>; +using cBlockGlazedTerracottaHandler = cClearMetaOnDrop<cYawRotator<cBlockHandler, 0x03, 0x00, 0x01, 0x02, 0x03>>; diff --git a/src/Blocks/Mixins.h b/src/Blocks/Mixins.h index 24fad22be..62eaeae5c 100644 --- a/src/Blocks/Mixins.h +++ b/src/Blocks/Mixins.h @@ -217,27 +217,21 @@ public: value for a block placed by a player facing that way */ static NIBBLETYPE YawToMetaData(double a_Rotation) { - a_Rotation += 90 + 45; // So its not aligned with axis - - if (a_Rotation >= 360) - { - a_Rotation -= 360; - } - if ((a_Rotation >= 0) && (a_Rotation < 90)) + if ((a_Rotation >= -135) && (a_Rotation < -45)) { - return West; + return East; } - else if ((a_Rotation >= 90) && (a_Rotation < 180)) + else if ((a_Rotation >= -45) && (a_Rotation < 45)) { - return North; + return South; } - else if ((a_Rotation >= 180) && (a_Rotation < 270)) + else if ((a_Rotation >= 45) && (a_Rotation < 135)) { - return East; + return West; } - else // (a_Rotation >= 270) && (a_Rotation < 360) + else // degrees jumping from 180 to -180 { - return South; + return North; } } }; |