fix: hirelings spawn

omarcopires · Apr 16, 2024 · d626d59 · d626d59
1 parent f2112fa
commit d626d59
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/data-otservbr-global/npc/hireling.lua → data/npcs/hireling.lua b/data-otservbr-global/npc/hireling.lua → data/npcs/hireling.lua
diff --git a/...al/scripts/actions/other/hirelinglamp.lua → data/scripts/actions/items/hireling_lamp.lua b/...al/scripts/actions/other/hirelinglamp.lua → data/scripts/actions/items/hireling_lamp.lua
@@ -2,8 +2,9 @@ local hirelingLamp = Action()
 
 function hirelingLamp.onUse(player, item, fromPosition, target, toPosition, isHotkey)
 	local spawnPosition = player:getPosition()
-	local hireling_id = item:getCustomAttribute("Hireling")
+	local hirelingId = item:getCustomAttribute("Hireling")
 	local house = spawnPosition and spawnPosition:getTile() and spawnPosition:getTile():getHouse() or nil
+
 	if not house then
 		player:getPosition():sendMagicEffect(CONST_ME_POFF)
 		player:sendTextMessage(MESSAGE_FAILURE, "You may use this only inside a house.")
@@ -22,10 +23,10 @@ function hirelingLamp.onUse(player, item, fromPosition, target, toPosition, isHo
 		return false
 	end
 
-	local hireling = getHirelingById(hireling_id)
+	local hireling = getHirelingById(hirelingId)
 	if not hireling then
 		player:sendTextMessage(MESSAGE_EVENT_ADVANCE, "There was an error creating the hireling and it has been deleted, please, contact server admin.")
-		logger.warn("[hirelingLamp.onUse] Player {} is using hireling with id {} not exist in the database", player:getName(), hireling_id)
+		logger.warn("[hirelingLamp.onUse] Player {} is using hireling with id {} not exist in the database", player:getName(), hirelingId)
 		logger.error("Deleted the lamp")
 		item:remove(1)
 		return true