Merge pull request #74 from fragmental/playtestfixes

hopefully fixes a few errors in online multiplayer
Double-Fine-Game-Club · Apr 24, 2017 · c120753 · c120753
2 parents da91a42 + 8be5dcb
commit c120753
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/Assets/scripts/entity/Ball.cs b/Assets/scripts/entity/Ball.cs
@@ -32,11 +32,13 @@ private void FixedUpdate()
 
         if (rigidBody.velocity.magnitude < minimumVelocity)
         {
-			rigidBody.velocity *= minimumVelocity / rigidBody.velocity.magnitude;
+            //added a ver small number to keep from dividing by zero
+            rigidBody.velocity *= minimumVelocity / rigidBody.velocity.magnitude + 0.000000001F;
         }
         if (rigidBody.velocity.magnitude > maximumVelocity)
         {
-			rigidBody.velocity *= maximumVelocity / rigidBody.velocity.magnitude;
+            //added a ver small number to keep from dividing by zero
+            rigidBody.velocity *= maximumVelocity / rigidBody.velocity.magnitude + 0.000000001F;
         }
     }
 
@@ -105,6 +107,9 @@ void OnTriggerEnter(Collider Col)
 
 	void OnCollisionExit(Collision other)
 	{
+        // Only handle ball force server-side of local
+        if (NetworkManager.singleton.isNetworkActive && NetworkServer.connections.Count == 0) return;
+
 		if (other.gameObject.tag == "Paddle" ||
 		   	other.gameObject.tag == "Bumper")
 		{