From 306e2a63c045a3fcc5c1eda5638567067711cb5a Mon Sep 17 00:00:00 2001
From: Fate-JH <Jason_DiDonato@yahoo.com>
Date: Fri, 17 May 2024 00:06:11 -0400
Subject: [PATCH] Mine Kill Restoration (#1203)

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

* Update ZoningOperations.scala

Rearranging order and priority of conditions
---
 .../session/support/ZoningOperations.scala    | 31 ++++++++++---------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/main/scala/net/psforever/actors/session/support/ZoningOperations.scala b/src/main/scala/net/psforever/actors/session/support/ZoningOperations.scala
index 1be59aa2b..ca3f4a125 100644
--- a/src/main/scala/net/psforever/actors/session/support/ZoningOperations.scala
+++ b/src/main/scala/net/psforever/actors/session/support/ZoningOperations.scala
@@ -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)
-      }
     }
 
     /**