summaryrefslogtreecommitdiffstats
path: root/src/BlockID.cpp
diff options
context:
space:
mode:
authorHowaner <franzi.moos@googlemail.com>2014-10-29 15:47:43 +0100
committerHowaner <franzi.moos@googlemail.com>2014-10-29 15:47:43 +0100
commit165533c27e380300f5e9411e4d46aa553bf2fdeb (patch)
tree43821c2e6604e563f5e9a1cc4e9be054d62d7a23 /src/BlockID.cpp
parentQtBiomeVisualiser: Added quick shutdown to region loaders. (diff)
downloadcuberite-165533c27e380300f5e9411e4d46aa553bf2fdeb.tar
cuberite-165533c27e380300f5e9411e4d46aa553bf2fdeb.tar.gz
cuberite-165533c27e380300f5e9411e4d46aa553bf2fdeb.tar.bz2
cuberite-165533c27e380300f5e9411e4d46aa553bf2fdeb.tar.lz
cuberite-165533c27e380300f5e9411e4d46aa553bf2fdeb.tar.xz
cuberite-165533c27e380300f5e9411e4d46aa553bf2fdeb.tar.zst
cuberite-165533c27e380300f5e9411e4d46aa553bf2fdeb.zip
Diffstat (limited to '')
-rw-r--r--src/BlockID.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/BlockID.cpp b/src/BlockID.cpp
index c0f3193bb..c98e0cad1 100644
--- a/src/BlockID.cpp
+++ b/src/BlockID.cpp
@@ -217,7 +217,12 @@ BLOCKTYPE BlockStringToType(const AString & a_BlockTypeString)
bool StringToItem(const AString & a_ItemTypeString, cItem & a_Item)
{
- return gsBlockIDMap.ResolveItem(TrimString(a_ItemTypeString), a_Item);
+ AString ItemName = TrimString(a_ItemTypeString);
+ if (ItemName.substr(0, 10) == "minecraft:")
+ {
+ ItemName = ItemName.substr(10);
+ }
+ return gsBlockIDMap.ResolveItem(ItemName, a_Item);
}