summaryrefslogtreecommitdiffstats
path: root/src/Chunk.cpp
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2014-08-01 17:43:02 +0200
committerMattes D <github@xoft.cz>2014-08-01 17:43:02 +0200
commit35cfbfd51a15233bb0860804c525597d95260300 (patch)
treeb11052934d85badc24e2d17ef1e51b5ea64040ec /src/Chunk.cpp
parentMerge pull request #1270 from Howaner/Options (diff)
parentUse "default:" in switch. (diff)
downloadcuberite-35cfbfd51a15233bb0860804c525597d95260300.tar
cuberite-35cfbfd51a15233bb0860804c525597d95260300.tar.gz
cuberite-35cfbfd51a15233bb0860804c525597d95260300.tar.bz2
cuberite-35cfbfd51a15233bb0860804c525597d95260300.tar.lz
cuberite-35cfbfd51a15233bb0860804c525597d95260300.tar.xz
cuberite-35cfbfd51a15233bb0860804c525597d95260300.tar.zst
cuberite-35cfbfd51a15233bb0860804c525597d95260300.zip
Diffstat (limited to 'src/Chunk.cpp')
-rw-r--r--src/Chunk.cpp33
1 files changed, 33 insertions, 0 deletions
diff --git a/src/Chunk.cpp b/src/Chunk.cpp
index b83036b6d..cd7dc698c 100644
--- a/src/Chunk.cpp
+++ b/src/Chunk.cpp
@@ -11,6 +11,7 @@
#include "Server.h"
#include "zlib/zlib.h"
#include "Defines.h"
+#include "BlockEntities/BeaconEntity.h"
#include "BlockEntities/ChestEntity.h"
#include "BlockEntities/DispenserEntity.h"
#include "BlockEntities/DropperEntity.h"
@@ -2126,6 +2127,38 @@ bool cChunk::DoWithBlockEntityAt(int a_BlockX, int a_BlockY, int a_BlockZ, cBloc
+bool cChunk::DoWithBeaconAt(int a_BlockX, int a_BlockY, int a_BlockZ, cBeaconCallback & a_Callback)
+{
+ // The blockentity list is locked by the parent chunkmap's CS
+ for (cBlockEntityList::iterator itr = m_BlockEntities.begin(), itr2 = itr; itr != m_BlockEntities.end(); itr = itr2)
+ {
+ ++itr2;
+ if (((*itr)->GetPosX() != a_BlockX) || ((*itr)->GetPosY() != a_BlockY) || ((*itr)->GetPosZ() != a_BlockZ))
+ {
+ continue;
+ }
+ if ((*itr)->GetBlockType() != E_BLOCK_BEACON)
+ {
+ // There is a block entity here, but of different type. No other block entity can be here, so we can safely bail out
+ return false;
+ }
+
+ // The correct block entity is here
+ if (a_Callback.Item((cBeaconEntity *)*itr))
+ {
+ return false;
+ }
+ return true;
+ } // for itr - m_BlockEntitites[]
+
+ // Not found:
+ return false;
+}
+
+
+
+
+
bool cChunk::DoWithChestAt(int a_BlockX, int a_BlockY, int a_BlockZ, cChestCallback & a_Callback)
{
// The blockentity list is locked by the parent chunkmap's CS