diff options
author | peterbell10 <peterbell10@live.co.uk> | 2018-09-24 22:33:39 +0200 |
---|---|---|
committer | Alexander Harkness <me@bearbin.net> | 2018-09-24 22:33:39 +0200 |
commit | 4727ed20846bb3d1a9eabb27aaaa9c5524129556 (patch) | |
tree | d6206a51db95a15fd3dfadb9691c868fc6bd8bd1 /src/WorldStorage/WSSAnvil.cpp | |
parent | Add BurnsInDaylight to Lua API and Monsters.ini (#4295) (diff) | |
download | cuberite-4727ed20846bb3d1a9eabb27aaaa9c5524129556.tar cuberite-4727ed20846bb3d1a9eabb27aaaa9c5524129556.tar.gz cuberite-4727ed20846bb3d1a9eabb27aaaa9c5524129556.tar.bz2 cuberite-4727ed20846bb3d1a9eabb27aaaa9c5524129556.tar.lz cuberite-4727ed20846bb3d1a9eabb27aaaa9c5524129556.tar.xz cuberite-4727ed20846bb3d1a9eabb27aaaa9c5524129556.tar.zst cuberite-4727ed20846bb3d1a9eabb27aaaa9c5524129556.zip |
Diffstat (limited to 'src/WorldStorage/WSSAnvil.cpp')
-rwxr-xr-x | src/WorldStorage/WSSAnvil.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/WorldStorage/WSSAnvil.cpp b/src/WorldStorage/WSSAnvil.cpp index db4af6032..d2f3284f5 100755 --- a/src/WorldStorage/WSSAnvil.cpp +++ b/src/WorldStorage/WSSAnvil.cpp @@ -727,10 +727,10 @@ cBlockEntity * cWSSAnvil::LoadBlockEntityFromNBT(const cParsedNBT & a_NBT, int a { TypeName.assign(a_NBT.GetData(TagID), static_cast<size_t>(a_NBT.GetDataLength(TagID))); } - LOGINFO("WorldLoader(%s): Block entity mismatch: block type %s (%d), type \"%s\", at {%d, %d, %d}; the entity will be lost.", - m_World->GetName().c_str(), - ItemTypeToString(a_BlockType).c_str(), a_BlockType, TypeName.c_str(), - a_BlockX, a_BlockY, a_BlockZ + LOGINFO("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, + Vector3i{a_BlockX, a_BlockY, a_BlockZ} ); return nullptr; } @@ -937,10 +937,10 @@ bool cWSSAnvil::CheckBlockEntityType(const cParsedNBT & a_NBT, int a_TagIdx, con expectedTypes.append(et); expectedTypes.push_back('\"'); } - LOGWARNING("Block entity type mismatch: exp %s, got \"%s\". The block entity at {%d, %d, %d} will lose all its properties.", + LOGWARNING("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))).c_str(), - a_BlockX, a_BlockY, a_BlockZ + AString(a_NBT.GetData(TagID), static_cast<size_t>(a_NBT.GetDataLength(TagID))), + Vector3i{a_BlockX, a_BlockY, a_BlockZ} ); return false; } |