Merge branch 'main' into phacUFPE/new_augments

opentibiabr · Sep 20, 2024 · b11d39d · b11d39d
2 parents e79e5df + ae39682
commit b11d39d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
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()) {