summaryrefslogtreecommitdiffstats
path: root/src/BlockEntities
diff options
context:
space:
mode:
authorTycho <work.tycho+git@gmail.com>2014-03-17 17:44:34 +0100
committerTycho <work.tycho+git@gmail.com>2014-03-17 17:44:34 +0100
commit90ab055eab62b35a8ddc681e6d79aa1d42afae9f (patch)
treeb71798809ca05c1d904a18083a8c652a4954306a /src/BlockEntities
parentMade buffers static const (diff)
parentFixed double to float conversions. (diff)
downloadcuberite-90ab055eab62b35a8ddc681e6d79aa1d42afae9f.tar
cuberite-90ab055eab62b35a8ddc681e6d79aa1d42afae9f.tar.gz
cuberite-90ab055eab62b35a8ddc681e6d79aa1d42afae9f.tar.bz2
cuberite-90ab055eab62b35a8ddc681e6d79aa1d42afae9f.tar.lz
cuberite-90ab055eab62b35a8ddc681e6d79aa1d42afae9f.tar.xz
cuberite-90ab055eab62b35a8ddc681e6d79aa1d42afae9f.tar.zst
cuberite-90ab055eab62b35a8ddc681e6d79aa1d42afae9f.zip
Diffstat (limited to 'src/BlockEntities')
-rw-r--r--src/BlockEntities/DispenserEntity.cpp6
-rw-r--r--src/BlockEntities/HopperEntity.cpp2
2 files changed, 7 insertions, 1 deletions
diff --git a/src/BlockEntities/DispenserEntity.cpp b/src/BlockEntities/DispenserEntity.cpp
index cbfbb1b6a..e03bf776d 100644
--- a/src/BlockEntities/DispenserEntity.cpp
+++ b/src/BlockEntities/DispenserEntity.cpp
@@ -138,6 +138,12 @@ void cDispenserEntity::DropSpenseFromSlot(cChunk & a_Chunk, int a_SlotNum)
break;
}
+ case E_ITEM_FIRE_CHARGE:
+ {
+ // TODO: Spawn fireball entity
+ break;
+ }
+
default:
{
DropFromSlot(a_Chunk, a_SlotNum);
diff --git a/src/BlockEntities/HopperEntity.cpp b/src/BlockEntities/HopperEntity.cpp
index af7043767..41fb9f811 100644
--- a/src/BlockEntities/HopperEntity.cpp
+++ b/src/BlockEntities/HopperEntity.cpp
@@ -219,7 +219,7 @@ bool cHopperEntity::MovePickupsIn(cChunk & a_Chunk, Int64 a_CurrentTick)
Vector3f EntityPos = a_Entity->GetPosition();
Vector3f BlockPos(m_Pos.x + 0.5f, (float)m_Pos.y + 1, m_Pos.z + 0.5f); // One block above hopper, and search from center outwards
- float Distance = (EntityPos - BlockPos).Length();
+ double Distance = (EntityPos - BlockPos).Length();
if (Distance < 0.5)
{