diff --git a/Assets/Scripts/PlayerScripts/NetworkedStateMachines/MovementState/MoveStateManager.cs b/Assets/Scripts/PlayerScripts/NetworkedStateMachines/MovementState/MoveStateManager.cs index f90fd64..922ec42 100644 --- a/Assets/Scripts/PlayerScripts/NetworkedStateMachines/MovementState/MoveStateManager.cs +++ b/Assets/Scripts/PlayerScripts/NetworkedStateMachines/MovementState/MoveStateManager.cs @@ -172,7 +172,6 @@ public class MoveStateManager : NetworkBehaviour } public void SwitchState(MoveBaseState state){ - currentState.ExitState(this, state); //Sets the previous State @@ -314,9 +313,9 @@ public class MoveStateManager : NetworkBehaviour //Get hit into a ragdoll public void GetHit(Vector3 dir, float force){ - //if (!IsLocalPlayer) { return; } dir.Normalize(); dirHit = dir * force; + if (!IsLocalPlayer) { return; } SwitchState(RagdollState); } diff --git a/Assets/Scripts/PlayerScripts/NetworkedStateMachines/OffenseState/OffenseStateManager.cs b/Assets/Scripts/PlayerScripts/NetworkedStateMachines/OffenseState/OffenseStateManager.cs index 5465d94..f487205 100644 --- a/Assets/Scripts/PlayerScripts/NetworkedStateMachines/OffenseState/OffenseStateManager.cs +++ b/Assets/Scripts/PlayerScripts/NetworkedStateMachines/OffenseState/OffenseStateManager.cs @@ -146,7 +146,9 @@ public class OffenseStateManager : NetworkBehaviour [ServerRpc(RequireOwnership = false)] private void ApplyKickServerRPC(Vector3 direction, ulong netObjId) { GameObject[] kickables = GameObject.FindGameObjectsWithTag("kickable"); - GameObject[] players = GameObject.FindGameObjectsWithTag("ArcherTarget"); + + // Get all players in the scene + GameObject[] playableCharacters = GameObject.FindGameObjectsWithTag("ArcherTarget"); foreach (GameObject kickedItem in kickables) { // First check to make sure this is the item we kicked @@ -164,32 +166,14 @@ public class OffenseStateManager : NetworkBehaviour } } - foreach(GameObject kickedPlayer in players){ - //First check if the player is kicked + foreach(GameObject character in playableCharacters){ + if(character.transform.root.GetComponent() != null && character.transform.root.GetComponent().NetworkObjectId == netObjId){ - Debug.Log(kickedPlayer.transform.root.GetComponent().NetworkObjectId); - - if(kickedPlayer.transform.root.GetComponent().NetworkObjectId == netObjId){ - Debug.Log("Kicked Players NetObjId is equal to the NetObjId"); - } - else{ - Debug.Log("Kicked Player NetObjId not equal to the NetObjId"); - } - - if(kickedPlayer.transform.root.GetComponent().NetworkObjectId != this.transform.root.GetComponent().NetworkObjectId){ - Debug.Log("Kicked Player Not The Same as Me"); - } - else{ - Debug.Log("My RPC ID: " + this.transform.root.GetComponent().NetworkObjectId); - Debug.Log("Their RPC ID: " + kickedPlayer.transform.root.GetComponent().NetworkObjectId); - } - - if(kickedPlayer.transform.root.GetComponent() != null && kickedPlayer.transform.root.GetComponent().NetworkObjectId == netObjId){ Debug.Log("Kicking other user"); - kickedPlayer.GetComponent().GetHit(direction, 20); + character.GetComponent().GetHit(direction, 20); + return; } - return; } } } diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index fad1e65..15e8bd9 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -15,22 +15,22 @@ EditorUserSettings: value: 22424703114646680e0b0227036c7b151b180b650e3a233126281f3fe7c23837e1ec25a7f234362820 flags: 0 RecentlyUsedScenePath-3: - value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb + value: 22424703114646680e0b0227036c731f1415016439262f2434 flags: 0 RecentlyUsedScenePath-4: - value: 22424703114646680e0b0227036c731f1415016439262f2434 - flags: 0 - RecentlyUsedScenePath-5: - value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb - flags: 0 - RecentlyUsedScenePath-6: value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26 flags: 0 - RecentlyUsedScenePath-7: + RecentlyUsedScenePath-5: + value: 22424703114646680e0b0227036c731f1415016439262f2434 + flags: 0 + RecentlyUsedScenePath-6: value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb flags: 0 + RecentlyUsedScenePath-7: + value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb + flags: 0 RecentlyUsedScenePath-8: - value: 22424703114646680e0b0227036c731f1415016439262f2434 + value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb flags: 0 RecentlyUsedScenePath-9: value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb