Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2026-10-02 02:43:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Skullkin drill credits the player who breaks it

Browse Source 
The drill only progressed missions 972, 1305 and 1308 for the player who
started it, so another player breaking the drill (the usual way on a
busy Crux Prime) got no credit for the drill objectives. The live
script (L_SKULLKIN_DRILL.lua, notifyDie) credits the killer, then also
the activator when that is someone else, which is what it does now. It
also no longer dereferences a null attacker. Removes the "Missions"
TODO.

May account for part of #1021 (Crux Prime daily smashable objectives not
tallying); needs an in-game check with two players.

Refs #1021

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Aaron Kimbrell
2026-09-26 18:45:53 -05:00
parent 4ad7ddd9c6
commit b9d5ef9963
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
dScripts/02_server/Map/AM/AmSkullkinDrill.cpp
View File

@@ -226,7 +226,7 @@ void AmSkullkinDrill::PlayAnim(Entity* self, Entity* player, const std::string&
void AmSkullkinDrill::OnHitOrHealResult(Entity* self, Entity* attacker, int32_t damage) {
auto* destroyableComponent = self->GetComponent<DestroyableComponent>();
if (destroyableComponent == nullptr || !attacker->IsPlayer()) {
if (destroyableComponent == nullptr || attacker == nullptr || !attacker->IsPlayer()) {
return;
}
@@ -234,19 +234,22 @@ void AmSkullkinDrill::OnHitOrHealResult(Entity* self, Entity* attacker, int32_t
return;
}
const auto activaterID = self->GetVar<LWOOBJID>(u"activaterID");
const auto updateMissions = [this, self](Entity* player) {
auto* missionComponent = player->GetComponent<MissionComponent>();
if (!missionComponent) return;
auto* activator = Game::entityManager->GetEntity(activaterID);
// TODO: Missions
if (activator != nullptr) {
auto* missionComponent = activator->GetComponent<MissionComponent>();
if (missionComponent != nullptr) {
for (const auto missionID : m_MissionsToUpdate) {
missionComponent->ForceProgressValue(missionID, 1, self->GetLOT());
}
}
};
// The player who broke the drill gets credit, and so does the player who started it if that was someone else.
updateMissions(attacker);
const auto activaterID = self->GetVar<LWOOBJID>(u"activaterID");
if (activaterID != LWOOBJID_EMPTY && activaterID != attacker->GetObjectID()) {
auto* activator = Game::entityManager->GetEntity(activaterID);
if (activator) updateMissions(activator);
}
self->Smash(attacker->GetObjectID(), eKillType::SILENT);