diff options
| author | Mattes D <github@xoft.cz> | 2020-04-13 18:38:06 +0200 |
|---|---|---|
| committer | Alexander Harkness <me@bearbin.net> | 2020-04-16 22:07:48 +0200 |
| commit | 9ee47e59995f858ec531b3ee467f131594e4ba1f (patch) | |
| tree | f005d8af4a0362d7eab8a96a71aca0d73275f8e1 /src/Blocks/Mixins.h | |
| parent | Prevent crash when breeding (diff) | |
| download | cuberite-9ee47e59995f858ec531b3ee467f131594e4ba1f.tar cuberite-9ee47e59995f858ec531b3ee467f131594e4ba1f.tar.gz cuberite-9ee47e59995f858ec531b3ee467f131594e4ba1f.tar.bz2 cuberite-9ee47e59995f858ec531b3ee467f131594e4ba1f.tar.lz cuberite-9ee47e59995f858ec531b3ee467f131594e4ba1f.tar.xz cuberite-9ee47e59995f858ec531b3ee467f131594e4ba1f.tar.zst cuberite-9ee47e59995f858ec531b3ee467f131594e4ba1f.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/Blocks/Mixins.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/Blocks/Mixins.h b/src/Blocks/Mixins.h index 1ee2876d3..cddbb4850 100644 --- a/src/Blocks/Mixins.h +++ b/src/Blocks/Mixins.h @@ -184,11 +184,11 @@ template < class cYawRotator: public cMetaRotator<Base, BitMask, North, East, South, West, AssertIfNotMatched> { - using super = cMetaRotator<Base, BitMask, North, East, South, West, AssertIfNotMatched>; + using Super = cMetaRotator<Base, BitMask, North, East, South, West, AssertIfNotMatched>; public: cYawRotator(BLOCKTYPE a_BlockType): - super(a_BlockType) + Super(a_BlockType) {} @@ -203,7 +203,7 @@ public: ) override { NIBBLETYPE BaseMeta; - if (!super::GetPlacementBlockTypeMeta(a_ChunkInterface, a_Player, a_BlockX, a_BlockY, a_BlockZ, a_BlockFace, a_CursorX, a_CursorY, a_CursorZ, a_BlockType, BaseMeta)) + if (!Super::GetPlacementBlockTypeMeta(a_ChunkInterface, a_Player, a_BlockX, a_BlockY, a_BlockZ, a_BlockFace, a_CursorX, a_CursorY, a_CursorZ, a_BlockType, BaseMeta)) { return false; } @@ -258,11 +258,11 @@ template < class cPitchYawRotator: public cYawRotator<Base, BitMask, North, East, South, West> { - using super = cYawRotator<Base, BitMask, North, East, South, West>; + using Super = cYawRotator<Base, BitMask, North, East, South, West>; public: cPitchYawRotator(BLOCKTYPE a_BlockType): - super(a_BlockType) + Super(a_BlockType) {} @@ -277,7 +277,7 @@ public: ) override { NIBBLETYPE BaseMeta; - if (!super::GetPlacementBlockTypeMeta(a_ChunkInterface, a_Player, a_BlockX, a_BlockY, a_BlockZ, a_BlockFace, a_CursorX, a_CursorY, a_CursorZ, a_BlockType, BaseMeta)) + if (!Super::GetPlacementBlockTypeMeta(a_ChunkInterface, a_Player, a_BlockX, a_BlockY, a_BlockZ, a_BlockFace, a_CursorX, a_CursorY, a_CursorZ, a_BlockType, BaseMeta)) { return false; } @@ -319,6 +319,6 @@ public: return Down; } - return super::YawToMetaData(a_Rotation); + return Super::YawToMetaData(a_Rotation); } }; |