summaryrefslogtreecommitdiffstats
path: root/src/BlockEntities
diff options
context:
space:
mode:
authorpeterbell10 <peterbell10@live.co.uk>2018-07-26 23:24:36 +0200
committerGitHub <noreply@github.com>2018-07-26 23:24:36 +0200
commit950aeffff8d641a0855fbd9a9b2993d9dfd7d2c3 (patch)
tree5e6fde4625714922e970bd5ad4ea339f58ab6b57 /src/BlockEntities
parentAt long last... Piston animations! (diff)
downloadcuberite-950aeffff8d641a0855fbd9a9b2993d9dfd7d2c3.tar
cuberite-950aeffff8d641a0855fbd9a9b2993d9dfd7d2c3.tar.gz
cuberite-950aeffff8d641a0855fbd9a9b2993d9dfd7d2c3.tar.bz2
cuberite-950aeffff8d641a0855fbd9a9b2993d9dfd7d2c3.tar.lz
cuberite-950aeffff8d641a0855fbd9a9b2993d9dfd7d2c3.tar.xz
cuberite-950aeffff8d641a0855fbd9a9b2993d9dfd7d2c3.tar.zst
cuberite-950aeffff8d641a0855fbd9a9b2993d9dfd7d2c3.zip
Diffstat (limited to 'src/BlockEntities')
-rw-r--r--src/BlockEntities/BrewingstandEntity.cpp9
-rw-r--r--src/BlockEntities/ChestEntity.cpp1
-rw-r--r--src/BlockEntities/CommandBlockEntity.cpp1
-rw-r--r--src/BlockEntities/DispenserEntity.cpp2
-rw-r--r--src/BlockEntities/FurnaceEntity.cpp2
-rw-r--r--src/BlockEntities/MobHeadEntity.cpp1
6 files changed, 4 insertions, 12 deletions
diff --git a/src/BlockEntities/BrewingstandEntity.cpp b/src/BlockEntities/BrewingstandEntity.cpp
index 94fcdcbe6..c743783e6 100644
--- a/src/BlockEntities/BrewingstandEntity.cpp
+++ b/src/BlockEntities/BrewingstandEntity.cpp
@@ -11,13 +11,6 @@
-
-
-
-
-
-
-
cBrewingstandEntity::cBrewingstandEntity(BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World):
Super(a_BlockType, a_BlockMeta, a_BlockX, a_BlockY, a_BlockZ, ContentsWidth, ContentsHeight, a_World),
m_IsDestroyed(false),
@@ -160,7 +153,6 @@ bool cBrewingstandEntity::Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk)
-
bool cBrewingstandEntity::UsedBy(cPlayer * a_Player)
{
cWindow * Window = GetWindow();
@@ -207,7 +199,6 @@ void cBrewingstandEntity::BroadcastProgress(short a_ProgressbarID, short a_Value
-
void cBrewingstandEntity::OnSlotChanged(cItemGrid * a_ItemGrid, int a_SlotNum)
{
Super::OnSlotChanged(a_ItemGrid, a_SlotNum);
diff --git a/src/BlockEntities/ChestEntity.cpp b/src/BlockEntities/ChestEntity.cpp
index beffa84de..c650eb530 100644
--- a/src/BlockEntities/ChestEntity.cpp
+++ b/src/BlockEntities/ChestEntity.cpp
@@ -31,6 +31,7 @@ cChestEntity::cChestEntity(BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, int a_
+
cChestEntity::~cChestEntity()
{
if (m_Neighbour != nullptr)
diff --git a/src/BlockEntities/CommandBlockEntity.cpp b/src/BlockEntities/CommandBlockEntity.cpp
index 6b9862a99..3342ac1ed 100644
--- a/src/BlockEntities/CommandBlockEntity.cpp
+++ b/src/BlockEntities/CommandBlockEntity.cpp
@@ -29,7 +29,6 @@ cCommandBlockEntity::cCommandBlockEntity(BLOCKTYPE a_BlockType, NIBBLETYPE a_Blo
-
bool cCommandBlockEntity::UsedBy(cPlayer * a_Player)
{
// Nothing to do
diff --git a/src/BlockEntities/DispenserEntity.cpp b/src/BlockEntities/DispenserEntity.cpp
index cf2b2f71b..249952c7a 100644
--- a/src/BlockEntities/DispenserEntity.cpp
+++ b/src/BlockEntities/DispenserEntity.cpp
@@ -290,6 +290,8 @@ UInt32 cDispenserEntity::SpawnProjectileFromDispenser(int a_BlockX, int a_BlockY
+
+
Vector3d cDispenserEntity::GetShootVector(NIBBLETYPE a_Meta)
{
switch (a_Meta & E_META_DROPSPENSER_FACING_MASK)
diff --git a/src/BlockEntities/FurnaceEntity.cpp b/src/BlockEntities/FurnaceEntity.cpp
index 0813927f2..ea58cc4fd 100644
--- a/src/BlockEntities/FurnaceEntity.cpp
+++ b/src/BlockEntities/FurnaceEntity.cpp
@@ -11,7 +11,6 @@
-
enum
{
PROGRESSBAR_FUEL = 0,
@@ -282,7 +281,6 @@ void cFurnaceEntity::OnSlotChanged(cItemGrid * a_ItemGrid, int a_SlotNum)
-
void cFurnaceEntity::UpdateInput(void)
{
if (!m_Contents.GetSlot(fsInput).IsEqual(m_LastInput))
diff --git a/src/BlockEntities/MobHeadEntity.cpp b/src/BlockEntities/MobHeadEntity.cpp
index 5438bbb26..a63edcc01 100644
--- a/src/BlockEntities/MobHeadEntity.cpp
+++ b/src/BlockEntities/MobHeadEntity.cpp
@@ -40,6 +40,7 @@ void cMobHeadEntity::CopyFrom(const cBlockEntity & a_Src)
+
bool cMobHeadEntity::UsedBy(cPlayer * a_Player)
{
UNUSED(a_Player);