diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-06-26 19:48:16 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-06-26 19:48:16 +0200 |
| commit | e97b6e6403704384968331c157be287acc6a4015 (patch) | |
| tree | 26ca4a539c74ca59c76d429e6f8b86146f3655ab /src | |
| parent | 3a63187b4725a5e07516c7cb94cd4e6b3853b5d7 (diff) | |
| parent | 224b5c08dfecd3cd9981fc89bb96ae0e38b68889 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Entities/Item/ItemPrototype.h | 2 | ||||
| -rw-r--r-- | src/server/game/Spells/SpellEffects.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Entities/Item/ItemPrototype.h b/src/server/game/Entities/Item/ItemPrototype.h index c946f8fd4a3..b4357d4a1a1 100644 --- a/src/server/game/Entities/Item/ItemPrototype.h +++ b/src/server/game/Entities/Item/ItemPrototype.h @@ -751,7 +751,7 @@ struct ItemTemplate default: break; } - return itemLevel; + return std::max<float>(0.f, itemLevel); } bool IsPotion() const { return Class == ITEM_CLASS_CONSUMABLE && SubClass == ITEM_SUBCLASS_POTION; } diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index 65e1f90e35b..8d8abc9eb36 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -2454,7 +2454,7 @@ void Spell::EffectLearnSkill(SpellEffIndex effIndex) return; uint16 skillval = unitTarget->ToPlayer()->GetPureSkillValue(skillid); - unitTarget->ToPlayer()->SetSkill(skillid, m_spellInfo->Effects[effIndex].CalcValue(), std::min<uint16>(skillval, 1), tier->MaxSkill[damage - 1]); + unitTarget->ToPlayer()->SetSkill(skillid, m_spellInfo->Effects[effIndex].CalcValue(), std::max<uint16>(skillval, 1), tier->MaxSkill[damage - 1]); } void Spell::EffectPlayMovie(SpellEffIndex effIndex) |