PhysicsRigidBody: argument validation

stephengold · Sep 1, 2018 · 289ebf7 · 289ebf7
1 parent a744d3d
commit 289ebf7
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/Minie/src/main/java/com/jme3/bullet/objects/PhysicsRigidBody.java b/Minie/src/main/java/com/jme3/bullet/objects/PhysicsRigidBody.java
@@ -49,6 +49,7 @@
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import jme3utilities.Validate;
 
 /**
  * A collision object for rigid bodies, based on Bullet's btRigidBody.
@@ -686,11 +687,14 @@ public void clearForces() {
      */
     @Override
     public void setCollisionShape(CollisionShape collisionShape) {
-        super.setCollisionShape(collisionShape);
-        if (collisionShape instanceof MeshCollisionShape && mass != 0) {
+        Validate.nonNull(collisionShape, "collision shape");
+        if (collisionShape instanceof MeshCollisionShape && mass != 0f) {
             throw new IllegalStateException(
                     "Dynamic rigidbody can not have mesh collision shape!");
         }
+
+        super.setCollisionShape(collisionShape);
+
         if (objectId == 0) {
             rebuildRigidBody();
         } else {