summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2015-10-05 21:15:08 +0200
committerMattes D <github@xoft.cz>2015-10-05 21:15:08 +0200
commit60800655c8cc152f3b44103163307a992f1d64cd (patch)
tree4326c435c4f4cde6ba66085e2adedede486e7d88 /src
parentMerge pull request #2525 from cuberite/StreamPerf (diff)
downloadcuberite-60800655c8cc152f3b44103163307a992f1d64cd.tar
cuberite-60800655c8cc152f3b44103163307a992f1d64cd.tar.gz
cuberite-60800655c8cc152f3b44103163307a992f1d64cd.tar.bz2
cuberite-60800655c8cc152f3b44103163307a992f1d64cd.tar.lz
cuberite-60800655c8cc152f3b44103163307a992f1d64cd.tar.xz
cuberite-60800655c8cc152f3b44103163307a992f1d64cd.tar.zst
cuberite-60800655c8cc152f3b44103163307a992f1d64cd.zip
Diffstat (limited to '')
-rw-r--r--src/Generating/Prefab.h3
-rw-r--r--src/Generating/PrefabPiecePool.cpp1
2 files changed, 4 insertions, 0 deletions
diff --git a/src/Generating/Prefab.h b/src/Generating/Prefab.h
index 45af4b282..c62a68f97 100644
--- a/src/Generating/Prefab.h
+++ b/src/Generating/Prefab.h
@@ -146,6 +146,9 @@ public:
/** Sets the flag whether the lowest layer of the prefab should be repeated downwards until it hits a solid block. */
void SetExtendFloor(bool a_ShouldExtendFloor) { m_ShouldExtendFloor = a_ShouldExtendFloor; }
+ /** Sets the internal hitbox to the specified value. */
+ void SetHitBox(const cCuboid & a_HitBox) { m_HitBox = a_HitBox; }
+
protected:
/** Packs complete definition of a single block, for per-letter assignment. */
struct sBlockTypeDef
diff --git a/src/Generating/PrefabPiecePool.cpp b/src/Generating/PrefabPiecePool.cpp
index e2273aed3..8431500ce 100644
--- a/src/Generating/PrefabPiecePool.cpp
+++ b/src/Generating/PrefabPiecePool.cpp
@@ -287,6 +287,7 @@ bool cPrefabPiecePool::LoadCubesetPieceVer1(const AString & a_FileName, cLuaStat
{
return false;
}
+ prefab->SetHitBox(Hitbox);
// Read the connectors
if (!ReadConnectorsCubesetVer1(a_FileName, a_LuaState, PieceName, prefab.get(), a_LogWarnings))