Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2025-09-05 23:08:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into leaderboards-again

Browse Source
This commit is contained in:
David Markowitz
2025-05-05 00:21:43 -07:00
parent 94168f357d 841b754b01
commit 82524b4165
132 changed files with 51229 additions and 1114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
dScripts/ai/AG/ActSharkPlayerDeathTrigger.cpp
View File

@@ -9,9 +9,10 @@ void ActSharkPlayerDeathTrigger::OnFireEventServerSide(Entity* self, Entity* sen
auto missionComponent = sender->GetComponent<MissionComponent>();
if (!missionComponent) return;
missionComponent->Progress(eMissionTaskType::SCRIPT, 8419);
// This check is only needed because dlu doesnt have proper collision checks on rotated phantom physics
if (sender->GetIsDead() || !sender->GetPlayerReadyForUpdates()) return; //Don't kill already dead players or players not ready
missionComponent->Progress(eMissionTaskType::SCRIPT, 8419);
if (sender->GetCharacter()) {
sender->Smash(self->GetObjectID(), eKillType::VIOLENT, u"big-shark-death");

4
dScripts/ai/AG/AgSpiderBossMessage.cpp
View File

@@ -36,14 +36,14 @@ void AgSpiderBossMessage::OnCollisionPhantom(Entity* self, Entity* target) {
auto box = GetBox(self);
// knockback the target
auto forward = target->GetRotation().GetForwardVector();
auto forward = self->GetRotation().GetForwardVector();
box.boxTarget = target->GetObjectID();
GameMessages::SendPlayFXEffect(target->GetObjectID(), 1378, u"create", "pushBack");
RenderComponent::PlayAnimation(target, "knockback-recovery");
forward.y += 15;
forward.x *= 100;
forward.z *= 100;
GameMessages::SendKnockback(target->GetObjectID(), self->GetObjectID(), self->GetObjectID(), 0, forward);
GameMessages::SendKnockback(target->GetObjectID(), LWOOBJID_EMPTY, LWOOBJID_EMPTY, 0, forward);
if (box.isTouch || box.isDisplayed) return;
box.boxSelf = self->GetObjectID();

2
dScripts/ai/MINIGAME/SG_GF/SERVER/SGCannon.cpp
View File

@@ -613,7 +613,7 @@ void SGCannon::StopGame(Entity* self, bool cancel) {
// Destroy all spawners
for (auto* entity : Game::entityManager->GetEntitiesInGroup("SGEnemy")) {
entity->Kill();
entity->Smash(LWOOBJID_EMPTY, eKillType::SILENT);
}
ResetVars(self);