summaryrefslogtreecommitdiffstats
path: root/src/UI/SlotArea.cpp
diff options
context:
space:
mode:
authorMaxwellScroggs <66567983+MaxwellScroggs@users.noreply.github.com>2020-07-04 23:49:17 +0200
committerGitHub <noreply@github.com>2020-07-04 23:49:17 +0200
commit5cdaf073be015a99e87dde4540405a69ff56eb47 (patch)
treea8730b445ea9620a603f21008c583412d6775cf2 /src/UI/SlotArea.cpp
parentMerged trivial item handlers into cSimplePlaceableItemHandler (#4766) (diff)
downloadcuberite-5cdaf073be015a99e87dde4540405a69ff56eb47.tar
cuberite-5cdaf073be015a99e87dde4540405a69ff56eb47.tar.gz
cuberite-5cdaf073be015a99e87dde4540405a69ff56eb47.tar.bz2
cuberite-5cdaf073be015a99e87dde4540405a69ff56eb47.tar.lz
cuberite-5cdaf073be015a99e87dde4540405a69ff56eb47.tar.xz
cuberite-5cdaf073be015a99e87dde4540405a69ff56eb47.tar.zst
cuberite-5cdaf073be015a99e87dde4540405a69ff56eb47.zip
Diffstat (limited to '')
-rw-r--r--src/UI/SlotArea.cpp18
1 files changed, 7 insertions, 11 deletions
diff --git a/src/UI/SlotArea.cpp b/src/UI/SlotArea.cpp
index cc662240b..0bbfb4b12 100644
--- a/src/UI/SlotArea.cpp
+++ b/src/UI/SlotArea.cpp
@@ -996,14 +996,12 @@ void cSlotAreaAnvil::OnTakeResult(cPlayer & a_Player)
m_MaximumCost = 0;
static_cast<cAnvilWindow &>(m_ParentWindow).SetRepairedItemName("", nullptr);
- int PosX, PosY, PosZ;
- static_cast<cAnvilWindow &>(m_ParentWindow).GetBlockPos(PosX, PosY, PosZ);
+ const Vector3i BlockPos = static_cast<cAnvilWindow &>(m_ParentWindow).GetBlockPos();
BLOCKTYPE Block;
NIBBLETYPE BlockMeta;
- a_Player.GetWorld()->GetBlockTypeMeta(PosX, PosY, PosZ, Block, BlockMeta);
+ a_Player.GetWorld()->GetBlockTypeMeta(BlockPos, Block, BlockMeta);
- const Vector3i BlockPos{PosX, PosY, PosZ};
if (!a_Player.IsGameModeCreative() && (Block == E_BLOCK_ANVIL) && GetRandomProvider().RandBool(0.12))
{
NIBBLETYPE Orientation = BlockMeta & 0x3;
@@ -1013,13 +1011,13 @@ void cSlotAreaAnvil::OnTakeResult(cPlayer & a_Player)
if (AnvilDamage > 2)
{
// Anvil will break
- a_Player.GetWorld()->SetBlock(PosX, PosY, PosZ, E_BLOCK_AIR, 0);
+ a_Player.GetWorld()->SetBlock(BlockPos, E_BLOCK_AIR, 0);
a_Player.GetWorld()->BroadcastSoundParticleEffect(EffectID::SFX_RANDOM_ANVIL_BREAK, BlockPos, 0);
a_Player.CloseWindow(false);
}
else
{
- a_Player.GetWorld()->SetBlockMeta(PosX, PosY, PosZ, static_cast<NIBBLETYPE>(Orientation | (AnvilDamage << 2)));
+ a_Player.GetWorld()->SetBlockMeta(BlockPos, static_cast<NIBBLETYPE>(Orientation | (AnvilDamage << 2)));
a_Player.GetWorld()->BroadcastSoundParticleEffect(EffectID::SFX_RANDOM_ANVIL_USE, BlockPos, 0);
}
}
@@ -1407,11 +1405,9 @@ void cSlotAreaBeacon::OnSlotChanged(cItemGrid * a_ItemGrid, int a_SlotNum)
////////////////////////////////////////////////////////////////////////////////
// cSlotAreaEnchanting:
-cSlotAreaEnchanting::cSlotAreaEnchanting(cWindow & a_ParentWindow, int a_BlockX, int a_BlockY, int a_BlockZ) :
+cSlotAreaEnchanting::cSlotAreaEnchanting(cWindow & a_ParentWindow, Vector3i a_BlockPos) :
cSlotAreaTemporary(2, a_ParentWindow),
- m_BlockX(a_BlockX),
- m_BlockY(a_BlockY),
- m_BlockZ(a_BlockZ)
+ m_BlockPos(a_BlockPos)
{
}
@@ -1644,7 +1640,7 @@ int cSlotAreaEnchanting::GetBookshelvesCount(cWorld & a_World)
{
int Bookshelves = 0;
cBlockArea Area;
- Area.Read(a_World, m_BlockX - 2, m_BlockX + 2, m_BlockY, m_BlockY + 1, m_BlockZ - 2, m_BlockZ + 2);
+ Area.Read(a_World, m_BlockPos - Vector3i(2, 0, 2), m_BlockPos + Vector3i(2, 1, 2));
static const struct
{