From b1e76c84e52680b8d34de3e3115471b142d3cf91 Mon Sep 17 00:00:00 2001
From: Fate-JH <Jason_DiDonato@yahoo.com>
Date: Thu, 16 May 2024 23:51:00 -0400
Subject: [PATCH] Update ZoningOperations.scala

Rearranging order and priority of conditions
---
 .../psforever/actors/session/support/ZoningOperations.scala | 6 ++++--
 1 file changed, 4 insertions(+), 2 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 af450446e..ca3f4a125 100644
--- a/src/main/scala/net/psforever/actors/session/support/ZoningOperations.scala
+++ b/src/main/scala/net/psforever/actors/session/support/ZoningOperations.scala
@@ -3076,8 +3076,10 @@ class ZoningOperations(
         setAvatar = true
         player.allowInteraction = true
         upstreamMessageCount = 0
-        if (!setAvatar && tplayer.spectator) {
-          context.self ! SessionActor.SetMode(SpectatorMode) //should reload spectator status
+        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 */