Fix fast falling into ledge and jump resets

HouraiTeahouse · Jan 24, 2017 · cf048d0 · cf048d0
1 parent 72c2891
commit cf048d0
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/Assets/Dependencies/SmashBrew/Character/States/MovementState.cs b/Assets/Dependencies/SmashBrew/Character/States/MovementState.cs
@@ -132,7 +132,10 @@ public enum CharacterFacingMode {
 
         public Transform CurrentLedge {
             get { return _currentLedge; }
-            set { _currentLedge = value; }
+            set {
+                _currentLedge = value;
+                CmdResetJumps();
+            }
         }
 
         void Start() {
@@ -150,12 +153,13 @@ struct MovementInfo {
         }
 
         void Update() {
-            if (!hasAuthority)
+            if (!isLocalPlayer)
                 return;
 
             var movement = new MovementInfo { facing = Direction };
             // If currently hanging from a edge
             if (CurrentLedge != null) {
+                IsFastFalling = false;
                 var offset = LedgeTarget.position - transform.position;
                 transform.position = CurrentLedge.position - offset;
                 if (JumpCount != MaxJumpCount)
@@ -239,12 +243,6 @@ struct MovementInfo {
         [Command]
         void CmdSetDirection(bool direction) { _direction = direction; }
 
-        [ClientRpc]
-        public void RpcMove(Vector3 position, bool direction) {
-            transform.position = position;
-            Direction = direction;
-        }
-
         void OnChangeDirection(bool direction) {
             _direction = direction;
             if (FacingMode == CharacterFacingMode.Rotation) {