From 32cf111810f173e5931e217e22a48000a60dfe23 Mon Sep 17 00:00:00 2001 From: David Markowitz <39972741+EmosewaMC@users.noreply.github.com> Date: Sat, 4 Nov 2023 08:42:28 -0700 Subject: [PATCH] Script: Fix incorrect kill method (#1248) --- dScripts/02_server/Map/General/ExplodingAsset.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dScripts/02_server/Map/General/ExplodingAsset.cpp b/dScripts/02_server/Map/General/ExplodingAsset.cpp index ee8f8e68..ce96014b 100644 --- a/dScripts/02_server/Map/General/ExplodingAsset.cpp +++ b/dScripts/02_server/Map/General/ExplodingAsset.cpp @@ -4,6 +4,8 @@ #include "MissionComponent.h" #include "SkillComponent.h" #include "eMissionTaskType.h" +#include "CDClientManager.h" +#include "CDObjectSkillsTable.h" #include "RenderComponent.h" //TODO: this has to be updated so that you only get killed if you're in a certain radius. @@ -39,9 +41,11 @@ void ExplodingAsset::OnHit(Entity* self, Entity* attacker) { self->SetOwnerOverride(attacker->GetObjectID()); GameMessages::SendPlayEmbeddedEffectOnAllClientsNearObject(self, u"camshake", self->GetObjectID(), 16); + self->Smash(attacker->GetObjectID()); auto* skillComponent = self->GetComponent(); if (skillComponent != nullptr) { + // Technically supposed to get first skill in the skill component but only 1 object in the live game used this. skillComponent->CalculateBehavior(147, 4721, LWOOBJID_EMPTY, true); } @@ -65,8 +69,6 @@ void ExplodingAsset::OnHit(Entity* self, Entity* attacker) { } } } - - self->ScheduleKillAfterUpdate(); } void ExplodingAsset::OnProximityUpdate(Entity* self, Entity* entering, std::string name, std::string status) {