summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormadmaxoft <github@xoft.cz>2014-04-23 23:06:29 +0200
committermadmaxoft <github@xoft.cz>2014-04-23 23:06:29 +0200
commit695baed22641aa420787d99cedae5aeb6d2938e7 (patch)
treedbf295b0be76e85e7c74ecb13aaee1ae381b735f
parentUpdated NetherFort prefabs to latest Gallery content. (diff)
downloadcuberite-695baed22641aa420787d99cedae5aeb6d2938e7.tar
cuberite-695baed22641aa420787d99cedae5aeb6d2938e7.tar.gz
cuberite-695baed22641aa420787d99cedae5aeb6d2938e7.tar.bz2
cuberite-695baed22641aa420787d99cedae5aeb6d2938e7.tar.lz
cuberite-695baed22641aa420787d99cedae5aeb6d2938e7.tar.xz
cuberite-695baed22641aa420787d99cedae5aeb6d2938e7.tar.zst
cuberite-695baed22641aa420787d99cedae5aeb6d2938e7.zip
Diffstat (limited to '')
-rw-r--r--MCServer/Plugins/APIDump/APIDesc.lua2
-rw-r--r--src/Enchantments.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/MCServer/Plugins/APIDump/APIDesc.lua b/MCServer/Plugins/APIDump/APIDesc.lua
index 45e8d9677..1423d64bc 100644
--- a/MCServer/Plugins/APIDump/APIDesc.lua
+++ b/MCServer/Plugins/APIDump/APIDesc.lua
@@ -699,7 +699,7 @@ end</pre>
GetLevel = { Params = "EnchantmentNumID", Return = "number", Notes = "Returns the level of the specified enchantment stored in this object; 0 if not stored" },
IsEmpty = { Params = "", Return = "bool", Notes = "Returns true if the object stores no enchantments" },
SetLevel = { Params = "EnchantmentNumID, Level", Return = "", Notes = "Sets the level for the specified enchantment, adding it if not stored before or removing it if level < = 0" },
- StringToEnchantmentID = { Params = "EnchantmentTextID", Return = "number", Notes = "(static) Returns the enchantment numerical ID, -1 if not understood. Case insensitive" },
+ StringToEnchantmentID = { Params = "EnchantmentTextID", Return = "number", Notes = "(static) Returns the enchantment numerical ID, -1 if not understood. Case insensitive. Also understands plain numbers." },
ToString = { Params = "", Return = "string", Notes = "Returns the string description of all the enchantments stored in this object, in numerical-ID form" },
},
Constants =
diff --git a/src/Enchantments.h b/src/Enchantments.h
index dc5502702..ec42257c8 100644
--- a/src/Enchantments.h
+++ b/src/Enchantments.h
@@ -99,7 +99,7 @@ public:
/** Returns true if there are no enchantments */
bool IsEmpty(void) const;
- /** Converts enchantment name to the numeric representation; returns -1 if enchantment name not found; case insensitive */
+ /** Converts enchantment name or ID (number in string) to the numeric representation; returns -1 if enchantment name not found; case insensitive */
static int StringToEnchantmentID(const AString & a_EnchantmentName);
/** Returns true if a_Other contains exactly the same enchantments and levels */