summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@outlook.com>2020-05-03 00:10:54 +0200
committerTiger Wang <ziwei.tiger@outlook.com>2020-05-04 13:19:12 +0200
commit9b68fab8ed79437736f3f231d0169d063a2cd4ae (patch)
treeb508811e445b532e7a2895474958659257243008
parentAdded check if player is in spectator mode (#4709) (diff)
downloadcuberite-9b68fab8ed79437736f3f231d0169d063a2cd4ae.tar
cuberite-9b68fab8ed79437736f3f231d0169d063a2cd4ae.tar.gz
cuberite-9b68fab8ed79437736f3f231d0169d063a2cd4ae.tar.bz2
cuberite-9b68fab8ed79437736f3f231d0169d063a2cd4ae.tar.lz
cuberite-9b68fab8ed79437736f3f231d0169d063a2cd4ae.tar.xz
cuberite-9b68fab8ed79437736f3f231d0169d063a2cd4ae.tar.zst
cuberite-9b68fab8ed79437736f3f231d0169d063a2cd4ae.zip
-rw-r--r--src/Bindings/ManualBindings_BlockArea.cpp2
-rwxr-xr-xsrc/WorldStorage/WSSAnvil.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/Bindings/ManualBindings_BlockArea.cpp b/src/Bindings/ManualBindings_BlockArea.cpp
index 026e9bf2d..5af150599 100644
--- a/src/Bindings/ManualBindings_BlockArea.cpp
+++ b/src/Bindings/ManualBindings_BlockArea.cpp
@@ -836,7 +836,7 @@ static int GetRelBlock(lua_State * a_LuaState)
readVector3iOverloadParams(L, 2, coords, "coords");
if (!self->IsValidRelCoords(coords))
{
- return L.ApiParamError("The coords ({0}) are out of range ({1})",
+ return L.FApiParamError("The coords ({0}) are out of range ({1})",
coords, (self->GetSize() - Vector3i(1, 1, 1))
);
}
diff --git a/src/WorldStorage/WSSAnvil.cpp b/src/WorldStorage/WSSAnvil.cpp
index a5195196f..e7cd6e544 100755
--- a/src/WorldStorage/WSSAnvil.cpp
+++ b/src/WorldStorage/WSSAnvil.cpp
@@ -669,7 +669,7 @@ OwnedBlockEntity cWSSAnvil::LoadBlockEntityFromNBT(const cParsedNBT & a_NBT, int
{
TypeName.assign(a_NBT.GetData(TagID), static_cast<size_t>(a_NBT.GetDataLength(TagID)));
}
- LOGINFO("WorldLoader({0}): Block entity mismatch: block type {1} ({2}), type \"{3}\", at {4}; the entity will be lost.",
+ FLOGINFO("WorldLoader({0}): Block entity mismatch: block type {1} ({2}), type \"{3}\", at {4}; the entity will be lost.",
m_World->GetName(),
ItemTypeToString(a_BlockType), a_BlockType, TypeName,
a_Pos
@@ -879,7 +879,7 @@ bool cWSSAnvil::CheckBlockEntityType(const cParsedNBT & a_NBT, int a_TagIdx, con
expectedTypes.append(et);
expectedTypes.push_back('\"');
}
- LOGWARNING("Block entity type mismatch: exp {0}, got \"{1}\". The block entity at {2} will lose all its properties.",
+ FLOGWARNING("Block entity type mismatch: exp {0}, got \"{1}\". The block entity at {2} will lose all its properties.",
expectedTypes.c_str() + 2, // Skip the first ", " that is extra in the string
AString(a_NBT.GetData(TagID), static_cast<size_t>(a_NBT.GetDataLength(TagID))),
a_Pos