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

Mine Kill Restoration (#1203)

Browse source 
* restored experience awarded from mine kills; removed situations where mine damage no longer works

* Update ZoningOperations.scala

Rearranging order and priority of conditions
This commit is contained in:
Fate-JH 2024-05-17 00:06:11 -04:00 committed by GitHub
parent cacb9ad18a
commit 306e2a63c0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/main/scala/net/psforever/actors/session/support/ZoningOperations.scala
View file

@ -3073,23 +3073,24 @@ class ZoningOperations(
}
})
}
if (!setAvatar && tplayer.spectator) {
context.self ! SessionActor.SetMode(SpectatorMode) //should reload spectator status
setAvatar = true
player.allowInteraction = true
upstreamMessageCount = 0
if (tplayer.spectator) {
if (!setAvatar) {
context.self ! SessionActor.SetMode(SpectatorMode) //should reload spectator status
}
} else if (
!account.gm && /* gm's are excluded */
Config.app.game.promotion.active && /* play versus progress system must be active */
BattleRank.withExperience(tplayer.avatar.bep).value <= Config.app.game.promotion.broadcastBattleRank && /* must be below a certain battle rank */
tavatar.scorecard.Lives.isEmpty && /* first life after login */
tavatar.scorecard.CurrentLife.prior.isEmpty && /* no revives */
tplayer.History.size == 1 /* did nothing but come into existence */
) {
ZoningOperations.reportProgressionSystem(context.self)
}
}
upstreamMessageCount = 0
player.allowInteraction = true
setAvatar = true
if (
!account.gm && /* gm's are excluded */
Config.app.game.promotion.active && /* play versus progress system must be active */
BattleRank.withExperience(tplayer.avatar.bep).value <= Config.app.game.promotion.broadcastBattleRank && /* must be below a certain battle rank */
tavatar.scorecard.Lives.isEmpty && /* first life after login */
tavatar.scorecard.CurrentLife.prior.isEmpty && /* no revives */
tplayer.History.size == 1 /* did nothing but come into existence */
) {
ZoningOperations.reportProgressionSystem(context.self)
}
}
/**