summaryrefslogtreecommitdiffstats
path: root/src/Items
diff options
context:
space:
mode:
authorAlexander Harkness <me@bearbin.net>2020-04-08 22:35:08 +0200
committerAlexander Harkness <me@bearbin.net>2020-04-10 15:07:16 +0200
commitf40aba941eaf69b52ac0fbe3d8cea1ea349b97a6 (patch)
treed96f25621ab462bf3af7ff7403acb54c01a70595 /src/Items
parentBrewing stands do not have rotation (diff)
downloadcuberite-f40aba941eaf69b52ac0fbe3d8cea1ea349b97a6.tar
cuberite-f40aba941eaf69b52ac0fbe3d8cea1ea349b97a6.tar.gz
cuberite-f40aba941eaf69b52ac0fbe3d8cea1ea349b97a6.tar.bz2
cuberite-f40aba941eaf69b52ac0fbe3d8cea1ea349b97a6.tar.lz
cuberite-f40aba941eaf69b52ac0fbe3d8cea1ea349b97a6.tar.xz
cuberite-f40aba941eaf69b52ac0fbe3d8cea1ea349b97a6.tar.zst
cuberite-f40aba941eaf69b52ac0fbe3d8cea1ea349b97a6.zip
Diffstat (limited to '')
-rw-r--r--src/Items/ItemBed.h2
-rw-r--r--src/Items/ItemComparator.h4
-rw-r--r--src/Items/ItemDoor.h2
-rw-r--r--src/Items/ItemRedstoneRepeater.h2
4 files changed, 5 insertions, 5 deletions
diff --git a/src/Items/ItemBed.h b/src/Items/ItemBed.h
index 7f30a65c5..0f085d489 100644
--- a/src/Items/ItemBed.h
+++ b/src/Items/ItemBed.h
@@ -39,7 +39,7 @@ public:
}
// The "foot" block:
- NIBBLETYPE BlockMeta = cBlockBedHandler::RotationToMetaData(a_Player.GetYaw());
+ NIBBLETYPE BlockMeta = cBlockBedHandler::YawToMetaData(a_Player.GetYaw());
a_BlocksToPlace.emplace_back(a_BlockX, a_BlockY, a_BlockZ, E_BLOCK_BED, BlockMeta);
// Check if there is empty space for the "head" block:
diff --git a/src/Items/ItemComparator.h b/src/Items/ItemComparator.h
index fc843c186..6f32e229d 100644
--- a/src/Items/ItemComparator.h
+++ b/src/Items/ItemComparator.h
@@ -2,7 +2,7 @@
#pragma once
#include "ItemHandler.h"
-#include "../Blocks/BlockRedstoneRepeater.h"
+#include "../Blocks/BlockComparator.h"
@@ -30,7 +30,7 @@ public:
) override
{
a_BlockType = E_BLOCK_INACTIVE_COMPARATOR;
- a_BlockMeta = cBlockRedstoneRepeaterHandler::RepeaterRotationToMetaData(a_Player->GetYaw());
+ a_BlockMeta = cBlockComparatorHandler::YawToMetaData(a_Player->GetYaw());
return true;
}
} ;
diff --git a/src/Items/ItemDoor.h b/src/Items/ItemDoor.h
index 7c2f81ef9..790e08ffc 100644
--- a/src/Items/ItemDoor.h
+++ b/src/Items/ItemDoor.h
@@ -74,7 +74,7 @@ public:
}
// Get the coords of the neighboring blocks:
- NIBBLETYPE LowerBlockMeta = cBlockDoorHandler::PlayerYawToMetaData(a_Player.GetYaw());
+ NIBBLETYPE LowerBlockMeta = cBlockDoorHandler::YawToMetaData(a_Player.GetYaw());
Vector3i RelDirToOutside = cBlockDoorHandler::GetRelativeDirectionToOutside(LowerBlockMeta);
Vector3i LeftNeighborPos = RelDirToOutside;
LeftNeighborPos.TurnCW();
diff --git a/src/Items/ItemRedstoneRepeater.h b/src/Items/ItemRedstoneRepeater.h
index 13a797d00..9b0fc1bcc 100644
--- a/src/Items/ItemRedstoneRepeater.h
+++ b/src/Items/ItemRedstoneRepeater.h
@@ -30,7 +30,7 @@ public:
) override
{
a_BlockType = E_BLOCK_REDSTONE_REPEATER_OFF;
- a_BlockMeta = cBlockRedstoneRepeaterHandler::RepeaterRotationToMetaData(a_Player->GetYaw());
+ a_BlockMeta = cBlockRedstoneRepeaterHandler::YawToMetaData(a_Player->GetYaw());
return true;
}
} ;