Skip to content

fix: Frags in Summon Kill #625

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
jprzimba merged 2 commits into from
Mar 9, 2026
Merged

fix: Frags in Summon Kill #625

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e1465eb
Fix: Frags in Summon Kill
Paco161315 Mar 3, 2026
fe7c9ef
Code format - (Clang-format)
github-actions[bot] Mar 3, 2026
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
33 changes: 26 additions & 7 deletions src/creatures/creature.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -508,12 +508,22 @@ void Creature::onDeath() {
const auto &lastHitCreature = g_game().getCreatureByID(lastHitCreatureId);
std::shared_ptr<Creature> lastHitCreatureMaster;
if (lastHitCreature && getPlayer()) {
/**
* @deprecated -- This is here to trigger the deprecated onKill events in lua
*/
lastHitCreature->deprecatedOnKilledCreature(getCreature(), true);
lastHitUnjustified = lastHitCreature->onKilledPlayer(getPlayer(), true);
lastHitCreatureMaster = lastHitCreature->getMaster();
std::shared_ptr<Player> killerPlayer = nullptr;

if (lastHitCreature->getPlayer()) {
killerPlayer = lastHitCreature->getPlayer();
} else if (lastHitCreature->isSummon() && lastHitCreature->getMaster() && lastHitCreature->getMaster()->getPlayer()) {
killerPlayer = lastHitCreature->getMaster()->getPlayer();
}

if (killerPlayer) {
/**
* @deprecated -- This is here to trigger the deprecated onKill events in lua
*/
lastHitCreature->deprecatedOnKilledCreature(getCreature(), true);
lastHitUnjustified = killerPlayer->onKilledPlayer(getPlayer(), true);
lastHitCreatureMaster = lastHitCreature->getMaster();
}
} else {
lastHitCreatureMaster = nullptr;
}
Expand Down Expand Up @@ -579,7 +589,16 @@ void Creature::onDeath() {
if (const auto &monster = getMonster()) {
killer->onKilledMonster(monster);
} else if (const auto &player = getPlayer(); player && mostDamageCreature != killer) {
killer->onKilledPlayer(player, false);
std::shared_ptr<Player> killerPlayer = nullptr;
if (killer->getPlayer()) {
killerPlayer = killer;
} else if (killer->isSummon() && killer->getMaster() && killer->getMaster()->getPlayer()) {
killerPlayer = killer->getMaster()->getPlayer();
}

if (killerPlayer) {
killerPlayer->onKilledPlayer(player, false);
}
}
}

Expand Down