From 48bdf66fc69ad5e62a2c7603556d7002b01f048f Mon Sep 17 00:00:00 2001
From: Melbyj1125 <60886701+Melbyj1125@users.noreply.github.com>
Date: Wed, 2 Mar 2022 14:17:14 -0600
Subject: [PATCH] player shouldn't kick themselves

---
 .../DebugOffenseState/dOffenseStateManager.cs             | 8 ++++----
 .../MovementState/Incapacitated/MoveRagdollState.cs       | 2 +-
 .../OffenseState/OffenseStateManager.cs                   | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Assets/Scripts/PlayerScripts/DebugStateMachine/DebugOffenseState/dOffenseStateManager.cs b/Assets/Scripts/PlayerScripts/DebugStateMachine/DebugOffenseState/dOffenseStateManager.cs
index 4ff7fb4..c0caaf4 100644
--- a/Assets/Scripts/PlayerScripts/DebugStateMachine/DebugOffenseState/dOffenseStateManager.cs
+++ b/Assets/Scripts/PlayerScripts/DebugStateMachine/DebugOffenseState/dOffenseStateManager.cs
@@ -116,9 +116,9 @@ public class dOffenseStateManager : NetworkBehaviour
             collision.transform.gameObject.GetComponent<BreakableBlock>().damage(pStats.KickPow);
         }
 
-        if(collision.transform.CompareTag("ArcherTarget") && myCollider == legHitbox.GetComponent<Collider>()){
-            Vector3 direction = this.transform.forward;
-            collision.gameObject.GetComponent<dMoveStateManager>().GetHit(this.transform.forward, 10);
-        }
+        // if(collision.transform.CompareTag("ArcherTarget") && myCollider == legHitbox.GetComponent<Collider>()){
+        //     Vector3 direction = this.transform.forward;
+        //     collision.gameObject.GetComponent<dMoveStateManager>().GetHit(this.transform.forward, 10);
+        // }
     }
 }
diff --git a/Assets/Scripts/PlayerScripts/NetworkedStateMachines/MovementState/Incapacitated/MoveRagdollState.cs b/Assets/Scripts/PlayerScripts/NetworkedStateMachines/MovementState/Incapacitated/MoveRagdollState.cs
index 971b04a..0f932fe 100644
--- a/Assets/Scripts/PlayerScripts/NetworkedStateMachines/MovementState/Incapacitated/MoveRagdollState.cs
+++ b/Assets/Scripts/PlayerScripts/NetworkedStateMachines/MovementState/Incapacitated/MoveRagdollState.cs
@@ -24,7 +24,7 @@ public class MoveRagdollState : MoveBaseState
 
     public override void ExitState(MoveStateManager mSM, MoveBaseState nextState){
 
-            mSM.pStats.GravVel = 60; // resets gravVel
+            mSM.pStats.GravVel = 80; // resets gravVel
             mSM.capCol.enabled = false; // disable capsule collider
             mSM.moveController.enabled = true; // enable move controller
             mSM.rB.isKinematic = true; // enable kinematic
diff --git a/Assets/Scripts/PlayerScripts/NetworkedStateMachines/OffenseState/OffenseStateManager.cs b/Assets/Scripts/PlayerScripts/NetworkedStateMachines/OffenseState/OffenseStateManager.cs
index 4d6bde1..6c27175 100644
--- a/Assets/Scripts/PlayerScripts/NetworkedStateMachines/OffenseState/OffenseStateManager.cs
+++ b/Assets/Scripts/PlayerScripts/NetworkedStateMachines/OffenseState/OffenseStateManager.cs
@@ -148,7 +148,7 @@ public class OffenseStateManager : NetworkBehaviour
 
         foreach(GameObject kickedPlayer in players){
             //First check if the player is kicked
-            if(kickedPlayer.transform.root.GetComponent<NetworkObject>() != null && kickedPlayer.transform.root.GetComponent<NetworkObject>().NetworkObjectId == netObjId){
+            if(kickedPlayer.transform.root.GetComponent<NetworkObject>() != null && kickedPlayer.transform.root.GetComponent<NetworkObject>().NetworkObjectId == netObjId && kickedPlayer.transform.root.GetComponent<NetworkObject>().NetworkObjectId != this.transform.root.GetComponent<NetworkObject>().NetworkObjectId){
                 kickedPlayer.GetComponent<MoveStateManager>().GetHit(direction, 10);
             }