From 4d455eaedbda0ab7bb1a98efd091bcb3ca89a0e8 Mon Sep 17 00:00:00 2001 From: Aokromes Date: Sun, 10 Dec 2017 12:28:04 +0100 Subject: [PATCH] Core/Spells: Gathering no longer fails after patch 3.1.0 By Ovahlord --- ...017_12_10_00_world_from_335_was_2017_12_09_00_world.sql} | 0 ..._12_10_01_world_from_master_was_2017_12_09_00_world.sql} | 0 ..._12_10_02_world_from_master_was_2017_12_10_00_world.sql} | 0 src/server/game/Spells/Spell.cpp | 6 +++--- 4 files changed, 3 insertions(+), 3 deletions(-) rename sql/updates/world/{3.3.5/2017_12_09_00_world.sql => 4.3.4/2017_12_10_00_world_from_335_was_2017_12_09_00_world.sql} (100%) rename sql/updates/world/{master/2017_12_09_00_world.sql => 4.3.4/2017_12_10_01_world_from_master_was_2017_12_09_00_world.sql} (100%) rename sql/updates/world/{master/2017_12_10_00_world.sql => 4.3.4/2017_12_10_02_world_from_master_was_2017_12_10_00_world.sql} (100%) diff --git a/sql/updates/world/3.3.5/2017_12_09_00_world.sql b/sql/updates/world/4.3.4/2017_12_10_00_world_from_335_was_2017_12_09_00_world.sql similarity index 100% rename from sql/updates/world/3.3.5/2017_12_09_00_world.sql rename to sql/updates/world/4.3.4/2017_12_10_00_world_from_335_was_2017_12_09_00_world.sql diff --git a/sql/updates/world/master/2017_12_09_00_world.sql b/sql/updates/world/4.3.4/2017_12_10_01_world_from_master_was_2017_12_09_00_world.sql similarity index 100% rename from sql/updates/world/master/2017_12_09_00_world.sql rename to sql/updates/world/4.3.4/2017_12_10_01_world_from_master_was_2017_12_09_00_world.sql diff --git a/sql/updates/world/master/2017_12_10_00_world.sql b/sql/updates/world/4.3.4/2017_12_10_02_world_from_master_was_2017_12_10_00_world.sql similarity index 100% rename from sql/updates/world/master/2017_12_10_00_world.sql rename to sql/updates/world/4.3.4/2017_12_10_02_world_from_master_was_2017_12_10_00_world.sql diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 47074cffd87..34c90f27346 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -5530,13 +5530,13 @@ SpellCastResult Spell::CheckCast(bool strict, uint32* param1 /*= nullptr*/, uint if (res != SPELL_CAST_OK) return res; - // chance for fail at orange mining/herb/LockPicking gathering attempt + // chance for fail at LockPicking attempt // second check prevent fail at rechecks if (skillId != SKILL_NONE && (!m_selfContainer || ((*m_selfContainer) != this))) { - bool canFailAtMax = skillId != SKILL_HERBALISM && skillId != SKILL_MINING && skillId != SKILL_ARCHAEOLOGY; + bool canFailAtMax = skillId == SKILL_LOCKPICKING; - // chance for failure in orange gather / lockpick (gathering skill can't fail at maxskill) + // chance for failure in orange lockpick if ((canFailAtMax && skillValue < sWorld->GetConfigMaxSkillValue()) && reqSkillValue > irand(skillValue - 25, skillValue + 37)) return SPELL_FAILED_TRY_AGAIN; }