Skip to content
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

fix: prevent crash on combatBlockHit #2650

Closed
wants to merge 5 commits into from
Closed

fix: prevent crash on combatBlockHit #2650

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3f5b567
fix: prevent crash on combatBlockHit
carlospess0a May 24, 2024
41fee47
Code format - (Clang-format)
github-actions[bot] May 24, 2024
ac4e435
fix line
carlospess0a May 24, 2024
0de8abf
Merge branch 'fix_crash_combatblock' of https://github.com/opentibiab…
carlospess0a May 24, 2024
695c5e3
Code format - (Clang-format)
github-actions[bot] May 24, 2024
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
57 changes: 36 additions & 21 deletions src/game/game.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6451,7 +6451,7 @@ bool Game::combatBlockHit(CombatDamage &damage, std::shared_ptr<Creature> attack
return true;
}

if (target->getPlayer() && target->isInGhostMode()) {
if (target && target->getPlayer() && target->isInGhostMode()) {
return true;
}

Expand All @@ -6460,12 +6460,14 @@ bool Game::combatBlockHit(CombatDamage &damage, std::shared_ptr<Creature> attack
}

// Skill dodge (ruse)
if (std::shared_ptr<Player> targetPlayer = target->getPlayer()) {
auto chance = targetPlayer->getDodgeChance();
if (chance > 0 && uniform_random(0, 10000) < chance) {
InternalGame::sendBlockEffect(BLOCK_DODGE, damage.primary.type, target->getPosition(), attacker);
targetPlayer->sendTextMessage(MESSAGE_ATTENTION, "You dodged an attack.");
return true;
if (target) {
if (std::shared_ptr<Player> targetPlayer = target->getPlayer()) {
auto chance = targetPlayer->getDodgeChance();
if (chance > 0 && uniform_random(0, 10000) < chance) {
InternalGame::sendBlockEffect(BLOCK_DODGE, damage.primary.type, target->getPosition(), attacker);
targetPlayer->sendTextMessage(MESSAGE_ATTENTION, "You dodged an attack.");
return true;
}
Comment on lines +6463 to +6470
Copy link
Member

@dudantas dudantas May 24, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if (target) {
if (std::shared_ptr<Player> targetPlayer = target->getPlayer()) {
auto chance = targetPlayer->getDodgeChance();
if (chance > 0 && uniform_random(0, 10000) < chance) {
InternalGame::sendBlockEffect(BLOCK_DODGE, damage.primary.type, target->getPosition(), attacker);
targetPlayer->sendTextMessage(MESSAGE_ATTENTION, "You dodged an attack.");
return true;
}
const auto &targetPlayer = target ? target->getPlayer() : nullptr;
// Skill dodge (ruse)
if (targetPlayer) {
auto chance = targetPlayer->getDodgeChance();
if (chance > 0 && uniform_random(0, 10000) < chance) {
InternalGame::sendBlockEffect(BLOCK_DODGE, damage.primary.type, target->getPosition(), attacker);
targetPlayer->sendTextMessage(MESSAGE_ATTENTION, "You dodged an attack.");
return true;
}
}

}
}

Expand All @@ -6481,13 +6483,13 @@ bool Game::combatBlockHit(CombatDamage &damage, std::shared_ptr<Creature> attack
CombatParams damageReflectedParams;

BlockType_t primaryBlockType, secondaryBlockType;
std::shared_ptr<Player> targetPlayer = target->getPlayer();
std::shared_ptr<Player> targetPlayer = target ? target->getPlayer() : nullptr;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can move this to the line 6463 and avoid nesting the if


if (damage.primary.type != COMBAT_NONE) {
damage.primary.value = -damage.primary.value;
// Damage healing primary
if (attacker) {
if (target->getMonster()) {
if (target && target->getMonster()) {
uint32_t primaryHealing = target->getMonster()->getHealingCombatValue(damage.primary.type);
if (primaryHealing > 0) {
damageHeal.primary.value = std::ceil((damage.primary.value) * (primaryHealing / 100.));
Expand All @@ -6502,12 +6504,19 @@ bool Game::combatBlockHit(CombatDamage &damage, std::shared_ptr<Creature> attack
}
damage.primary.value *= attacker->getBuff(BUFF_DAMAGEDEALT) / 100.;
}
damage.primary.value *= target->getBuff(BUFF_DAMAGERECEIVED) / 100.;

if (target) {
damage.primary.value *= target->getBuff(BUFF_DAMAGERECEIVED) / 100.;
}

primaryBlockType = target->blockHit(attacker, damage.primary.type, damage.primary.value, checkDefense, checkArmor, field);

damage.primary.value = -damage.primary.value;
InternalGame::sendBlockEffect(primaryBlockType, damage.primary.type, target->getPosition(), attacker);

if (target) {
InternalGame::sendBlockEffect(primaryBlockType, damage.primary.type, target->getPosition(), attacker);
}

// Damage reflection primary
if (!damage.extension && attacker) {
std::shared_ptr<Monster> attackerMonster = attacker->getMonster();
Expand All @@ -6524,8 +6533,9 @@ bool Game::combatBlockHit(CombatDamage &damage, std::shared_ptr<Creature> attack
}
}
}
double_t primaryReflectPercent = target->getReflectPercent(damage.primary.type, true);
int32_t primaryReflectFlat = target->getReflectFlat(damage.primary.type, true);

double_t primaryReflectPercent = target ? target->getReflectPercent(damage.primary.type, true) : 0;
int32_t primaryReflectFlat = target ? target->getReflectFlat(damage.primary.type, true) : 0;
if (primaryReflectPercent > 0 || primaryReflectFlat > 0) {
int32_t distanceX = Position::getDistanceX(target->getPosition(), attacker->getPosition());
int32_t distanceY = Position::getDistanceY(target->getPosition(), attacker->getPosition());
Expand Down Expand Up @@ -6557,7 +6567,7 @@ bool Game::combatBlockHit(CombatDamage &damage, std::shared_ptr<Creature> attack
if (damage.secondary.type != COMBAT_NONE) {
damage.secondary.value = -damage.secondary.value;
// Damage healing secondary
if (attacker && target->getMonster()) {
if (attacker && target && target->getMonster()) {
uint32_t secondaryHealing = target->getMonster()->getHealingCombatValue(damage.secondary.type);
if (secondaryHealing > 0) {
damageHeal.primary.value += std::ceil((damage.secondary.value) * (secondaryHealing / 100.));
Expand All @@ -6571,14 +6581,19 @@ bool Game::combatBlockHit(CombatDamage &damage, std::shared_ptr<Creature> attack
}
damage.secondary.value *= attacker->getBuff(BUFF_DAMAGEDEALT) / 100.;
}
damage.secondary.value *= target->getBuff(BUFF_DAMAGERECEIVED) / 100.;

secondaryBlockType = target->blockHit(attacker, damage.secondary.type, damage.secondary.value, false, false, field);
if (target) {
damage.secondary.value *= target->getBuff(BUFF_DAMAGERECEIVED) / 100.;
secondaryBlockType = target->blockHit(attacker, damage.secondary.type, damage.secondary.value, false, false, field);
}

damage.secondary.value = -damage.secondary.value;
InternalGame::sendBlockEffect(secondaryBlockType, damage.secondary.type, target->getPosition(), attacker);

if (!damage.extension && attacker && target->getMonster()) {
if (target) {
InternalGame::sendBlockEffect(secondaryBlockType, damage.secondary.type, target->getPosition(), attacker);
}

if (!damage.extension && attacker && target && target->getMonster()) {
int32_t secondaryReflectPercent = target->getReflectPercent(damage.secondary.type, true);
int32_t secondaryReflectFlat = target->getReflectFlat(damage.secondary.type, true);
if (secondaryReflectPercent > 0 || secondaryReflectFlat > 0) {
Expand Down Expand Up @@ -6607,7 +6622,7 @@ bool Game::combatBlockHit(CombatDamage &damage, std::shared_ptr<Creature> attack
}
// Damage reflection secondary

if (damage.primary.type == COMBAT_HEALING) {
if (target && damage.primary.type == COMBAT_HEALING) {
damage.primary.value *= target->getBuff(BUFF_HEALINGRECEIVED) / 100.;
}

Expand All @@ -6625,10 +6640,10 @@ bool Game::combatBlockHit(CombatDamage &damage, std::shared_ptr<Creature> attack
damage.exString += "active elemental amplification";
}

if (canReflect) {
if (canReflect && target) {
Combat::doCombatHealth(target, attacker, damageReflected, damageReflectedParams);
}
if (canHeal) {
if (canHeal && target) {
combatChangeHealth(nullptr, target, damageHeal);
}
return (primaryBlockType != BLOCK_NONE) && (secondaryBlockType != BLOCK_NONE);
Expand Down