From cd21b9fb8ab90433415b4a965727a55f84bcf5b2 Mon Sep 17 00:00:00 2001
From: fullwall <fullwall25@gmail.com>
Date: Sun, 12 Jan 2020 21:08:29 +0900
Subject: [PATCH] Increase max controllable speed

---
 .../net/citizensnpcs/trait/Controllable.java  | 62 +++++++++----------
 1 file changed, 30 insertions(+), 32 deletions(-)

diff --git a/main/src/main/java/net/citizensnpcs/trait/Controllable.java b/main/src/main/java/net/citizensnpcs/trait/Controllable.java
index f6ebbfff8..3e636bd85 100644
--- a/main/src/main/java/net/citizensnpcs/trait/Controllable.java
+++ b/main/src/main/java/net/citizensnpcs/trait/Controllable.java
@@ -34,8 +34,8 @@ import net.citizensnpcs.util.Util;
 /**
  * Persists the controllable status for /npc controllable
  *
- * A controllable {@link NPC} can be mounted by a {@link Player} using right click or /npc mount and moved around using
- * e.g. arrow keys.
+ * A controllable {@link NPC} can be mounted by a {@link Player} using right
+ * click or /npc mount and moved around using e.g. arrow keys.
  */
 @TraitName("controllable")
 public class Controllable extends Trait implements Toggleable, CommandConfigurable {
@@ -134,8 +134,7 @@ public class Controllable extends Trait implements Toggleable, CommandConfigurab
     /**
      * Attempts to mount the {@link NPC} onto the supplied {@link Player}.
      *
-     * @param toMount
-     *            the player to mount
+     * @param toMount the player to mount
      * @return whether the mount was successful
      */
     public boolean mount(Player toMount) {
@@ -160,16 +159,16 @@ public class Controllable extends Trait implements Toggleable, CommandConfigurab
         if (NMS.getPassengers(npc.getEntity()).contains(npc.getEntity()))
             return;
         switch (performed) {
-            case RIGHT_CLICK_BLOCK:
-            case RIGHT_CLICK_AIR:
-                controller.rightClick(event);
-                break;
-            case LEFT_CLICK_BLOCK:
-            case LEFT_CLICK_AIR:
-                controller.leftClick(event);
-                break;
-            default:
-                break;
+        case RIGHT_CLICK_BLOCK:
+        case RIGHT_CLICK_AIR:
+            controller.rightClick(event);
+            break;
+        case LEFT_CLICK_BLOCK:
+        case LEFT_CLICK_AIR:
+            controller.leftClick(event);
+            break;
+        default:
+            break;
         }
     }
 
@@ -210,10 +209,10 @@ public class Controllable extends Trait implements Toggleable, CommandConfigurab
     }
 
     /**
-     * Configures the explicit typei.e. whether the NPC should be controlled as if it was a certain {@link EntityType}.
+     * Configures the explicit typei.e. whether the NPC should be controlled as if
+     * it was a certain {@link EntityType}.
      *
-     * @param type
-     *            the explicit type
+     * @param type the explicit type
      */
     public void setExplicitType(EntityType type) {
         this.explicitType = type;
@@ -239,8 +238,8 @@ public class Controllable extends Trait implements Toggleable, CommandConfigurab
     }
 
     /**
-     * Sets whether the {@link Player} attempting to mount the {@link NPC} must actually own the {@link NPC} to mount
-     * it.
+     * Sets whether the {@link Player} attempting to mount the {@link NPC} must
+     * actually own the {@link NPC} to mount it.
      *
      * @see Owner#isOwnedBy(org.bukkit.command.CommandSender)
      */
@@ -272,17 +271,17 @@ public class Controllable extends Trait implements Toggleable, CommandConfigurab
                 new Vector(passenger.getVelocity().getX() * speedMod, 0D, passenger.getVelocity().getZ() * speedMod));
 
         double newSpeed = Math.sqrt(vel.getX() * vel.getX() + vel.getZ() * vel.getZ());
-        if (newSpeed > 0.35D) {
-            double movementFactor = 0.35D / newSpeed;
+        if (newSpeed > 0.5D) {
+            double movementFactor = 0.5D / newSpeed;
             vel = vel.multiply(new Vector(movementFactor, 1, movementFactor));
-            newSpeed = 0.35D;
+            newSpeed = 0.5D;
         }
         handle.setVelocity(vel);
 
-        if (newSpeed > oldSpeed && speed < 0.35D) {
-            return (float) Math.min(0.35D, (speed + ((0.35D - speed) / 35.0D)));
+        if (newSpeed > oldSpeed && speed < 0.5D) {
+            return (float) Math.min(0.5D, (speed + ((0.5D - speed) / 50.0D)));
         } else {
-            return (float) Math.max(0.07D, (speed - ((speed - 0.07D) / 35.0D)));
+            return (float) Math.max(0.07D, (speed - ((speed - 0.07D) / 50.0D)));
         }
     }
 
@@ -405,15 +404,14 @@ public class Controllable extends Trait implements Toggleable, CommandConfigurab
     }
 
     /**
-     * Register a movement controller for a certain {@link EntityType} to be used for {@link NPC}s with that type.
+     * Register a movement controller for a certain {@link EntityType} to be used
+     * for {@link NPC}s with that type.
      *
-     * Default controllers are registered for BAT, BLAZE, ENDER_DRAGON, GHAST, WITHER and PARROT using
-     * {@link PlayerInputAirController}.
+     * Default controllers are registered for BAT, BLAZE, ENDER_DRAGON, GHAST,
+     * WITHER and PARROT using {@link PlayerInputAirController}.
      *
-     * @param type
-     *            the entity type
-     * @param clazz
-     *            the controller class
+     * @param type  the entity type
+     * @param clazz the controller class
      */
     public static void registerControllerType(EntityType type, Class<? extends MovementController> clazz) {
         try {