summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorpeterbell10 <peterbell10@live.co.uk>2018-07-19 23:36:46 +0200
committerGitHub <noreply@github.com>2018-07-19 23:36:46 +0200
commit211cec621e5e23e0e3a9c5e0880ddea24b6418c3 (patch)
treecd9c6a44a95baef198e871ca8c94cc7a20c004ad /src
parentAdd unbreaking for armor (#4220) (diff)
downloadcuberite-211cec621e5e23e0e3a9c5e0880ddea24b6418c3.tar
cuberite-211cec621e5e23e0e3a9c5e0880ddea24b6418c3.tar.gz
cuberite-211cec621e5e23e0e3a9c5e0880ddea24b6418c3.tar.bz2
cuberite-211cec621e5e23e0e3a9c5e0880ddea24b6418c3.tar.lz
cuberite-211cec621e5e23e0e3a9c5e0880ddea24b6418c3.tar.xz
cuberite-211cec621e5e23e0e3a9c5e0880ddea24b6418c3.tar.zst
cuberite-211cec621e5e23e0e3a9c5e0880ddea24b6418c3.zip
Diffstat (limited to 'src')
-rw-r--r--src/Bindings/ManualBindings_BlockArea.cpp32
-rw-r--r--src/BlockArea.h20
2 files changed, 39 insertions, 13 deletions
diff --git a/src/Bindings/ManualBindings_BlockArea.cpp b/src/Bindings/ManualBindings_BlockArea.cpp
index 038c571ac..126b35386 100644
--- a/src/Bindings/ManualBindings_BlockArea.cpp
+++ b/src/Bindings/ManualBindings_BlockArea.cpp
@@ -700,20 +700,23 @@ static int tolua_cBlockArea_Write(lua_State * a_LuaState)
// Check and get the overloaded params:
Vector3i coords;
- int dataTypes = cBlockArea::baTypes | cBlockArea::baMetas | cBlockArea::baBlockEntities;
+ int dataTypes = 0;
auto dataTypesIdx = readVector3iOverloadParams(L, 3, coords, "coords");
- L.GetStackValues(dataTypesIdx, dataTypes);
+ auto HasDataTypes = L.GetStackValues(dataTypesIdx, dataTypes);
// Check the dataType parameter validity:
- if (!cBlockArea::IsValidDataTypeCombination(dataTypes))
+ if (HasDataTypes)
{
- return L.ApiParamError("Invalid datatype combination (%d).", dataTypes);
- }
- if ((self->GetDataTypes() & dataTypes) != dataTypes)
- {
- return L.ApiParamError("Requesting datatypes not present in the cBlockArea. Got only 0x%02x, requested 0x%02x",
- self->GetDataTypes(), dataTypes
- );
+ if (!cBlockArea::IsValidDataTypeCombination(dataTypes))
+ {
+ return L.ApiParamError("Invalid datatype combination (%d).", dataTypes);
+ }
+ if ((self->GetDataTypes() & dataTypes) != dataTypes)
+ {
+ return L.ApiParamError("Requesting datatypes not present in the cBlockArea. Got only 0x%02x, requested 0x%02x",
+ self->GetDataTypes(), dataTypes
+ );
+ }
}
// Check and adjust the coord params:
@@ -735,7 +738,14 @@ static int tolua_cBlockArea_Write(lua_State * a_LuaState)
}
// Do the actual write:
- L.Push(self->Write(*world, coords, dataTypes));
+ if (HasDataTypes)
+ {
+ L.Push(self->Write(*world, coords, dataTypes));
+ }
+ else
+ {
+ L.Push(self->Write(*world, coords));
+ }
return 1;
}
diff --git a/src/BlockArea.h b/src/BlockArea.h
index 60a2821bd..4a68f9a31 100644
--- a/src/BlockArea.h
+++ b/src/BlockArea.h
@@ -120,11 +120,27 @@ public:
/** Writes the area back into cWorld at the coords specified. Returns true if successful in all chunks, false if only partially / not at all.
Doesn't wake up the simulators. */
- bool Write(cForEachChunkProvider & a_ForEachChunkProvider, int a_MinBlockX, int a_MinBlockY, int a_MinBlockZ, int a_DataTypes = baTypes | baMetas | baBlockEntities);
+ bool Write(cForEachChunkProvider & a_ForEachChunkProvider, int a_MinBlockX, int a_MinBlockY, int a_MinBlockZ, int a_DataTypes);
/** Writes the area back into cWorld at the coords specified. Returns true if successful in all chunks, false if only partially / not at all.
Doesn't wake up the simulators. */
- bool Write(cForEachChunkProvider & a_ForEachChunkProvider, const Vector3i & a_MinCoords, int a_DataTypes = baTypes | baMetas | baBlockEntities);
+ bool Write(cForEachChunkProvider & a_ForEachChunkProvider, int a_MinBlockX, int a_MinBlockY, int a_MinBlockZ)
+ {
+ // Write all available data
+ return Write(a_ForEachChunkProvider, a_MinBlockX, a_MinBlockY, a_MinBlockZ, GetDataTypes());
+ }
+
+ /** Writes the area back into cWorld at the coords specified. Returns true if successful in all chunks, false if only partially / not at all.
+ Doesn't wake up the simulators. */
+ bool Write(cForEachChunkProvider & a_ForEachChunkProvider, const Vector3i & a_MinCoords, int a_DataTypes);
+
+ /** Writes the area back into cWorld at the coords specified. Returns true if successful in all chunks, false if only partially / not at all.
+ Doesn't wake up the simulators. */
+ bool Write(cForEachChunkProvider & a_ForEachChunkProvider, const Vector3i & a_MinCoords)
+ {
+ // Write all available data
+ return Write(a_ForEachChunkProvider, a_MinCoords.x, a_MinCoords.y, a_MinCoords.z, GetDataTypes());
+ }
// tolua_begin