josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Spells: Fix sobering spells and possible uint8 overflow/underflow in SPELL_EFFECT_INEBRIATE handler.

Browse Source 
(cherry picked from commit d9460428c6639ea8dc3f66e0e39cd37cf62a1252)
This commit is contained in:
r4dish
2026-06-01 16:10:34 +02:00
committed by Shauren
parent 168fbc6f13
commit 2500ea5772
1 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Spells/SpellEffects.cpp
+19 -7
View File
@@ -3525,15 +3525,27 @@ void Spell::EffectInebriate()
return;
Player* player = unitTarget->ToPlayer();
uint8 currentDrunk = player->GetDrunkValue();
int32 drunkMod = GetEffectValueAsInt();
uint8 currentDrunkValue = player->GetDrunkValue();
uint8 drunkValue = std::clamp<int32>(GetEffectValueAsInt() + currentDrunkValue, 0, 100);
if (currentDrunkValue == 100 && currentDrunkValue == drunkValue)
if (roll_chance(25.0f))
player->CastSpell(player, 67468, CastSpellExtraArgs()
.SetTriggeringSpell(this)); // Drunken Vomit
if (drunkMod == 0)
return;
player->SetDrunkValue(drunkValue, m_CastItem ? m_CastItem->GetEntry() : 0);
// drunkMod may contain values that are guaranteed to cause uint8 overflow/underflow (examples: 29690, 46874)
// In addition, we would not want currentDrunk to become more than 100.
// So before adding the values, let's check that everything is fine.
if (drunkMod > static_cast<int32>(100 - currentDrunk))
currentDrunk = 100;
else if (drunkMod < static_cast<int32>(0 - currentDrunk))
currentDrunk = 0;
else
currentDrunk += drunkMod; // Due to previous checks we can be sure that currentDrunk will not go beyond [0-100] range.
player->SetDrunkValue(currentDrunk, m_CastItem ? m_CastItem->GetEntry() : 0);
if (currentDrunk == 100 && drunkMod > 0 && roll_chance(25))
player->CastSpell(player, 67468, CastSpellExtraArgs()
.SetTriggeringSpell(this)); // Drunken Vomit
}
void Spell::EffectFeedPet()