Merge branch 'main' into speed-beats

opentibiabr · Mar 6, 2023 · cd8470e · cd8470e
2 parents 97b3ba0 + 7e6f3c3
commit cd8470e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/data-otservbr-global/scripts/actions/quests/hot_cuisine/cookbook2.lua b/data-otservbr-global/scripts/actions/quests/hot_cuisine/cookbook2.lua
@@ -15,5 +15,5 @@ function hotCuisineCook2.onUse(player, item, fromPosition, target, toPosition, i
 	return true
 end
 
-hotCuisineCook2:id(12497)
-hotCuisineCook2:register()
+hotCuisineCook2:id(11541)
+hotCuisineCook2:register()
diff --git a/data-otservbr-global/scripts/quests/giant_smithhammer/lever.lua b/data-otservbr-global/scripts/quests/giant_smithhammer/lever.lua
@@ -3,15 +3,12 @@ local lever = Action()
 function lever.onUse(player, item, fromPosition, target, toPosition, isHotkey)
 	local position = { x = 32780 , y = 32231 , z = 8}
 	local tile = Tile(Position(position))
-	if item.itemid == 2772 then
-		if tile:getItemById(389) then
-			tile:getItemById(389):remove()
-			item:transform(2773)
-		else
-			Game.createItem(387, 1, position)
-		end
-	else
-		Game.createItem(387, 1, position)
+
+	if item.itemid == 2772 and tile:getItemById(389) then
+		tile:getItemById(389):remove()
+		item:transform(2773)
+	elseif item.itemid == 2773 and not tile:getItemById(389) then
+		Game.createItem(389, 1, position)
 		item:transform(2772)
 	end
 	return true

diff --git a/src/creatures/players/player.cpp b/src/creatures/players/player.cpp
@@ -5686,7 +5686,7 @@ void Player::stowItem(Item* item, uint32_t count, bool allItems) {
 	if (allItems) {
 		// Stow player backpack
 		if (auto inventoryItem = getInventoryItem(CONST_SLOT_BACKPACK);
-			!item->isInsideDepot(true)) {
+			inventoryItem && !item->isInsideDepot(true)) {
 			sendStowItems(*item, *inventoryItem, itemDict);
 		}