Skip to content

fix: prevent task flood caused by double OTSYS_TIME() subtraction in action delay #3591

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dudantas merged 2 commits into from
Jul 8, 2025
Merged

fix: prevent task flood caused by double OTSYS_TIME() subtraction in action delay #3591

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f4ed98
fix: Prevent task flood caused by double OTSYS_TIME() subtraction in …
dudantas Jun 16, 2025
c24b1d7
Merge branch 'main' into dudantas/fix-equip-item-bug
FelipePaluco Jun 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/game/game.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3422,7 +3422,7 @@
return;
}
} else if (!player->canDoAction()) {
uint32_t delay = player->getNextActionTime() - OTSYS_TIME();
uint32_t delay = player->getNextActionTime();
if (delay > 0) {
const auto &task = createPlayerTask(
delay,
Expand Down Expand Up @@ -6760,7 +6760,7 @@
// Skill dodge (ruse)
if (targetPlayer) {
auto chance = targetPlayer->getDodgeChance();
if (chance > 0 && uniform_random(0, 10000) < chance || damage.hazardDodge) {

Check warning on line 6763 in src/game/game.cpp

View workflow job for this annotation

GitHub Actions / ubuntu-24.04-linux-debug 

suggest parentheses around ‘&&’ within ‘||’ [-Wparentheses]

Check warning on line 6763 in src/game/game.cpp

View workflow job for this annotation

GitHub Actions / ubuntu-22.04-linux-debug 

suggest parentheses around ‘&&’ within ‘||’ [-Wparentheses]
InternalGame::sendBlockEffect(BLOCK_DODGE, damage.primary.type, target->getPosition(), attacker);
targetPlayer->sendTextMessage(MESSAGE_ATTENTION, "You dodged an attack.");
return true;
Expand Down Expand Up @@ -7403,7 +7403,7 @@
} else if (attackerPlayer && targetMonster) {
handleHazardSystemAttack(damage, attackerPlayer, targetMonster, true);

if (damage.primary.value == 0 && damage.secondary.value == 0 || damage.hazardDodge) {

Check warning on line 7406 in src/game/game.cpp

View workflow job for this annotation

GitHub Actions / ubuntu-24.04-linux-debug 

suggest parentheses around ‘&&’ within ‘||’ [-Wparentheses]

Check warning on line 7406 in src/game/game.cpp

View workflow job for this annotation

GitHub Actions / ubuntu-22.04-linux-debug 

suggest parentheses around ‘&&’ within ‘||’ [-Wparentheses]
notifySpectators(spectators.data(), targetPos, attackerPlayer, targetMonster);
return true;
}
Expand Down
Loading