Merge branch 'main' into feature/badge-system

opentibiabr · May 3, 2024 · 681b79e · 681b79e
2 parents aeda52f + 9f74b27
commit 681b79e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/config.lua.dist b/config.lua.dist
@@ -397,7 +397,6 @@ resetSessionsOnStartup = false
 -- Misc.
 -- NOTE: experienceDisplayRates: set to false to ignore exp rate or true to include exp rate
 -- NOTE: disableLegacyRaids: set to true to disable legacy XML raids
--- NOTE: combatChainDelay: set to minimum 50 miliseconds
 allowChangeOutfit = true
 toggleMountInProtectionZone = false
 freePremium = false
@@ -430,7 +429,8 @@ maxElementalResistance = 200
 maxDamageReflection = 200
 
 -- Chain system
-toggleChainSystem = true
+-- NOTE: combatChainDelay: set to minimum 50 miliseconds
+toggleChainSystem = false
 combatChainDelay = 50
 combatChainTargets = 5
 combatChainSkillFormulaAxe = 0.9

diff --git a/src/creatures/creature.cpp b/src/creatures/creature.cpp
@@ -805,7 +805,7 @@ bool Creature::dropCorpse(std::shared_ptr<Creature> lastHitCreature, std::shared
 				auto monster = getMonster();
 				if (monster && !monster->isRewardBoss()) {
 					std::ostringstream lootMessage;
-					auto collorMessage = player->getProtocolVersion() < 1200 || player->getOperatingSystem() >= CLIENTOS_OTCLIENT_LINUX;
+					auto collorMessage = player->getProtocolVersion() > 1200 && player->getOperatingSystem() < CLIENTOS_OTCLIENT_LINUX;
 					lootMessage << "Loot of " << getNameDescription() << ": " << corpseContainer->getContentDescription(collorMessage) << ".";
 					auto suffix = corpseContainer->getAttribute<std::string>(ItemAttribute_t::LOOTMESSAGE_SUFFIX);
 					if (!suffix.empty()) {