diff options
author | Mattes D <github@xoft.cz> | 2014-11-04 15:45:08 +0100 |
---|---|---|
committer | Mattes D <github@xoft.cz> | 2014-11-04 15:45:08 +0100 |
commit | 6201b3602c2f82fd9de68404a9e742c9cf3c6554 (patch) | |
tree | e086038a40a07eba6be7a10a18f9cc95527fc729 /src/BlockID.cpp | |
parent | Moved the chrono include into Globals. (diff) | |
parent | WebAdmin: Fixed login template destination address. (diff) | |
download | cuberite-6201b3602c2f82fd9de68404a9e742c9cf3c6554.tar cuberite-6201b3602c2f82fd9de68404a9e742c9cf3c6554.tar.gz cuberite-6201b3602c2f82fd9de68404a9e742c9cf3c6554.tar.bz2 cuberite-6201b3602c2f82fd9de68404a9e742c9cf3c6554.tar.lz cuberite-6201b3602c2f82fd9de68404a9e742c9cf3c6554.tar.xz cuberite-6201b3602c2f82fd9de68404a9e742c9cf3c6554.tar.zst cuberite-6201b3602c2f82fd9de68404a9e742c9cf3c6554.zip |
Diffstat (limited to 'src/BlockID.cpp')
-rw-r--r-- | src/BlockID.cpp | 7 |
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); } |