PSForever/PSF-BotServer
1
0
Fork 0
mirror of https://github.com/2revoemag/PSF-BotServer.git synced 2026-03-02 11:43:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

test repairs

Browse source
This commit is contained in:
FateJH 2020-08-25 15:24:26 -04:00
parent e27e827552
commit bb3c0f5d91
5 changed files with 51 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/scala/net/psforever/objects/vital/damage/DamageModifiers.scala
View file

@ -101,7 +101,7 @@ object DamageModifiers {
val distance = Vector3.Distance(data.hit_pos, data.target.Position)
val radius = profile.DamageRadius
if (distance <= radius) {
damage * (1f - (profile.DamageAtEdge * distance / radius)).toInt
damage - (damage * profile.DamageAtEdge * distance / radius).toInt
} else {
0
}

2
src/main/scala/net/psforever/objects/zones/Zone.scala
View file

@ -451,7 +451,7 @@ class Zone(val id: String, val map: ZoneMap, zoneNumber: Int) {
* `false`, if the new pool can not be created because the system has already been started
*/
def AddPool(name: String, pool: Seq[Int]): Boolean = {
if (accessor == Default.Actor) {
if (accessor == Default.Actor || accessor == null) {
guid.AddPool(name, pool.toList)
true
} else {