From 2568b66a80f61aa4fcb0bda9e0d9d04b5e3267f3 Mon Sep 17 00:00:00 2001 From: "Jason_DiDonato@yahoo.com" Date: Wed, 24 Mar 2021 00:16:56 -0400 Subject: [PATCH] generator no longer exclusively cares about projectile-caused damage at the end of tis life, and will recognize boomer damage --- .../objects/serverobject/generator/GeneratorControl.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/scala/net/psforever/objects/serverobject/generator/GeneratorControl.scala b/src/main/scala/net/psforever/objects/serverobject/generator/GeneratorControl.scala index 06cdc3534..00166ff32 100644 --- a/src/main/scala/net/psforever/objects/serverobject/generator/GeneratorControl.scala +++ b/src/main/scala/net/psforever/objects/serverobject/generator/GeneratorControl.scala @@ -89,7 +89,7 @@ class GeneratorControl(gen: Generator) //TODO this only works with projectiles right now! val zone = gen.Zone gen.Health = 0 - super.DestructionAwareness(gen, gen.LastShot.get) + super.DestructionAwareness(gen, gen.LastDamage.get) GeneratorControl.UpdateOwner(gen, Some(GeneratorControl.Event.Destroyed)) //kaboom zone.AvatarEvents ! AvatarServiceMessage( @@ -128,7 +128,7 @@ class GeneratorControl(gen: Generator) case GeneratorControl.Destabilized() => //if the generator is destabilized but has no ntu, it will not explode gen.Health = 0 - super.DestructionAwareness(gen, gen.LastShot.get) + super.DestructionAwareness(gen, gen.LastDamage.get) queuedExplosion.cancel() queuedExplosion = Default.Cancellable imminentExplosion = false