Merge branch 'main' into fix-2859

opentibiabr · Sep 24, 2024 · 4bfce12 · 4bfce12
2 parents b9fe9a5 + 10823e3
commit 4bfce12
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/data-otservbr-global/lib/quests/soul_war.lua b/data-otservbr-global/lib/quests/soul_war.lua
@@ -1112,9 +1112,9 @@ function MonsterType:calculateBagYouDesireChance(player, itemChance)
 		itemChance = itemChance + (playerTaintLevel * SoulWarQuest.bagYouDesireChancePerTaint)
 	end
 
-	logger.info("Player {} killed {} with {} taints, loot chance {}", player:getName(), monsterName, playerTaintLevel, itemChance)
+	logger.debug("Player {} killed {} with {} taints, loot chance {}", player:getName(), monsterName, playerTaintLevel, itemChance)
 
-	if math.random(1, 100000) <= totalChance then
+	if math.random(1, 100000) <= itemChance then
 		logger.debug("Player {} killed {} and got a bag you desire with drop chance {}", player:getName(), monsterName, itemChance)
 		if monsterName == "Goshnar's Megalomania" then
 			-- Reset kill count on successful drop

diff --git a/qodana.yml b/qodana.yml
@@ -3,6 +3,8 @@ version: "1.0"
 profile:
   name: qodana.recommended
 
+linter: jetbrains/qodana-clang:latest
+
 bootstrap: |
   set -e
   sudo apt-get update && sudo apt-get -y dist-upgrade

diff --git a/src/game/game.cpp b/src/game/game.cpp
@@ -3909,7 +3909,7 @@ void Game::playerUseWithCreature(uint32_t playerId, const Position &fromPos, uin
 	}
 
 	const std::shared_ptr<Monster> monster = creature->getMonster();
-	if (monster && monster->isFamiliar() && creature->getMaster()->getPlayer() == player && (it.isRune() || it.type == ITEM_TYPE_POTION)) {
+	if (monster && monster->isFamiliar() && creature->getMaster() && creature->getMaster()->getPlayer() == player && (it.isRune() || it.type == ITEM_TYPE_POTION)) {
 		player->setNextPotionAction(OTSYS_TIME() + g_configManager().getNumber(EX_ACTIONS_DELAY_INTERVAL, __FUNCTION__));
 
 		if (it.isMultiUse()) {