Merge remote-tracking branch 'upstream/main' into ajustmentPlayerEvent

opentibiabr · Nov 28, 2023 · 56b4e79 · 56b4e79
2 parents cf3b4f8 + e19aded
commit 56b4e79
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/data-otservbr-global/npc/gregor.lua b/data-otservbr-global/npc/gregor.lua
@@ -185,7 +185,7 @@ local function creatureSayCallback(npc, creature, type, message)
 		npcHandler:setTopic(playerId, 0)
 	elseif npcHandler:getTopic(playerId) == 4 then
 		if MsgContains(message, "yes") then
-			if not player:removeItem(3351, 1) then
+			if not player:removeItem(5924, 1) then
 				npcHandler:say("Lying is not exactly honourable, |PLAYERNAME|. Shame on you.", npc, creature)
 				return true
 			end

diff --git a/src/game/game.cpp b/src/game/game.cpp
@@ -5797,7 +5797,7 @@ void Game::checkCreatures() {
 	auto &checkCreatureList = checkCreatureLists[index];
 	size_t it = 0, end = checkCreatureList.size();
 	while (it < end) {
-		const auto &creature = checkCreatureList[it];
+		auto creature = checkCreatureList[it];
 		if (creature && creature->creatureCheck) {
 			if (creature->getHealth() > 0) {
 				creature->onThink(EVENT_CREATURE_THINK_INTERVAL);