From 2054586a0dfdb9f839e3c486ba59f00f9f7e5d7b Mon Sep 17 00:00:00 2001
From: FateJH <Jason_DiDonato@yahoo.com>
Date: Tue, 14 Jul 2020 17:52:19 -0400
Subject: [PATCH] merge rebase resolutions

---
 src/main/scala/net/psforever/actors/session/SessionActor.scala | 3 ---
 src/main/scala/net/psforever/objects/Player.scala              | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/main/scala/net/psforever/actors/session/SessionActor.scala b/src/main/scala/net/psforever/actors/session/SessionActor.scala
index 8770d1e45..a76870c16 100644
--- a/src/main/scala/net/psforever/actors/session/SessionActor.scala
+++ b/src/main/scala/net/psforever/actors/session/SessionActor.scala
@@ -3807,9 +3807,6 @@ class SessionActor extends Actor with MDCContextAware {
         //log.info(s"$msg")
         persist()
         turnCounterFunc(avatar_guid)
-        if(is_crouching && !player.Crouching) {
-          //sendResponse(PlanetsideAttributeMessage(player.GUID, 54, 2))
-        }
         val isMoving = WorldEntity.isMoving(vel)
         val isMovingPlus = isMoving || is_jumping || jump_thrust
         if (isMovingPlus) {
diff --git a/src/main/scala/net/psforever/objects/Player.scala b/src/main/scala/net/psforever/objects/Player.scala
index 19ff2ad7b..111fa739b 100644
--- a/src/main/scala/net/psforever/objects/Player.scala
+++ b/src/main/scala/net/psforever/objects/Player.scala
@@ -355,7 +355,7 @@ class Player(var avatar: Avatar)
     afk = away
     AwayFromKeyboard
   }
-  
+
   def Aura : Set[AuraEffect.Value] = aura
 
   def AddEffectToAura(effect : AuraEffect.Value) : Set[AuraEffect.Value] = {