Merge branch 'main' into patch-1

src/creatures/players/player.cpp

@@ -1654,9 +1654,6 @@ void Player::onCreatureAppear(Creature* creature, bool isLogin) {
 			}
 		}
 
-		// Reload bestiary tracker
-		refreshBestiaryMonsterTracker();
-
 		g_game().checkPlayersRecord();
 		IOLoginData::updateOnlineStatus(guid, true);
 		if (getLevel() < g_configManager().getNumber(ADVENTURERSBLESSING_LEVEL)) {

src/creatures/players/player.hpp

@@ -303,8 +303,8 @@ class Player final : public Creature, public Cylinder, public Bankable {
 		}
 	}
 
-	void refreshBestiaryMonsterTracker() const {
-		refreshCyclopediaMonsterTracker(getCyclopediaMonsterTrackerSet(false), false);
+	void refreshCyclopediaMonsterTracker(bool isBoss = false) const {
+		refreshCyclopediaMonsterTracker(getCyclopediaMonsterTrackerSet(isBoss), isBoss);
 	}
 
 	void refreshCyclopediaMonsterTracker(const phmap::parallel_flat_hash_set<std::shared_ptr<MonsterType>> &trackerList, bool isBoss) const {

src/game/game.cpp

@@ -9087,6 +9087,7 @@ void Game::playerRotatePodium(uint32_t playerId, const Position &pos, uint8_t st
 	// We retrieve the outfit information to be able to rotate the podium of renown in the new direction
 	Outfit_t newOutfit;
 	newOutfit.lookType = InternalGame::getCustomAttributeValue<uint16_t>(item, "LookType");
+	newOutfit.lookAddons = InternalGame::getCustomAttributeValue<uint8_t>(item, "LookAddons");
 	newOutfit.lookHead = InternalGame::getCustomAttributeValue<uint8_t>(item, "LookHead");
 	newOutfit.lookBody = InternalGame::getCustomAttributeValue<uint8_t>(item, "LookBody");
 	newOutfit.lookLegs = InternalGame::getCustomAttributeValue<uint8_t>(item, "LookLegs");

src/io/functions/iologindata_load_player.cpp

@@ -219,7 +219,7 @@ void IOLoginDataLoad::loadPlayerBlessings(Player* player, DBResult_ptr result) {
 	}
 }
 
-void IOLoginDataLoad::loadPlayerConditions(const Player* player, DBResult_ptr result) {
+void IOLoginDataLoad::loadPlayerConditions(Player* player, DBResult_ptr result) {
 	if (!result || !player) {
 		g_logger().warn("[IOLoginData::loadPlayer] - Player or Result nullptr: {}", __FUNCTION__);
 		return;
@@ -230,14 +230,10 @@ void IOLoginDataLoad::loadPlayerConditions(const Player* player, DBResult_ptr re
 	PropStream propStream;
 	propStream.init(attr, attrSize);
 
-	std::list<std::unique_ptr<Condition>> conditionList;
 	Condition* condition = Condition::createCondition(propStream);
 	while (condition) {
-		std::unique_ptr<Condition> uniqueCondition(condition);
-		if (uniqueCondition->unserialize(propStream)) {
-			conditionList.push_front(std::move(uniqueCondition));
-		} else {
-			uniqueCondition.release(); // Release memory ownership
+		if (condition->unserialize(propStream)) {
+			player->storedConditionList.push_front(condition);
 		}
 		condition = Condition::createCondition(propStream);
 	}

src/io/functions/iologindata_load_player.hpp

@@ -17,7 +17,7 @@ class IOLoginDataLoad : public IOLoginData {
 	static bool preLoadPlayer(Player* player, const std::string &name);
 	static void loadPlayerExperience(Player* player, DBResult_ptr result);
 	static void loadPlayerBlessings(Player* player, DBResult_ptr result);
-	static void loadPlayerConditions(const Player* player, DBResult_ptr result);
+	static void loadPlayerConditions(Player* player, DBResult_ptr result);
 	static void loadPlayerDefaultOutfit(Player* player, DBResult_ptr result);
 	static void loadPlayerSkullSystem(Player* player, DBResult_ptr result);
 	static void loadPlayerSkill(Player* player, DBResult_ptr result);

src/io/io_bosstiary.cpp

@@ -176,6 +176,7 @@ void IOBosstiary::addBosstiaryKill(Player* player, const std::shared_ptr<Monster
 
 	auto oldBossLevel = getBossCurrentLevel(player, bossId);
 	player->addBestiaryKillCount(bossId, amount);
+	player->refreshCyclopediaMonsterTracker(true);
 	auto newBossLevel = getBossCurrentLevel(player, bossId);
 	if (oldBossLevel == newBossLevel) {
 		return;

src/io/iobestiary.cpp

@@ -237,12 +237,8 @@ void IOBestiary::addBestiaryKill(Player* player, const std::shared_ptr<MonsterTy
 		}
 	}
 
-	const auto &trackerUnorderedSet = player->getCyclopediaMonsterTrackerSet(false);
-	for (const auto mType : trackerUnorderedSet) {
-		if (raceid == mType->info.raceid) {
-			player->refreshCyclopediaMonsterTracker(trackerUnorderedSet, false);
-		}
-	}
+	// Reload bestiary tracker
+	player->refreshCyclopediaMonsterTracker();
 }
 
 charmRune_t IOBestiary::getCharmFromTarget(Player* player, const std::shared_ptr<MonsterType> mtype) {

src/lua/functions/items/item_functions.cpp

@@ -848,6 +848,20 @@ int ItemFunctions::luaItemIsInsideDepot(lua_State* L) {
 	return 1;
 }
 
+int ItemFunctions::luaItemIsContainer(lua_State* L) {
+	// item:isContainer()
+	const auto item = getUserdata<const Item>(L, 1);
+	if (!item) {
+		reportErrorFunc(getErrorDesc(LUA_ERROR_ITEM_NOT_FOUND));
+		pushBoolean(L, false);
+		return 1;
+	}
+
+	const auto &it = Item::items[item->getID()];
+	pushBoolean(L, it.isContainer());
+	return 1;
+}
+
 int ItemFunctions::luaItemGetTier(lua_State* L) {
 	// item:getTier()
 	const Item* item = getUserdata<Item>(L, 1);

src/lua/functions/items/item_functions.hpp

@@ -75,6 +75,7 @@ class ItemFunctions final : LuaScriptInterface {
 		registerMethod(L, "Item", "setDuration", ItemFunctions::luaItemSetDuration);
 
 		registerMethod(L, "Item", "isInsideDepot", ItemFunctions::luaItemIsInsideDepot);
+		registerMethod(L, "Item", "isContainer", ItemFunctions::luaItemIsContainer);
 
 		registerMethod(L, "Item", "getTier", ItemFunctions::luaItemGetTier);
 		registerMethod(L, "Item", "setTier", ItemFunctions::luaItemSetTier);
@@ -145,6 +146,7 @@ class ItemFunctions final : LuaScriptInterface {
 	static int luaItemSetDuration(lua_State* L);
 
 	static int luaItemIsInsideDepot(lua_State* L);
+	static int luaItemIsContainer(lua_State* L);
 
 	static int luaItemGetTier(lua_State* L);
 	static int luaItemSetTier(lua_State* L);