summaryrefslogtreecommitdiffstats
path: root/MCServer
diff options
context:
space:
mode:
Diffstat (limited to 'MCServer')
-rw-r--r--MCServer/Plugins/APIDump/Hooks/OnEntityChangedWorld.lua2
-rw-r--r--MCServer/Plugins/APIDump/Hooks/OnEntityChangingWorld.lua (renamed from MCServer/Plugins/APIDump/Hooks/OnEntityChangeWorld.lua)6
-rw-r--r--MCServer/items.ini2
3 files changed, 5 insertions, 5 deletions
diff --git a/MCServer/Plugins/APIDump/Hooks/OnEntityChangedWorld.lua b/MCServer/Plugins/APIDump/Hooks/OnEntityChangedWorld.lua
index 00645c152..6675fdbe0 100644
--- a/MCServer/Plugins/APIDump/Hooks/OnEntityChangedWorld.lua
+++ b/MCServer/Plugins/APIDump/Hooks/OnEntityChangedWorld.lua
@@ -7,7 +7,7 @@ return
Desc = [[
This hook is called after the server has moved the {{cEntity|entity}} to the given world. This is an information-only
callback, the entity is already in the new world.<p>
- See also the {{OnEntityChangeWorld|HOOK_ENTITY_CHANGE_WORLD}} hook for a similar hook called before the
+ See also the {{OnEntityChangingWorld|HOOK_ENTITY_CHANGING_WORLD}} hook for a similar hook called before the
entity is moved to the new world.
]],
Params =
diff --git a/MCServer/Plugins/APIDump/Hooks/OnEntityChangeWorld.lua b/MCServer/Plugins/APIDump/Hooks/OnEntityChangingWorld.lua
index 25072ca5c..521f829c7 100644
--- a/MCServer/Plugins/APIDump/Hooks/OnEntityChangeWorld.lua
+++ b/MCServer/Plugins/APIDump/Hooks/OnEntityChangingWorld.lua
@@ -1,9 +1,9 @@
return
{
- HOOK_ENTITY_CHANGE_WORLD =
+ HOOK_ENTITY_CHANGING_WORLD =
{
CalledWhen = "Before a entity is changing the world.",
- DefaultFnName = "OnEntityChangeWorld", -- also used as pagename
+ DefaultFnName = "OnEntityChangingWorld", -- also used as pagename
Desc = [[
This hook is called before the server moves the {{cEntity|entity}} to the given world. Plugins may
refuse the changing of the entity to the new world.<p>
@@ -20,7 +20,7 @@ return
returns true, no other callback is called for this event and the change of the entity to the world is
cancelled.
]],
- }, -- HOOK_ENTITY_CHANGE_WORLD
+ }, -- HOOK_ENTITY_CHANGING_WORLD
}
diff --git a/MCServer/items.ini b/MCServer/items.ini
index daf366654..5eb04619c 100644
--- a/MCServer/items.ini
+++ b/MCServer/items.ini
@@ -815,7 +815,7 @@ rawrabbit=411
cookedrabbit=412
rabbitstew=413
rabbitsoup=413
-rabbitsfood=414
+rabbitsfoot=414
rabbithide=415
armorstand=416
ironhorsearmor=417