Merge branch 'main' into split-player-death

opentibiabr · Nov 17, 2024 · 7da2e80 · 7da2e80
2 parents 73c5351 + 4ee11d6
commit 7da2e80
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 38 deletions.
diff --git a/data-canary/scripts/actions/other/destroy.lua b/data-canary/scripts/actions/other/destroy.lua
@@ -250,7 +250,7 @@ local setting = {
 local destroy = Action()
 
 function destroy.onUse(player, item, fromPosition, target, toPosition, isHotkey)
-	return ActionsLib.destroyItem(player, target, toPosition)
+	return destroyItem(player, target, toPosition)
 end
 
 for index, value in ipairs(setting) do

diff --git a/data-canary/scripts/actions/other/sewer.lua b/data-canary/scripts/actions/other/sewer.lua
diff --git a/data-otservbr-global/scripts/actions/other/teleport.lua b/data-otservbr-global/scripts/actions/other/teleport.lua
diff --git a/...anary/scripts/actions/other/ladder_up.lua → data/scripts/actions/items/ladder_up.lua b/...anary/scripts/actions/other/ladder_up.lua → data/scripts/actions/items/ladder_up.lua
@@ -1,9 +1,9 @@
-local setting = { 1948, 1968, 5542, 20474, 20475, 28656, 31262 }
+local ladderTable = Game.getLadderIds()
 
 local ladder = Action()
 
 function ladder.onUse(player, item, fromPosition, target, toPosition, isHotkey)
-	if table.contains(setting, item.itemid) then
+	if table.contains(ladderTable, item.itemid) then
 		fromPosition:moveUpstairs()
 	else
 		fromPosition.z = fromPosition.z + 1
@@ -18,8 +18,5 @@ function ladder.onUse(player, item, fromPosition, target, toPosition, isHotkey)
 	return true
 end
 
-for index, value in ipairs(setting) do
-	ladder:id(value)
-end
-
+ladder:id(435, unpack(ladderTable))
 ladder:register()