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: creature attacked by monster #1793

Merged
merged 9 commits into from
Nov 11, 2023
+33 −24
Merged

fix: creature attacked by monster #1793

Changes from 5 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
01527e3
Update monster.cpp
mehah Nov 9, 2023
003e96c
improve
mehah Nov 9, 2023
bfadfa1
improve
mehah Nov 9, 2023
997ea06
fix smell
mehah Nov 9, 2023
2b9e0f5
change target on logout
mehah Nov 9, 2023
031a87f
improve
mehah Nov 9, 2023
582ad2c
Code format - (Clang-format)
github-actions[bot] Nov 9, 2023
1c89bca
Update creature.cpp
mehah Nov 9, 2023
e758b7a
Merge branch 'main' into fix_creature_attacked
dudantas Nov 11, 2023
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
34 changes: 23 additions & 11 deletions src/creatures/monsters/monster.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -601,20 +601,32 @@ void Monster::onFollowCreatureComplete(const std::shared_ptr<Creature> &creature
return;
}

auto it = std::find(targetIDList.begin(), targetIDList.end(), creature->getID());
if (it == targetIDList.end()) {
return;
if (hasFollowPath && creature->getPlayer() && creature->getPlayer()->getIP() == 0) {
hasFollowPath = false;
}

if (const auto &target = targetListMap[*it].lock()) {
targetIDList.erase(it);
const auto &it = std::find(targetIDList.begin(), targetIDList.end(), creature->getID());
if (it != targetIDList.end()) {
if (const auto &target = targetListMap[*it].lock()) {
targetIDList.erase(it);

if (hasFollowPath) {
targetIDList.push_front(target->getID());
} else if (!isSummon()) {
targetIDList.push_back(target->getID());
} else {
targetListMap.erase(target->getID());
if (hasFollowPath) {
targetIDList.push_front(target->getID());
} else if (!isSummon()) {
targetIDList.push_back(target->getID());
} else {
targetListMap.erase(target->getID());
}
}
}

// Change the target if necessary
if (!hasFollowPath && !isSummon() && !targetIDList.empty() && targetIDList.front() != creature->getID()) {
const auto &itMap = targetListMap.find(targetIDList.front());
if (itMap != targetListMap.end()) {
if (const auto &target = itMap->second.lock()) {
selectTarget(target);
}
}
}
}
Expand Down
Loading