pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-03-03 11:12:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix int underflow error in disc reuse timers focus

Browse Source
This commit is contained in:
Michael Cook (mackal) 2015-09-04 14:07:01 -04:00
parent 0d3bd5988b
commit 548701cba6
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
zone/effects.cpp
View File

@ -623,11 +623,17 @@ bool Client::UseDiscipline(uint32 spell_id, uint32 target) {
if(spell.recast_time > 0) if(spell.recast_time > 0)
{ {
uint32 reduced_recast = spell.recast_time / 1000; uint32 reduced_recast = spell.recast_time / 1000;
reduced_recast -= GetFocusEffect(focusReduceRecastTime, spell_id); auto focus = GetFocusEffect(focusReduceRecastTime, spell_id);
if(reduced_recast <= 0){ // do stupid stuff because custom servers.
// we really should be able to just do the -= focus but since custom servers could have shorter reuse timers
// we have to make sure we don't underflow the uint32 ...
// and yes, the focus effect can be used to increase the durations (spell 38944)
if (focus > reduced_recast) {
reduced_recast = 0; reduced_recast = 0;
if (GetPTimers().Enabled((uint32)DiscTimer)) if (GetPTimers().Enabled((uint32)DiscTimer))
GetPTimers().Clear(&database, (uint32)DiscTimer); GetPTimers().Clear(&database, (uint32)DiscTimer);
} else {
reduced_recast -= focus;
} }
if (reduced_recast > 0) if (reduced_recast > 0)