PSForever/PSF-LoginServer
1
0
Fork 0
mirror of https://github.com/psforever/PSF-LoginServer.git synced 2026-01-19 18:44:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #734 from Fate-JH/gen-boom

Browse source 
The Exploding Generator
This commit is contained in:
Fate-JH 2021-03-24 14:02:31 -04:00 committed by GitHub
parent 148155e483 2568b66a80
commit 3d3b3eceae
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/scala/net/psforever/objects/serverobject/generator/GeneratorControl.scala
View file

@ -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