summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormadmaxoft <github@xoft.cz>2013-10-02 08:49:15 +0200
committermadmaxoft <github@xoft.cz>2013-10-02 08:49:15 +0200
commit02c41b6f1dd8b0a197997c0e73f81d00493ac863 (patch)
tree1e22a993f8c0469d1b76ffcc5e5813246d7fb200
parentMerge pull request #201 from SamJBarney/master (diff)
downloadcuberite-02c41b6f1dd8b0a197997c0e73f81d00493ac863.tar
cuberite-02c41b6f1dd8b0a197997c0e73f81d00493ac863.tar.gz
cuberite-02c41b6f1dd8b0a197997c0e73f81d00493ac863.tar.bz2
cuberite-02c41b6f1dd8b0a197997c0e73f81d00493ac863.tar.lz
cuberite-02c41b6f1dd8b0a197997c0e73f81d00493ac863.tar.xz
cuberite-02c41b6f1dd8b0a197997c0e73f81d00493ac863.tar.zst
cuberite-02c41b6f1dd8b0a197997c0e73f81d00493ac863.zip
-rw-r--r--MCServer/Plugins/APIDump/APIDesc.lua8
-rw-r--r--MCServer/Plugins/APIDump/main.lua2
2 files changed, 7 insertions, 3 deletions
diff --git a/MCServer/Plugins/APIDump/APIDesc.lua b/MCServer/Plugins/APIDump/APIDesc.lua
index 187fdeb9b..643214de3 100644
--- a/MCServer/Plugins/APIDump/APIDesc.lua
+++ b/MCServer/Plugins/APIDump/APIDesc.lua
@@ -674,8 +674,12 @@ World:ForEachChestInChunk(Player:GetChunkX(), Player:GetChunkZ(),
]],
Functions =
{
- constructor = { Params = "", Return = "cEnchantments", Notes = "Creates a new empty cEnchantments object" },
- constructor = { Params = "StringSpec", Return = "cEnchantments", Notes = "Creates a new cEnchantments object filled with enchantments based on the string description" },
+ constructor =
+ {
+ { Params = "", Return = "cEnchantments", Notes = "Creates a new empty cEnchantments object" },
+ { Params = "StringSpec", Return = "cEnchantments", Notes = "Creates a new cEnchantments object filled with enchantments based on the string description" },
+ },
+ operator_eq = { Params = "OtherEnchantments", Return = "bool", Notes = "Returns true if this enchantments object has the same enchantments as OtherEnchantments." },
AddFromString = { Params = "StringSpec", Return = "", Notes = "Adds the enchantments in the string description into the object. If a specified enchantment already existed, it is overwritten." },
Clear = { Params = "", Return = "", Notes = "Removes all enchantments" },
GetLevel = { Params = "EnchantmentNumID", Return = "number", Notes = "Returns the level of the specified enchantment stored in this object; 0 if not stored" },
diff --git a/MCServer/Plugins/APIDump/main.lua b/MCServer/Plugins/APIDump/main.lua
index 300a4d9ce..6dc2f8a3e 100644
--- a/MCServer/Plugins/APIDump/main.lua
+++ b/MCServer/Plugins/APIDump/main.lua
@@ -363,7 +363,7 @@ function ReadDescriptions(a_API)
fn.DocID = "operator_sub";
fn.Name = "<i>operator -</i>";
elseif (fn.Name == ".eq") then
- fn.DocID = "operator_sub";
+ fn.DocID = "operator_eq";
fn.Name = "<i>operator ==</i>";
end
end