Clean up jump implementation and remove left click to jump

src/main/java/net/citizensnpcs/trait/Controllable.java

@@ -2,8 +2,6 @@
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
 import java.util.Map;
 
 import net.citizensnpcs.Settings.Setting;
@@ -241,7 +239,6 @@ private void jump() {
 
         @Override
         public void leftClick(PlayerInteractEvent event) {
-            jump();
         }
 
         @Override
@@ -283,23 +280,24 @@ private void updateSpeed(EntityLiving handle, float speedMod) {
                 newSpeed = 0.35D;
             }
 
+            boolean shouldJump = false;
             try {
-                if (JUMP_FIELD.getBoolean(handle.passenger)) {
-                    if (handle.onGround && jumpTicks == 0) {
-                        JUMP_METHOD.invoke(handle, (Object[]) null);
-                        jumpTicks = 10;
-                    }
-                } else {
-                    jumpTicks = 0;
-                }
-                jumpTicks = Math.max(0, jumpTicks - 1);
+                if (JUMP_FIELD != null)
+                    shouldJump = JUMP_FIELD.getBoolean(handle.passenger);
             } catch (IllegalArgumentException e) {
                 e.printStackTrace();
             } catch (IllegalAccessException e) {
                 e.printStackTrace();
-            } catch (InvocationTargetException e) {
-                e.printStackTrace();
             }
+            if (shouldJump) {
+                if (handle.onGround && jumpTicks == 0) {
+                    jump();
+                    jumpTicks = 10;
+                }
+            } else {
+                jumpTicks = 0;
+            }
+            jumpTicks = Math.max(0, jumpTicks - 1);
 
             if (newSpeed > oldSpeed && this.speed < 0.35D) {
                 this.speed = Math.min(0.35D, (this.speed + ((0.35D - this.speed) / 35.0D)));
@@ -325,22 +323,7 @@ public static interface MovementController {
 
     private static final Map<EntityType, Class<? extends MovementController>> controllerTypes = Maps
             .newEnumMap(EntityType.class);
-
-    private static Field JUMP_FIELD;
-    private static Method JUMP_METHOD = null;
-
-    static {
-        JUMP_FIELD = NMS.getField(EntityLiving.class, "bd");
-        JUMP_FIELD.setAccessible(true);
-        try {
-            JUMP_METHOD = EntityLiving.class.getDeclaredMethod("ba", (Class<?>[]) null);
-            JUMP_METHOD.setAccessible(true);
-        } catch (SecurityException e) {
-            e.printStackTrace();
-        } catch (NoSuchMethodException e) {
-            e.printStackTrace();
-        }
-    }
+    private static final Field JUMP_FIELD = NMS.getField(EntityLiving.class, "bd");
 
     static {
         controllerTypes.put(EntityType.BAT, AirController.class);