diff --git a/main/src/main/java/net/citizensnpcs/Citizens.java b/main/src/main/java/net/citizensnpcs/Citizens.java
index ec3b8a40c..ee4d30118 100644
--- a/main/src/main/java/net/citizensnpcs/Citizens.java
+++ b/main/src/main/java/net/citizensnpcs/Citizens.java
@@ -102,7 +102,7 @@ public class Citizens extends JavaPlugin implements CitizensPlugin {
         @Override
         public OfflinePlayer getPlayer(BlockCommandSender sender) {
             Entity entity = NMS.getSource(sender);
-            return entity != null && entity instanceof OfflinePlayer ? (OfflinePlayer) entity : null;
+            return entity instanceof OfflinePlayer ? (OfflinePlayer) entity : null;
         }
 
         @Override
@@ -182,11 +182,9 @@ public class Citizens extends JavaPlugin implements CitizensPlugin {
         if (type.equalsIgnoreCase("nbt")) {
             saves = new NBTStorage(new File(folder, Setting.STORAGE_FILE.asString()), "Citizens NPC Storage");
         }
-
         if (saves == null) {
             saves = new YamlStorage(new File(folder, Setting.STORAGE_FILE.asString()), "Citizens NPC Storage");
         }
-
         if (!saves.load())
             return null;
 
@@ -195,8 +193,9 @@ public class Citizens extends JavaPlugin implements CitizensPlugin {
 
     private void despawnNPCs(boolean save) {
         for (NPCRegistry registry : Iterables.concat(Arrays.asList(npcRegistry), citizensBackedRegistries)) {
-            if (registry == null)
+            if (registry == null) {
                 continue;
+            }
             if (save) {
                 if (registry == npcRegistry) {
                     storeNPCs(false);
@@ -237,33 +236,27 @@ public class Citizens extends JavaPlugin implements CitizensPlugin {
 
     @Override
     public Iterable<NPCRegistry> getNPCRegistries() {
-        return new Iterable<NPCRegistry>() {
+        return () -> new Iterator<NPCRegistry>() {
+            Iterator<NPCRegistry> stored;
+
             @Override
-            public Iterator<NPCRegistry> iterator() {
-                return new Iterator<NPCRegistry>() {
-                    Iterator<NPCRegistry> stored;
+            public boolean hasNext() {
+                return stored == null ? true : stored.hasNext();
+            }
 
-                    @Override
-                    public boolean hasNext() {
-                        return stored == null ? true : stored.hasNext();
-                    }
+            @Override
+            public NPCRegistry next() {
+                if (stored == null) {
+                    stored = Iterables.concat(storedRegistries.values(), anonymousRegistries, citizensBackedRegistries)
+                            .iterator();
+                    return npcRegistry;
+                }
+                return stored.next();
+            }
 
-                    @Override
-                    public NPCRegistry next() {
-                        if (stored == null) {
-                            stored = Iterables
-                                    .concat(storedRegistries.values(), anonymousRegistries, citizensBackedRegistries)
-                                    .iterator();
-                            return npcRegistry;
-                        }
-                        return stored.next();
-                    }
-
-                    @Override
-                    public void remove() {
-                        throw new UnsupportedOperationException();
-                    }
-                };
+            @Override
+            public void remove() {
+                throw new UnsupportedOperationException();
             }
         };
     }
@@ -392,7 +385,6 @@ public class Citizens extends JavaPlugin implements CitizensPlugin {
             Bukkit.getPluginManager().disablePlugin(this);
             return;
         }
-
         registerScriptHelpers();
 
         saves = createStorage(getDataFolder());
@@ -402,15 +394,12 @@ public class Citizens extends JavaPlugin implements CitizensPlugin {
             Bukkit.getPluginManager().disablePlugin(this);
             return;
         }
-
         locationLookup = new LocationLookup();
         locationLookup.runTaskTimer(CitizensAPI.getPlugin(), 0, 5);
 
         npcRegistry = new CitizensNPCRegistry(saves, "citizens");
         traitFactory = new CitizensTraitFactory(this);
-        traitFactory.registerTrait(TraitInfo.create(ShopTrait.class).withSupplier(() -> {
-            return new ShopTrait(shops);
-        }));
+        traitFactory.registerTrait(TraitInfo.create(ShopTrait.class).withSupplier(() -> new ShopTrait(shops)));
         selector = new NPCSelector(this);
 
         Bukkit.getPluginManager().registerEvents(new EventListen(), this);
@@ -426,7 +415,6 @@ public class Citizens extends JavaPlugin implements CitizensPlugin {
         if (papi != null && papi.isEnabled()) {
             new CitizensPlaceholders(selector).register();
         }
-
         setupEconomy();
 
         registerCommands();
@@ -506,12 +494,11 @@ public class Citizens extends JavaPlugin implements CitizensPlugin {
 
     @Override
     public void setDefaultNPCDataStore(NPCDataStore store) {
-        if (store == null) {
+        if (store == null)
             throw new IllegalArgumentException("must be non-null");
-        }
         despawnNPCs(true);
-        this.saves = store;
-        this.npcRegistry = new CitizensNPCRegistry(saves, "citizens-global-" + UUID.randomUUID().toString());
+        saves = store;
+        npcRegistry = new CitizensNPCRegistry(saves, "citizens-global-" + UUID.randomUUID().toString());
         saves.loadInto(npcRegistry);
     }
 
@@ -614,7 +601,6 @@ public class Citizens extends JavaPlugin implements CitizensPlugin {
                     }
                 }
             }
-
             saves.loadInto(npcRegistry);
             shops.load();
 
diff --git a/main/src/main/java/net/citizensnpcs/CitizensPlaceholders.java b/main/src/main/java/net/citizensnpcs/CitizensPlaceholders.java
index 6c10adee9..06d5154cc 100644
--- a/main/src/main/java/net/citizensnpcs/CitizensPlaceholders.java
+++ b/main/src/main/java/net/citizensnpcs/CitizensPlaceholders.java
@@ -55,7 +55,6 @@ public class CitizensPlaceholders extends PlaceholderExpansion {
                                 b.getEntity().getLocation().distanceSquared(location)));
                 return closestNPC.isPresent() ? Integer.toString(closestNPC.get().getId()) : "";
         }
-
         return null;
     }
 
diff --git a/main/src/main/java/net/citizensnpcs/EventListen.java b/main/src/main/java/net/citizensnpcs/EventListen.java
index 5a21a1174..be36e334d 100644
--- a/main/src/main/java/net/citizensnpcs/EventListen.java
+++ b/main/src/main/java/net/citizensnpcs/EventListen.java
@@ -120,11 +120,11 @@ import net.citizensnpcs.util.Util;
 
 public class EventListen implements Listener {
     private Listener chunkEventListener;
-    private final SkinUpdateTracker skinUpdateTracker;
+    private SkinUpdateTracker skinUpdateTracker;
     private final ListMultimap<ChunkCoord, NPC> toRespawn = ArrayListMultimap.create(64, 4);
 
     EventListen() {
-        this.skinUpdateTracker = new SkinUpdateTracker();
+        skinUpdateTracker = new SkinUpdateTracker();
         try {
             Class.forName("org.bukkit.event.world.EntitiesLoadEvent");
             Bukkit.getPluginManager().registerEvents(new Listener() {
@@ -140,7 +140,6 @@ public class EventListen implements Listener {
             }, CitizensAPI.getPlugin());
         } catch (Throwable ex) {
         }
-
         try {
             Class.forName("org.bukkit.event.entity.EntityTransformEvent");
             Bukkit.getPluginManager().registerEvents(new Listener() {
@@ -156,23 +155,19 @@ public class EventListen implements Listener {
             }, CitizensAPI.getPlugin());
         } catch (Throwable ex) {
         }
-
         Class<?> kbc = null;
         try {
             kbc = Class.forName("com.destroystokyo.paper.event.entity.EntityKnockbackByEntityEvent");
         } catch (ClassNotFoundException e) {
         }
-
         if (kbc != null) {
             registerKnockbackEvent(kbc);
         }
-
         Class<?> pbeac = null;
         try {
             pbeac = Class.forName("io.papermc.paper.event.entity.EntityPushedByEntityAttackEvent");
         } catch (ClassNotFoundException e) {
         }
-
         if (pbeac != null) {
             registerPushEvent(pbeac);
         }
@@ -184,8 +179,9 @@ public class EventListen implements Listener {
         int limit = Setting.DEFAULT_NPC_LIMIT.asInt();
         int maxChecks = Setting.MAX_NPC_LIMIT_CHECKS.asInt();
         for (int i = maxChecks; i >= 0; i--) {
-            if (!event.getCreator().hasPermission("citizens.npc.limit." + i))
+            if (!event.getCreator().hasPermission("citizens.npc.limit." + i)) {
                 continue;
+            }
             limit = i;
             break;
         }
@@ -215,7 +211,6 @@ public class EventListen implements Listener {
         if (Messaging.isDebugging() && Setting.DEBUG_CHUNK_LOADS.asBoolean() && toRespawn.containsKey(coord)) {
             new Exception("CITIZENS CHUNK LOAD DEBUG " + coord).printStackTrace();
         }
-
         if (event instanceof Cancellable) {
             runnable.run();
         } else {
@@ -231,7 +226,7 @@ public class EventListen implements Listener {
     }
 
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onChunkUnload(final ChunkUnloadEvent event) {
+    public void onChunkUnload(ChunkUnloadEvent event) {
         if (chunkEventListener != null)
             return;
 
@@ -290,7 +285,6 @@ public class EventListen implements Listener {
             }
             return;
         }
-
         event.setCancelled(npc.isProtected());
 
         if (event instanceof EntityDamageByEntityEvent) {
@@ -306,7 +300,6 @@ public class EventListen implements Listener {
                 if (npc == null)
                     return;
             }
-
             NPCLeftClickEvent leftClickEvent = new NPCLeftClickEvent(npc, damager);
             Bukkit.getPluginManager().callEvent(leftClickEvent);
             if (npc.hasTrait(CommandTrait.class)) {
@@ -321,15 +314,14 @@ public class EventListen implements Listener {
 
     @EventHandler(ignoreCancelled = true)
     public void onEntityDeath(EntityDeathEvent event) {
-        final NPC npc = CitizensAPI.getNPCRegistry().getNPC(event.getEntity());
+        NPC npc = CitizensAPI.getNPCRegistry().getNPC(event.getEntity());
         if (npc == null)
             return;
 
         if (!npc.data().get(NPC.Metadata.DROPS_ITEMS, false)) {
             event.getDrops().clear();
         }
-
-        final Location location = npc.getStoredLocation();
+        Location location = npc.getStoredLocation();
         Bukkit.getPluginManager().callEvent(new NPCDeathEvent(npc, event));
         npc.despawn(DespawnReason.DEATH);
 
@@ -438,7 +430,6 @@ public class EventListen implements Listener {
         if (npc.isSpawned() && npc.getEntity().getType() == EntityType.PLAYER) {
             onNPCPlayerLinkToPlayer(event);
         }
-
         ClickRedirectTrait crt = npc.getTraitNullable(ClickRedirectTrait.class);
         if (crt != null) {
             HologramTrait ht = crt.getRedirectNPC().getTraitNullable(HologramTrait.class);
@@ -468,7 +459,6 @@ public class EventListen implements Listener {
             }
             return;
         }
-
         Bukkit.getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(), () -> {
             if (!tracker.isValid() || !event.getPlayer().isValid())
                 return;
@@ -488,12 +478,15 @@ public class EventListen implements Listener {
     @EventHandler(ignoreCancelled = true)
     public void onNPCSeenByPlayer(NPCSeenByPlayerEvent event) {
         NPC npc = event.getNPC();
+        PlayerFilter pf = npc.getTraitNullable(PlayerFilter.class);
+        if (pf != null) {
+            event.setCancelled(pf.onSeenByPlayer(event.getPlayer()));
+        }
         ClickRedirectTrait crt = npc.getTraitNullable(ClickRedirectTrait.class);
         if (crt != null) {
             npc = crt.getRedirectNPC();
         }
-
-        PlayerFilter pf = npc.getTraitNullable(PlayerFilter.class);
+        pf = npc.getTraitNullable(PlayerFilter.class);
         if (pf != null) {
             event.setCancelled(pf.onSeenByPlayer(event.getPlayer()));
         }
@@ -561,27 +554,22 @@ public class EventListen implements Listener {
         if (event.getPlayer().getItemInHand().getType() == Material.NAME_TAG) {
             rightClickEvent.setCancelled(npc.isProtected());
         }
-
         Bukkit.getPluginManager().callEvent(rightClickEvent);
         if (rightClickEvent.isCancelled()) {
             event.setCancelled(true);
             return;
         }
-
         if (npc.hasTrait(CommandTrait.class)) {
             npc.getTraitNullable(CommandTrait.class).dispatch(player, CommandTrait.Hand.RIGHT);
             rightClickEvent.setDelayedCancellation(true);
         }
-
         if (npc.hasTrait(ShopTrait.class)) {
             npc.getTraitNullable(ShopTrait.class).onRightClick(player);
             rightClickEvent.setDelayedCancellation(true);
         }
-
         if (rightClickEvent.isDelayedCancellation()) {
             event.setCancelled(true);
         }
-
         if (event.isCancelled()) {
             if (SUPPORT_STOP_USE_ITEM) {
                 try {
@@ -617,7 +605,7 @@ public class EventListen implements Listener {
     // recalculate player NPCs the first time a player moves and every time
     // a player moves a certain distance from their last position.
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
-    public void onPlayerMove(final PlayerMoveEvent event) {
+    public void onPlayerMove(PlayerMoveEvent event) {
         skinUpdateTracker.onPlayerMove(event.getPlayer());
     }
 
@@ -630,7 +618,6 @@ public class EventListen implements Listener {
                 event.getPlayer().leaveVehicle();
             }
         }
-
         skinUpdateTracker.removePlayer(event.getPlayer().getUniqueId());
         CitizensAPI.getLocationLookup().onQuit(event);
     }
@@ -641,7 +628,7 @@ public class EventListen implements Listener {
     }
 
     @EventHandler(ignoreCancelled = true)
-    public void onPlayerTeleport(final PlayerTeleportEvent event) {
+    public void onPlayerTeleport(PlayerTeleportEvent event) {
         NPC npc = CitizensAPI.getNPCRegistry().getNPC(event.getPlayer());
         if (event.getCause() == TeleportCause.PLUGIN && npc != null && !npc.data().has("citizens-force-teleporting")
                 && Setting.PLAYER_TELEPORT_DELAY.asTicks() > 0) {
@@ -652,7 +639,6 @@ public class EventListen implements Listener {
                 npc.data().remove("citizens-force-teleporting");
             }, Setting.PLAYER_TELEPORT_DELAY.asTicks());
         }
-
         skinUpdateTracker.updatePlayer(event.getPlayer(), 15, true);
     }
 
@@ -673,9 +659,9 @@ public class EventListen implements Listener {
     public void onPotionSplashEvent(PotionSplashEvent event) {
         for (LivingEntity entity : event.getAffectedEntities()) {
             NPC npc = CitizensAPI.getNPCRegistry().getNPC(entity);
-            if (npc == null)
+            if (npc == null) {
                 continue;
-
+            }
             if (npc.isProtected()) {
                 event.setIntensity(entity, 0);
             }
@@ -683,7 +669,7 @@ public class EventListen implements Listener {
     }
 
     @EventHandler(ignoreCancelled = true)
-    public void onProjectileHit(final ProjectileHitEvent event) {
+    public void onProjectileHit(ProjectileHitEvent event) {
         if (!(event.getEntity() instanceof FishHook))
             return;
         NMS.removeHookIfNecessary((FishHook) event.getEntity());
@@ -696,7 +682,6 @@ public class EventListen implements Listener {
                     cancel();
                     return;
                 }
-
                 NMS.removeHookIfNecessary((FishHook) event.getEntity());
             }
         }.runTaskTimer(CitizensAPI.getPlugin(), 0, 1);
@@ -735,7 +720,7 @@ public class EventListen implements Listener {
     }
 
     @EventHandler(ignoreCancelled = true)
-    public void onVehicleEnter(final VehicleEnterEvent event) {
+    public void onVehicleEnter(VehicleEnterEvent event) {
         NPC npc = CitizensAPI.getNPCRegistry().getNPC(event.getVehicle());
         NPC rider = CitizensAPI.getNPCRegistry().getNPC(event.getEntered());
         if (npc == null) {
@@ -743,10 +728,8 @@ public class EventListen implements Listener {
                     || event.getVehicle() instanceof Minecart)) {
                 event.setCancelled(true);
             }
-
             return;
         }
-
         if (rider != null || !(npc instanceof Vehicle))
             return;
 
@@ -758,8 +741,10 @@ public class EventListen implements Listener {
     @EventHandler(ignoreCancelled = true)
     public void onWorldLoad(WorldLoadEvent event) {
         for (ChunkCoord chunk : toRespawn.keySet()) {
-            if (!chunk.worldUUID.equals(event.getWorld().getUID()) || !event.getWorld().isChunkLoaded(chunk.x, chunk.z))
+            if (!chunk.worldUUID.equals(event.getWorld().getUID())
+                    || !event.getWorld().isChunkLoaded(chunk.x, chunk.z)) {
                 continue;
+            }
             respawnAllFromCoord(chunk, event);
         }
     }
@@ -767,9 +752,9 @@ public class EventListen implements Listener {
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onWorldUnload(WorldUnloadEvent event) {
         for (NPC npc : getAllNPCs()) {
-            if (npc == null || !npc.isSpawned() || !npc.getEntity().getWorld().equals(event.getWorld()))
+            if (npc == null || !npc.isSpawned() || !npc.getEntity().getWorld().equals(event.getWorld())) {
                 continue;
-
+            }
             boolean despawned = npc.despawn(DespawnReason.WORLD_UNLOAD);
             if (event.isCancelled() || !despawned) {
                 for (ChunkCoord coord : toRespawn.keySet()) {
@@ -780,7 +765,6 @@ public class EventListen implements Listener {
                 event.setCancelled(true);
                 return;
             }
-
             if (npc.isSpawned()) {
                 toRespawn.put(new ChunkCoord(npc.getEntity().getLocation()), npc);
                 Messaging.debug("Despawned", npc, "due to world unload at", event.getWorld().getName());
@@ -829,9 +813,7 @@ public class EventListen implements Listener {
             Method getAcceleration = clazz.getMethod("getAcceleration");
             handlers.register(new RegisteredListener(new Listener() {
             }, (listener, event) -> {
-                if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0)
-                    return;
-                if (event.getClass() != clazz)
+                if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0 || event.getClass() != clazz)
                     return;
                 try {
                     Entity entity = (Entity) getEntity.invoke(event);
@@ -858,26 +840,22 @@ public class EventListen implements Listener {
         if (ids.size() > 0) {
             Messaging.debug("Respawning all NPCs at", coord, "due to", event);
         }
-
         for (int i = 0; i < ids.size(); i++) {
             NPC npc = ids.get(i);
             if (npc.getOwningRegistry().getById(npc.getId()) != npc) {
                 Messaging.idebug(() -> "Prevented deregistered NPC from respawning " + npc);
                 continue;
             }
-
             if (npc.isSpawned()) {
                 Messaging.idebug(() -> "Can't respawn NPC " + npc + ": already spawned");
                 continue;
             }
-
             boolean success = spawn(npc);
             if (!success) {
                 ids.remove(i--);
                 Messaging.idebug(() -> Joiner.on(' ').join("Couldn't respawn", npc, "during", event, "at", coord));
                 continue;
             }
-
             Messaging.idebug(() -> Joiner.on(' ').join("Spawned", npc, "during", event, "at", coord));
         }
         for (NPC npc : ids) {
@@ -895,16 +873,16 @@ public class EventListen implements Listener {
     }
 
     void unloadNPCs(ChunkEvent event, List<Entity> entities) {
-        final List<NPC> toDespawn = Lists.newArrayList();
+        List<NPC> toDespawn = Lists.newArrayList();
         for (Entity entity : entities) {
             NPC npc = CitizensAPI.getNPCRegistry().getNPC(entity);
             // XXX : npc#isSpawned() checks entity valid status which is now inconsistent on chunk unload between
             // different server software (e.g. Paper and Spigot), so check for npc.getEntity() == null instead.
-            if (npc == null || npc.getEntity() == null)
+            if (npc == null || npc.getEntity() == null) {
                 continue;
+            }
             toDespawn.add(npc);
         }
-
         if (toDespawn.isEmpty())
             return;
 
@@ -918,7 +896,6 @@ public class EventListen implements Listener {
                     toRespawn.put(coord, npc);
                     continue;
                 }
-
                 ((Cancellable) event).setCancelled(true);
                 Messaging.debug("Cancelled chunk unload at", coord);
                 respawnAllFromCoord(coord, event);
@@ -930,7 +907,6 @@ public class EventListen implements Listener {
         if (Messaging.isDebugging() && Setting.DEBUG_CHUNK_LOADS.asBoolean()) {
             new Exception("CITIZENS CHUNK UNLOAD DEBUG " + coord).printStackTrace();
         }
-
         if (loadChunk) {
             Messaging.idebug(() -> Joiner.on(' ').join("Loading chunk in 10 ticks due to forced chunk load at", coord));
             Bukkit.getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(), () -> {
diff --git a/main/src/main/java/net/citizensnpcs/Metrics.java b/main/src/main/java/net/citizensnpcs/Metrics.java
index 056927201..fc52c1d08 100644
--- a/main/src/main/java/net/citizensnpcs/Metrics.java
+++ b/main/src/main/java/net/citizensnpcs/Metrics.java
@@ -91,7 +91,7 @@ public class Metrics {
         metricsBase = new MetricsBase("bukkit", serverUUID, serviceId, enabled, this::appendPlatformData,
                 this::appendServiceData, submitDataTask -> Bukkit.getScheduler().runTask(plugin, submitDataTask),
                 plugin::isEnabled, (message, error) -> this.plugin.getLogger().log(Level.WARNING, message, error),
-                (message) -> this.plugin.getLogger().log(Level.INFO, message), logErrors, logSentData,
+                message -> this.plugin.getLogger().log(Level.INFO, message), logErrors, logSentData,
                 logResponseStatusText);
     }
 
@@ -156,10 +156,9 @@ public class Metrics {
         protected JsonObjectBuilder.JsonObject getChartData() throws Exception {
             JsonObjectBuilder valuesBuilder = new JsonObjectBuilder();
             Map<String, int[]> map = callable.call();
-            if (map == null || map.isEmpty()) {
+            if (map == null || map.isEmpty())
                 // Null = skip the chart
                 return null;
-            }
             boolean allSkipped = true;
             for (Map.Entry<String, int[]> entry : map.entrySet()) {
                 if (entry.getValue().length == 0) {
@@ -169,10 +168,9 @@ public class Metrics {
                 allSkipped = false;
                 valuesBuilder.appendField(entry.getKey(), entry.getValue());
             }
-            if (allSkipped) {
+            if (allSkipped)
                 // Null = skip the chart
                 return null;
-            }
             return new JsonObjectBuilder().appendField("values", valuesBuilder.build()).build();
         }
     }
@@ -198,10 +196,9 @@ public class Metrics {
         protected JsonObjectBuilder.JsonObject getChartData() throws Exception {
             JsonObjectBuilder valuesBuilder = new JsonObjectBuilder();
             Map<String, Integer> map = callable.call();
-            if (map == null || map.isEmpty()) {
+            if (map == null || map.isEmpty())
                 // Null = skip the chart
                 return null;
-            }
             boolean allSkipped = true;
             for (Map.Entry<String, Integer> entry : map.entrySet()) {
                 if (entry.getValue() == 0) {
@@ -211,10 +208,9 @@ public class Metrics {
                 allSkipped = false;
                 valuesBuilder.appendField(entry.getKey(), entry.getValue());
             }
-            if (allSkipped) {
+            if (allSkipped)
                 // Null = skip the chart
                 return null;
-            }
             return new JsonObjectBuilder().appendField("values", valuesBuilder.build()).build();
         }
     }
@@ -224,9 +220,8 @@ public class Metrics {
         private final String chartId;
 
         protected CustomChart(String chartId) {
-            if (chartId == null) {
+            if (chartId == null)
                 throw new IllegalArgumentException("chartId must not be null");
-            }
             this.chartId = chartId;
         }
 
@@ -238,10 +233,9 @@ public class Metrics {
             builder.appendField("chartId", chartId);
             try {
                 JsonObjectBuilder.JsonObject data = getChartData();
-                if (data == null) {
+                if (data == null)
                     // If the data is null we don't send the chart.
                     return null;
-                }
                 builder.appendField("data", data);
             } catch (Throwable t) {
                 if (logErrors) {
@@ -274,10 +268,9 @@ public class Metrics {
         public JsonObjectBuilder.JsonObject getChartData() throws Exception {
             JsonObjectBuilder valuesBuilder = new JsonObjectBuilder();
             Map<String, Map<String, Integer>> map = callable.call();
-            if (map == null || map.isEmpty()) {
+            if (map == null || map.isEmpty())
                 // Null = skip the chart
                 return null;
-            }
             boolean reallyAllSkipped = true;
             for (Map.Entry<String, Map<String, Integer>> entryValues : map.entrySet()) {
                 JsonObjectBuilder valueBuilder = new JsonObjectBuilder();
@@ -291,10 +284,9 @@ public class Metrics {
                     valuesBuilder.appendField(entryValues.getKey(), valueBuilder.build());
                 }
             }
-            if (reallyAllSkipped) {
+            if (reallyAllSkipped)
                 // Null = skip the chart
                 return null;
-            }
             return new JsonObjectBuilder().appendField("values", valuesBuilder.build()).build();
         }
     }
@@ -339,9 +331,8 @@ public class Metrics {
          * @return A reference to this object.
          */
         public JsonObjectBuilder appendField(String key, int[] values) {
-            if (values == null) {
+            if (values == null)
                 throw new IllegalArgumentException("JSON values must not be null");
-            }
             String escapedValues = Arrays.stream(values).mapToObj(String::valueOf).collect(Collectors.joining(","));
             appendFieldUnescaped(key, "[" + escapedValues + "]");
             return this;
@@ -357,9 +348,8 @@ public class Metrics {
          * @return A reference to this object.
          */
         public JsonObjectBuilder appendField(String key, JsonObject object) {
-            if (object == null) {
+            if (object == null)
                 throw new IllegalArgumentException("JSON object must not be null");
-            }
             appendFieldUnescaped(key, object.toString());
             return this;
         }
@@ -374,9 +364,8 @@ public class Metrics {
          * @return A reference to this object.
          */
         public JsonObjectBuilder appendField(String key, JsonObject[] values) {
-            if (values == null) {
+            if (values == null)
                 throw new IllegalArgumentException("JSON values must not be null");
-            }
             String escapedValues = Arrays.stream(values).map(JsonObject::toString).collect(Collectors.joining(","));
             appendFieldUnescaped(key, "[" + escapedValues + "]");
             return this;
@@ -392,9 +381,8 @@ public class Metrics {
          * @return A reference to this object.
          */
         public JsonObjectBuilder appendField(String key, String value) {
-            if (value == null) {
+            if (value == null)
                 throw new IllegalArgumentException("JSON value must not be null");
-            }
             appendFieldUnescaped(key, "\"" + escape(value) + "\"");
             return this;
         }
@@ -409,9 +397,8 @@ public class Metrics {
          * @return A reference to this object.
          */
         public JsonObjectBuilder appendField(String key, String[] values) {
-            if (values == null) {
+            if (values == null)
                 throw new IllegalArgumentException("JSON values must not be null");
-            }
             String escapedValues = Arrays.stream(values).map(value -> "\"" + escape(value) + "\"")
                     .collect(Collectors.joining(","));
             appendFieldUnescaped(key, "[" + escapedValues + "]");
@@ -427,12 +414,10 @@ public class Metrics {
          *            The escaped value of the field.
          */
         private void appendFieldUnescaped(String key, String escapedValue) {
-            if (builder == null) {
+            if (builder == null)
                 throw new IllegalStateException("JSON has already been built");
-            }
-            if (key == null) {
+            if (key == null)
                 throw new IllegalArgumentException("JSON key must not be null");
-            }
             if (hasAtLeastOneField) {
                 builder.append(",");
             }
@@ -458,9 +443,8 @@ public class Metrics {
          * @return The built JSON string.
          */
         public JsonObject build() {
-            if (builder == null) {
+            if (builder == null)
                 throw new IllegalStateException("JSON has already been built");
-            }
             JsonObject object = new JsonObject(builder.append("}").toString());
             builder = null;
             return object;
@@ -499,7 +483,7 @@ public class Metrics {
          * @return The escaped value.
          */
         private static String escape(String value) {
-            final StringBuilder builder = new StringBuilder();
+            StringBuilder builder = new StringBuilder();
             for (int i = 0; i < value.length(); i++) {
                 char c = value.charAt(i);
                 if (c == '"') {
@@ -605,7 +589,7 @@ public class Metrics {
         }
 
         public void addCustomChart(CustomChart chart) {
-            this.customCharts.add(chart);
+            customCharts.add(chart);
         }
 
         /** Checks that the class was properly relocated. */
@@ -615,16 +599,14 @@ public class Metrics {
                     || !System.getProperty("bstats.relocatecheck").equals("false")) {
                 // Maven's Relocate is clever and changes strings, too. So we have to use this little
                 // "trick" ... :D
-                final String defaultPackage = new String(
-                        new byte[] { 'o', 'r', 'g', '.', 'b', 's', 't', 'a', 't', 's' });
-                final String examplePackage = new String(
+                String defaultPackage = new String(new byte[] { 'o', 'r', 'g', '.', 'b', 's', 't', 'a', 't', 's' });
+                String examplePackage = new String(
                         new byte[] { 'y', 'o', 'u', 'r', '.', 'p', 'a', 'c', 'k', 'a', 'g', 'e' });
                 // We want to make sure no one just copy & pastes the example and uses the wrong package
                 // names
                 if (MetricsBase.class.getPackage().getName().startsWith(defaultPackage)
-                        || MetricsBase.class.getPackage().getName().startsWith(examplePackage)) {
+                        || MetricsBase.class.getPackage().getName().startsWith(examplePackage))
                     throw new IllegalStateException("bStats Metrics class has not been relocated correctly!");
-                }
             }
         }
 
@@ -661,7 +643,7 @@ public class Metrics {
         }
 
         private void startSubmitting() {
-            final Runnable submitTask = () -> {
+            Runnable submitTask = () -> {
                 if (!enabled || !checkServiceEnabledSupplier.get()) {
                     // Submitting data or service is disabled
                     scheduler.shutdown();
@@ -670,7 +652,7 @@ public class Metrics {
                 if (submitTaskConsumer != null) {
                     submitTaskConsumer.accept(this::submitData);
                 } else {
-                    this.submitData();
+                    submitData();
                 }
             };
             // Many servers tend to restart at a fixed time at xx:00 which causes an uneven distribution
@@ -688,9 +670,9 @@ public class Metrics {
         }
 
         private void submitData() {
-            final JsonObjectBuilder baseJsonBuilder = new JsonObjectBuilder();
+            JsonObjectBuilder baseJsonBuilder = new JsonObjectBuilder();
             appendPlatformDataConsumer.accept(baseJsonBuilder);
-            final JsonObjectBuilder serviceJsonBuilder = new JsonObjectBuilder();
+            JsonObjectBuilder serviceJsonBuilder = new JsonObjectBuilder();
             appendServiceDataConsumer.accept(serviceJsonBuilder);
             JsonObjectBuilder.JsonObject[] chartData = customCharts.stream()
                     .map(customChart -> customChart.getRequestJsonObject(errorLogger, logErrors))
@@ -721,10 +703,9 @@ public class Metrics {
          *            The string to gzip.
          * @return The gzipped string.
          */
-        private static byte[] compress(final String str) throws IOException {
-            if (str == null) {
+        private static byte[] compress(String str) throws IOException {
+            if (str == null)
                 return null;
-            }
             ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
             try (GZIPOutputStream gzip = new GZIPOutputStream(outputStream)) {
                 gzip.write(str.getBytes(StandardCharsets.UTF_8));
@@ -733,11 +714,11 @@ public class Metrics {
         }
 
         /** The version of the Metrics class. */
-        public static final String METRICS_VERSION = "3.0.0";
+        public static String METRICS_VERSION = "3.0.0";
 
-        private static final String REPORT_URL = "https://bStats.org/api/v2/data/%s";
+        private static String REPORT_URL = "https://bStats.org/api/v2/data/%s";
 
-        private static final ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1,
+        private static ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1,
                 task -> new Thread(task, "bStats-Metrics"));
     }
 
@@ -762,10 +743,9 @@ public class Metrics {
         protected JsonObjectBuilder.JsonObject getChartData() throws Exception {
             JsonObjectBuilder valuesBuilder = new JsonObjectBuilder();
             Map<String, Integer> map = callable.call();
-            if (map == null || map.isEmpty()) {
+            if (map == null || map.isEmpty())
                 // Null = skip the chart
                 return null;
-            }
             boolean allSkipped = true;
             for (Map.Entry<String, Integer> entry : map.entrySet()) {
                 if (entry.getValue() == 0) {
@@ -775,10 +755,9 @@ public class Metrics {
                 allSkipped = false;
                 valuesBuilder.appendField(entry.getKey(), entry.getValue());
             }
-            if (allSkipped) {
+            if (allSkipped)
                 // Null = skip the chart
                 return null;
-            }
             return new JsonObjectBuilder().appendField("values", valuesBuilder.build()).build();
         }
     }
@@ -804,10 +783,9 @@ public class Metrics {
         protected JsonObjectBuilder.JsonObject getChartData() throws Exception {
             JsonObjectBuilder valuesBuilder = new JsonObjectBuilder();
             Map<String, Integer> map = callable.call();
-            if (map == null || map.isEmpty()) {
+            if (map == null || map.isEmpty())
                 // Null = skip the chart
                 return null;
-            }
             for (Map.Entry<String, Integer> entry : map.entrySet()) {
                 valuesBuilder.appendField(entry.getKey(), new int[] { entry.getValue() });
             }
@@ -835,10 +813,9 @@ public class Metrics {
         @Override
         protected JsonObjectBuilder.JsonObject getChartData() throws Exception {
             String value = callable.call();
-            if (value == null || value.isEmpty()) {
+            if (value == null || value.isEmpty())
                 // Null = skip the chart
                 return null;
-            }
             return new JsonObjectBuilder().appendField("value", value).build();
         }
     }
@@ -863,10 +840,9 @@ public class Metrics {
         @Override
         protected JsonObjectBuilder.JsonObject getChartData() throws Exception {
             int value = callable.call();
-            if (value == 0) {
+            if (value == 0)
                 // Null = skip the chart
                 return null;
-            }
             return new JsonObjectBuilder().appendField("value", value).build();
         }
     }
diff --git a/main/src/main/java/net/citizensnpcs/NPCNeedsRespawnEvent.java b/main/src/main/java/net/citizensnpcs/NPCNeedsRespawnEvent.java
index d510ab016..12bb93e79 100644
--- a/main/src/main/java/net/citizensnpcs/NPCNeedsRespawnEvent.java
+++ b/main/src/main/java/net/citizensnpcs/NPCNeedsRespawnEvent.java
@@ -11,7 +11,7 @@ public class NPCNeedsRespawnEvent extends NPCEvent {
 
     public NPCNeedsRespawnEvent(NPC npc, Location at) {
         super(npc);
-        this.spawn = at;
+        spawn = at;
     }
 
     @Override
@@ -27,5 +27,5 @@ public class NPCNeedsRespawnEvent extends NPCEvent {
         return handlers;
     }
 
-    private static final HandlerList handlers = new HandlerList();
+    private static HandlerList handlers = new HandlerList();
 }
diff --git a/main/src/main/java/net/citizensnpcs/ProtocolLibListener.java b/main/src/main/java/net/citizensnpcs/ProtocolLibListener.java
index 42dfe2cbc..405b94aa5 100644
--- a/main/src/main/java/net/citizensnpcs/ProtocolLibListener.java
+++ b/main/src/main/java/net/citizensnpcs/ProtocolLibListener.java
@@ -48,6 +48,8 @@ import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.api.trait.trait.MobType;
 import net.citizensnpcs.api.util.Messaging;
 import net.citizensnpcs.npc.ai.NPCHolder;
+import net.citizensnpcs.trait.ClickRedirectTrait;
+import net.citizensnpcs.trait.HologramTrait;
 import net.citizensnpcs.trait.MirrorTrait;
 import net.citizensnpcs.trait.RotationTrait;
 import net.citizensnpcs.trait.RotationTrait.PacketRotationSession;
@@ -55,15 +57,15 @@ import net.citizensnpcs.util.NMS;
 import net.citizensnpcs.util.SkinProperty;
 
 public class ProtocolLibListener implements Listener {
-    private final Class<?> flagsClass;
-    private final ProtocolManager manager;
+    private Class<?> flagsClass;
+    private ProtocolManager manager;
     private final Map<UUID, MirrorTrait> mirrorTraits = Maps.newConcurrentMap();
-    private final Citizens plugin;
+    private Citizens plugin;
     private final Map<Integer, RotationTrait> rotationTraits = Maps.newConcurrentMap();
 
     public ProtocolLibListener(Citizens plugin) {
         this.plugin = plugin;
-        this.manager = ProtocolLibrary.getProtocolManager();
+        manager = ProtocolLibrary.getProtocolManager();
         flagsClass = MinecraftReflection.getMinecraftClass("RelativeMovement", "world.entity.RelativeMovement",
                 "EnumPlayerTeleportFlags", "PacketPlayOutPosition$EnumPlayerTeleportFlags",
                 "network.protocol.game.PacketPlayOutPosition$EnumPlayerTeleportFlags");
@@ -72,50 +74,59 @@ public class ProtocolLibListener implements Listener {
             @Override
             public void onPacketSending(PacketEvent event) {
                 NPC npc = getNPCFromPacket(event);
-                if (npc == null || !npc.data().has(NPC.Metadata.HOLOGRAM_LINE_SUPPLIER))
+                if (npc == null)
                     return;
 
-                Function<Player, String> hvs = npc.data().get(NPC.Metadata.HOLOGRAM_LINE_SUPPLIER);
-                int version = manager.getProtocolVersion(event.getPlayer());
                 PacketContainer packet = event.getPacket();
-                if (version < 761) {
-                    List<WrappedWatchableObject> wwo = packet.getWatchableCollectionModifier().readSafely(0);
-                    if (wwo == null)
-                        return;
-
+                int version = manager.getProtocolVersion(event.getPlayer());
+                if (npc.data().has(NPC.Metadata.HOLOGRAM_FOR) || npc.data().has(NPC.Metadata.HOLOGRAM_LINE_SUPPLIER)) {
+                    Function<Player, String> hvs = npc.data().get(NPC.Metadata.HOLOGRAM_LINE_SUPPLIER);
+                    Object fakeName = null;
+                    if (hvs != null) {
+                        String suppliedName = hvs.apply(event.getPlayer());
+                        fakeName = version <= 340 ? suppliedName
+                                : Optional.of(Messaging.minecraftComponentFromRawMessage(suppliedName));
+                    }
+                    boolean sneaking = npc.getOrAddTrait(ClickRedirectTrait.class).getRedirectNPC()
+                            .getOrAddTrait(HologramTrait.class).isHologramSneaking(npc, event.getPlayer());
                     boolean delta = false;
-                    String text = hvs.apply(event.getPlayer());
-                    for (WrappedWatchableObject wo : wwo) {
-                        if (wo.getIndex() != 2)
-                            continue;
-                        if (version <= 340) {
-                            wo.setValue(text);
-                        } else {
-                            wo.setValue(Optional.of(Messaging.minecraftComponentFromRawMessage(text)));
+
+                    if (version < 761) {
+                        List<WrappedWatchableObject> wwo = packet.getWatchableCollectionModifier().readSafely(0);
+                        if (wwo == null)
+                            return;
+
+                        for (WrappedWatchableObject wo : wwo) {
+                            if (fakeName != null && wo.getIndex() == 2) {
+                                wo.setValue(fakeName);
+                                delta = true;
+                            } else if (sneaking && wo.getIndex() == 0) {
+                                byte b = (byte) (((Number) wo.getValue()).byteValue() | 0x02);
+                                wo.setValue(b);
+                                delta = true;
+                            }
                         }
-                        delta = true;
-                        break;
-                    }
+                        if (delta) {
+                            packet.getWatchableCollectionModifier().write(0, wwo);
+                        }
+                    } else {
+                        List<WrappedDataValue> wdvs = packet.getDataValueCollectionModifier().readSafely(0);
+                        if (wdvs == null)
+                            return;
 
-                    if (delta) {
-                        packet.getWatchableCollectionModifier().write(0, wwo);
-                    }
-                } else {
-                    List<WrappedDataValue> wdvs = packet.getDataValueCollectionModifier().readSafely(0);
-                    if (wdvs == null)
-                        return;
-
-                    boolean delta = false;
-                    String text = hvs.apply(event.getPlayer());
-                    for (WrappedDataValue wdv : wdvs) {
-                        if (wdv.getIndex() != 2)
-                            continue;
-                        wdv.setValue(Optional.of(Messaging.minecraftComponentFromRawMessage(text)));
-                        break;
-                    }
-
-                    if (delta) {
-                        packet.getDataValueCollectionModifier().write(0, wdvs);
+                        for (WrappedDataValue wdv : wdvs) {
+                            if (fakeName != null && wdv.getIndex() == 2) {
+                                wdv.setValue(fakeName);
+                                delta = true;
+                            } else if (sneaking && wdv.getIndex() == 0) {
+                                byte b = (byte) (((Number) wdv.getValue()).byteValue() | 0x02);
+                                wdv.setValue(b);
+                                delta = true;
+                            }
+                        }
+                        if (delta) {
+                            packet.getDataValueCollectionModifier().write(0, wdvs);
+                        }
                     }
                 }
             }
@@ -130,7 +141,6 @@ public class ProtocolLibListener implements Listener {
                             uuid -> mirrorTraits.get(uuid));
                     return;
                 }
-
                 List<PlayerInfoData> list = event.getPacket().getPlayerInfoDataLists().readSafely(0);
                 if (list == null)
                     return;
@@ -153,13 +163,11 @@ public class ProtocolLibListener implements Listener {
                         wgp = WrappedGameProfile.fromPlayer(event.getPlayer());
                         playerName = WrappedChatComponent.fromText(event.getPlayer().getDisplayName());
                     }
-
                     if (trait.mirrorName()) {
                         list.set(i, new PlayerInfoData(wgp.withId(npcInfo.getProfile().getId()), npcInfo.getLatency(),
                                 npcInfo.getGameMode(), playerName));
                         continue;
                     }
-
                     Collection<Property> textures = playerProfile.getProperties().get("textures");
                     if (textures == null || textures.size() == 0)
                         continue;
@@ -174,7 +182,6 @@ public class ProtocolLibListener implements Listener {
                     }
                     changed = true;
                 }
-
                 if (changed) {
                     event.getPacket().getPlayerInfoDataLists().write(0, list);
                 }
@@ -202,7 +209,6 @@ public class ProtocolLibListener implements Listener {
                     }
                     return;
                 }
-
                 RotationTrait trait = rotationTraits.get(eid);
                 if (trait == null)
                     return;
@@ -215,10 +221,8 @@ public class ProtocolLibListener implements Listener {
                 PacketType type = event.getPacketType();
                 if (type == Server.ENTITY_HEAD_ROTATION) {
                     packet.getBytes().write(0, degToByte(session.getHeadYaw()));
-                } else if (type == Server.ENTITY_LOOK) {
-                    packet.getBytes().write(0, degToByte(session.getBodyYaw()));
-                    packet.getBytes().write(1, degToByte(session.getPitch()));
-                } else if (type == Server.ENTITY_MOVE_LOOK || type == Server.REL_ENTITY_MOVE_LOOK) {
+                } else if (type == Server.ENTITY_LOOK || type == Server.ENTITY_MOVE_LOOK
+                        || type == Server.REL_ENTITY_MOVE_LOOK) {
                     packet.getBytes().write(0, degToByte(session.getBodyYaw()));
                     packet.getBytes().write(1, degToByte(session.getPitch()));
                 } else if (type == Server.POSITION) {
@@ -231,7 +235,6 @@ public class ProtocolLibListener implements Listener {
                     packet.getFloat().write(0, session.getBodyYaw());
                     packet.getFloat().write(1, session.getPitch());
                 }
-
                 session.onPacketOverwritten();
                 Messaging.debug("OVERWRITTEN " + type + " " + packet.getHandle());
             }
@@ -258,7 +261,6 @@ public class ProtocolLibListener implements Listener {
             }
             return null;
         }
-
         return entity instanceof NPCHolder ? ((NPCHolder) entity).getNPC() : null;
     }
 
@@ -278,7 +280,6 @@ public class ProtocolLibListener implements Listener {
             rotationTraits.put(event.getNPC().getEntity().getEntityId(),
                     event.getNPC().getTraitNullable(RotationTrait.class));
         }
-
         if (event.getNPC().hasTrait(MirrorTrait.class)
                 && event.getNPC().getOrAddTrait(MobType.class).getType() == EntityType.PLAYER) {
             mirrorTraits.put(event.getNPC().getEntity().getUniqueId(),
diff --git a/main/src/main/java/net/citizensnpcs/Settings.java b/main/src/main/java/net/citizensnpcs/Settings.java
index cd47fd3d3..97781235d 100644
--- a/main/src/main/java/net/citizensnpcs/Settings.java
+++ b/main/src/main/java/net/citizensnpcs/Settings.java
@@ -147,7 +147,7 @@ public class Settings {
         DEFAULT_TEXT("npc.default.talk-close.text.0", "Hi, I'm <npc>!") {
             @Override
             public void loadFromKey(DataKey root) {
-                List<String> list = new ArrayList<String>();
+                List<String> list = new ArrayList<>();
                 for (DataKey key : root.getRelative("npc.default.talk-close.text").getSubKeys()) {
                     list.add(key.getString(""));
                 }
@@ -290,7 +290,7 @@ public class Settings {
             if (migrate.contains(".")) {
                 this.migrate = migrate;
             } else {
-                this.comments = migrate;
+                comments = migrate;
             }
             this.path = path;
             this.value = value;
@@ -316,9 +316,8 @@ public class Settings {
         }
 
         public int asInt() {
-            if (value instanceof String) {
+            if (value instanceof String)
                 return Integer.parseInt(value.toString());
-            }
             return ((Number) value).intValue();
         }
 
diff --git a/main/src/main/java/net/citizensnpcs/StoredShops.java b/main/src/main/java/net/citizensnpcs/StoredShops.java
index 3bec9b9a8..268d4f566 100644
--- a/main/src/main/java/net/citizensnpcs/StoredShops.java
+++ b/main/src/main/java/net/citizensnpcs/StoredShops.java
@@ -38,9 +38,8 @@ public class StoredShops {
     }
 
     public NPCShop getShop(String name) {
-        if (npcShops.containsKey(name)) {
+        if (npcShops.containsKey(name))
             return npcShops.get(name);
-        }
         return getGlobalShop(name);
     }
 
diff --git a/main/src/main/java/net/citizensnpcs/commands/AdminCommands.java b/main/src/main/java/net/citizensnpcs/commands/AdminCommands.java
index fa42d6c06..2a7f6bd01 100644
--- a/main/src/main/java/net/citizensnpcs/commands/AdminCommands.java
+++ b/main/src/main/java/net/citizensnpcs/commands/AdminCommands.java
@@ -20,7 +20,7 @@ import net.citizensnpcs.util.StringHelper;
 @Requirements
 public class AdminCommands {
     private final Citizens plugin;
-    private final Map<CommandSender, Long> reloadTimeouts = new WeakHashMap<CommandSender, Long>();
+    private final Map<CommandSender, Long> reloadTimeouts = new WeakHashMap<>();
 
     public AdminCommands(Citizens plugin) {
         this.plugin = plugin;
@@ -51,7 +51,6 @@ public class AdminCommands {
                 return;
             }
         }
-
         Messaging.sendTr(sender, Messages.CITIZENS_RELOADING);
         try {
             plugin.reload();
diff --git a/main/src/main/java/net/citizensnpcs/commands/EditorCommands.java b/main/src/main/java/net/citizensnpcs/commands/EditorCommands.java
index d9c919f81..5b5505a45 100644
--- a/main/src/main/java/net/citizensnpcs/commands/EditorCommands.java
+++ b/main/src/main/java/net/citizensnpcs/commands/EditorCommands.java
@@ -60,7 +60,6 @@ public class EditorCommands {
             player.acceptConversationInput(args.getJoinedStrings(1));
             return;
         }
-
         Editor.enterOrLeave(player, editor);
     }
 
diff --git a/main/src/main/java/net/citizensnpcs/commands/NPCCommandSelector.java b/main/src/main/java/net/citizensnpcs/commands/NPCCommandSelector.java
index a16d2371d..b9d0d698e 100644
--- a/main/src/main/java/net/citizensnpcs/commands/NPCCommandSelector.java
+++ b/main/src/main/java/net/citizensnpcs/commands/NPCCommandSelector.java
@@ -34,7 +34,7 @@ public class NPCCommandSelector extends NumericPrompt {
 
     public NPCCommandSelector(Callback callback, List<NPC> possible) {
         this.callback = callback;
-        this.choices = possible;
+        choices = possible;
     }
 
     @Override
@@ -86,7 +86,7 @@ public class NPCCommandSelector extends NumericPrompt {
     }
 
     public static void start(Callback callback, Conversable player, List<NPC> possible) {
-        final Conversation conversation = new ConversationFactory(CitizensAPI.getPlugin()).withLocalEcho(false)
+        Conversation conversation = new ConversationFactory(CitizensAPI.getPlugin()).withLocalEcho(false)
                 .withEscapeSequence("exit").withModality(false)
                 .withFirstPrompt(new NPCCommandSelector(callback, possible)).buildConversation(player);
         conversation.begin();
@@ -100,7 +100,6 @@ public class NPCCommandSelector extends NumericPrompt {
             return;
         } catch (IllegalArgumentException e) {
         }
-
         Integer id = Ints.tryParse(raw);
         if (id != null) {
             callback.run(npcRegistry.getById(id));
@@ -112,12 +111,12 @@ public class NPCCommandSelector extends NumericPrompt {
         if (args.hasValueFlag("range")) {
             range = Math.abs(args.getFlagDouble("range"));
         }
-
         for (NPC test : npcRegistry) {
             if (test.getName().equalsIgnoreCase(name)) {
                 if (range > 0 && test.isSpawned()
-                        && !Util.locationWithinRange(args.getSenderLocation(), test.getEntity().getLocation(), range))
+                        && !Util.locationWithinRange(args.getSenderLocation(), test.getEntity().getLocation(), range)) {
                     continue;
+                }
                 possible.add(test);
             }
         }
diff --git a/main/src/main/java/net/citizensnpcs/commands/NPCCommands.java b/main/src/main/java/net/citizensnpcs/commands/NPCCommands.java
index 26f471cdb..cb7c84206 100644
--- a/main/src/main/java/net/citizensnpcs/commands/NPCCommands.java
+++ b/main/src/main/java/net/citizensnpcs/commands/NPCCommands.java
@@ -187,7 +187,6 @@ public class NPCCommands {
         } else {
             npc.data().setPersistent(NPC.Metadata.ACTIVATION_RANGE, range);
         }
-
         Messaging.sendTr(sender, Messages.ACTIVATION_RANGE_SET, range);
     }
 
@@ -202,8 +201,8 @@ public class NPCCommands {
             max = 2,
             permission = "citizens.npc.age")
     public void age(CommandContext args, CommandSender sender, NPC npc) throws CommandException {
-        if (!npc.isSpawned() || (!(npc.getEntity() instanceof Ageable) && !(npc.getEntity() instanceof Zombie)
-                && !npc.getEntity().getType().name().equals("TADPOLE")))
+        if (!npc.isSpawned() || !(npc.getEntity() instanceof Ageable) && !(npc.getEntity() instanceof Zombie)
+                && !npc.getEntity().getType().name().equals("TADPOLE"))
             throw new CommandException(Messages.MOBTYPE_CANNOT_BE_AGED, npc.getName());
         Age trait = npc.getOrAddTrait(Age.class);
         boolean toggleLock = args.hasFlag('l');
@@ -233,7 +232,6 @@ public class NPCCommands {
             } else
                 throw new CommandException(Messages.INVALID_AGE);
         }
-
         trait.setAge(age);
     }
 
@@ -290,12 +288,10 @@ public class NPCCommands {
                     Messaging.sendTr(sender, Messages.ANCHOR_ADDED);
                 } else
                     throw new CommandException(Messages.ANCHOR_ALREADY_EXISTS, save);
-            } else {
-                if (trait.addAnchor(save, args.getSenderLocation())) {
-                    Messaging.sendTr(sender, Messages.ANCHOR_ADDED);
-                } else
-                    throw new CommandException(Messages.ANCHOR_ALREADY_EXISTS, save);
-            }
+            } else if (trait.addAnchor(save, args.getSenderLocation())) {
+                Messaging.sendTr(sender, Messages.ANCHOR_ADDED);
+            } else
+                throw new CommandException(Messages.ANCHOR_ALREADY_EXISTS, save);
         } else if (assume != null) {
             if (assume.isEmpty())
                 throw new CommandException(Messages.INVALID_ANCHOR_NAME);
@@ -307,9 +303,9 @@ public class NPCCommands {
         } else if (remove != null) {
             if (remove.isEmpty())
                 throw new CommandException(Messages.INVALID_ANCHOR_NAME);
-            if (trait.removeAnchor(trait.getAnchor(remove)))
+            if (trait.removeAnchor(trait.getAnchor(remove))) {
                 Messaging.sendTr(sender, Messages.ANCHOR_REMOVED);
-            else
+            } else
                 throw new CommandException(Messages.ANCHOR_MISSING, remove);
         } else if (!args.hasFlag('a')) {
             Paginator paginator = new Paginator().header("Anchors").console(sender instanceof ConsoleCommandSender);
@@ -329,13 +325,10 @@ public class NPCCommands {
                     paginator.addLine(line);
                 }
             }
-
             int page = args.getInteger(1, 1);
-            if (!paginator.sendPage(sender, page)) {
+            if (!paginator.sendPage(sender, page))
                 throw new CommandException(Messages.COMMAND_PAGE_MISSING, page);
-            }
         }
-
         // Assume Player's position
         if (!args.hasFlag('a'))
             return;
@@ -409,7 +402,6 @@ public class NPCCommands {
         } else if (Setting.DEFAULT_BLOCK_BREAKER_RADIUS.asDouble() > 0) {
             cfg.radius(Setting.DEFAULT_BLOCK_BREAKER_RADIUS.asDouble());
         }
-
         if (npc.getEntity() instanceof InventoryHolder) {
             cfg.blockBreaker((block, itemstack) -> {
                 org.bukkit.inventory.Inventory inventory = ((InventoryHolder) npc.getEntity()).getInventory();
@@ -421,7 +413,6 @@ public class NPCCommands {
                 }
             });
         }
-
         BlockBreaker breaker = npc.getBlockBreaker(args.getSenderTargetBlockLocation().getBlock(), cfg);
         npc.getDefaultGoalController().addBehavior(StatusMapper.singleUse(breaker), 1);
     }
@@ -497,12 +488,10 @@ public class NPCCommands {
             if (args.hasFlag('s') && hand != CommandTrait.Hand.BOTH) {
                 hand = hand == CommandTrait.Hand.LEFT ? CommandTrait.Hand.SHIFT_LEFT : CommandTrait.Hand.SHIFT_RIGHT;
             }
-
             List<String> perms = Lists.newArrayList();
             if (permissions != null) {
                 perms.addAll(Arrays.asList(permissions.split(",")));
             }
-
             if (command.toLowerCase().startsWith("npc select"))
                 throw new CommandException("npc select not currently supported within commands. Use --id <id> instead");
 
@@ -556,9 +545,8 @@ public class NPCCommands {
             Messaging.sendTr(sender, Messages.COMMAND_TEMPORARY_PERMISSIONS_SET,
                     Joiner.on(' ').join(temporaryPermissions));
         } else if (action.equalsIgnoreCase("cost")) {
-            if (args.argsLength() == 2) {
+            if (args.argsLength() == 2)
                 throw new CommandException(Messages.COMMAND_MISSING_COST);
-            }
             if (args.argsLength() == 4) {
                 commands.setCost(args.getDouble(2), args.getInteger(3));
                 Messaging.sendTr(sender, Messages.COMMAND_INDIVIDUAL_COST_SET,
@@ -568,9 +556,8 @@ public class NPCCommands {
                 Messaging.sendTr(sender, Messages.COMMAND_COST_SET, args.getDouble(2));
             }
         } else if (action.equalsIgnoreCase("expcost")) {
-            if (args.argsLength() == 2) {
+            if (args.argsLength() == 2)
                 throw new CommandException(Messages.COMMAND_MISSING_COST);
-            }
             if (args.argsLength() == 4) {
                 commands.setExperienceCost(args.getInteger(2), args.getInteger(3));
                 Messaging.sendTr(sender, Messages.COMMAND_INDIVIDUAL_EXPERIENCE_COST_SET,
@@ -592,10 +579,10 @@ public class NPCCommands {
             if (!(sender instanceof Player))
                 throw new CommandException(CommandMessages.MUST_BE_INGAME);
             if (args.argsLength() == 2) {
-                InventoryMenu.createSelfRegistered(new ItemRequirementGUI(commands)).present(((Player) sender));
+                InventoryMenu.createSelfRegistered(new ItemRequirementGUI(commands)).present((Player) sender);
             } else {
                 InventoryMenu.createSelfRegistered(new ItemRequirementGUI(commands, args.getInteger(2)))
-                        .present(((Player) sender));
+                        .present((Player) sender);
             }
         } else if (action.equalsIgnoreCase("errormsg")) {
             CommandTraitError which = Util.matchEnum(CommandTraitError.values(), args.getString(2));
@@ -603,9 +590,8 @@ public class NPCCommands {
                 throw new CommandException(Messages.NPC_COMMAND_INVALID_ERROR_MESSAGE,
                         Util.listValuesPretty(CommandTraitError.values()));
             commands.setCustomErrorMessage(which, args.getString(3));
-        } else {
+        } else
             throw new CommandUsageException();
-        }
     }
 
     @Command(
@@ -629,14 +615,14 @@ public class NPCCommands {
             max = 1,
             flags = "myno")
     public void controllable(CommandContext args, CommandSender sender, NPC npc) throws CommandException {
-        if ((npc.isSpawned() && !sender.hasPermission(
-                "citizens.npc.controllable." + npc.getEntity().getType().name().toLowerCase().replace("_", "")))
+        if (npc.isSpawned()
+                && !sender.hasPermission(
+                        "citizens.npc.controllable." + npc.getEntity().getType().name().toLowerCase().replace("_", ""))
                 || !sender.hasPermission("citizens.npc.controllable"))
             throw new NoPermissionsException();
         if (!npc.hasTrait(Controllable.class)) {
             npc.addTrait(new Controllable(false));
         }
-
         Controllable trait = npc.getOrAddTrait(Controllable.class);
         boolean enabled = trait.toggle();
         if (args.hasFlag('y')) {
@@ -644,7 +630,6 @@ public class NPCCommands {
         } else if (args.hasFlag('n')) {
             enabled = trait.setEnabled(false);
         }
-
         trait.setOwnerRequired(args.hasFlag('o'));
         String key = enabled ? Messages.CONTROLLABLE_SET : Messages.CONTROLLABLE_REMOVED;
         Messaging.sendTr(sender, key, npc.getName());
@@ -670,14 +655,12 @@ public class NPCCommands {
         if (!copy.getRawName().equals(name)) {
             copy.setName(name);
         }
-
         if (copy.getOrAddTrait(Spawned.class).shouldSpawn() && args.getSenderLocation() != null) {
             Location location = args.getSenderLocation();
             location.getChunk().load();
             copy.teleport(location, TeleportCause.COMMAND);
             copy.getOrAddTrait(CurrentLocation.class).setLocation(location);
         }
-
         CommandSenderCreateNPCEvent event = sender instanceof Player
                 ? new PlayerCloneNPCEvent((Player) sender, npc, copy)
                 : new CommandSenderCloneNPCEvent(sender, npc, copy);
@@ -685,11 +668,11 @@ public class NPCCommands {
         if (event.isCancelled()) {
             event.getNPC().destroy();
             String reason = "Couldn't create NPC.";
-            if (!event.getCancelReason().isEmpty())
+            if (!event.getCancelReason().isEmpty()) {
                 reason += " Reason: " + event.getCancelReason();
+            }
             throw new CommandException(reason);
         }
-
         Messaging.sendTr(sender, Messages.NPC_COPIED, npc.getName());
         selector.select(sender, copy);
         history.add(sender, new CreateNPCHistoryItem(copy));
@@ -711,19 +694,16 @@ public class NPCCommands {
             @Flag("template") String templateName, @Flag("registry") String registryName) throws CommandException {
         String name = args.getJoinedStrings(1).trim();
         if (args.hasValueFlag("type")) {
-            if (type == null) {
+            if (type == null)
                 throw new CommandException(Messaging.tr(Messages.NPC_CREATE_INVALID_MOBTYPE, args.getFlag("type")));
-            } else if (!EntityControllers.controllerExistsForType(type)) {
+            else if (!EntityControllers.controllerExistsForType(type))
                 throw new CommandException(Messaging.tr(Messages.NPC_CREATE_MISSING_MOBTYPE, args.getFlag("type")));
-            }
         }
-
         int nameLength = SpigotUtil.getMaxNameLength(type);
         if (Placeholders.replace(Messaging.parseComponents(name), sender, npc).length() > nameLength) {
             Messaging.sendErrorTr(sender, Messages.NPC_NAME_TOO_LONG, nameLength);
             name = name.substring(0, nameLength);
         }
-
         if (name.length() == 0)
             throw new CommandException();
 
@@ -743,53 +723,44 @@ public class NPCCommands {
                 Messaging.send(sender, "An in-memory registry has been created named [[" + registryName + "]].");
             }
         }
-
         if (args.hasFlag('t') || temporaryTicks != null) {
             registry = temporaryRegistry;
         }
-
         if (item != null) {
             ItemStack stack = Util.parseItemStack(null, item);
             npc = registry.createNPCUsingItem(type, name, stack);
         } else {
             npc = registry.createNPC(type, name);
         }
-
         String msg = "Created [[" + npc.getName() + "]] (ID [[" + npc.getId() + "]])";
 
         if (args.hasFlag('b')) {
             msg += " as a baby";
             npc.getOrAddTrait(Age.class).setAge(-24000);
         }
-
         if (args.hasFlag('s')) {
             npc.data().set(NPC.Metadata.SILENT, true);
         }
-
         if (nameplate != null) {
             npc.data().set(NPC.Metadata.NAMEPLATE_VISIBLE,
                     nameplate.equalsIgnoreCase("hover") ? nameplate.toLowerCase() : Boolean.parseBoolean(nameplate));
         }
-
         if (!Setting.SERVER_OWNS_NPCS.asBoolean()) {
             npc.getOrAddTrait(Owner.class).setOwner(sender);
         }
-
         if (temporaryTicks != null) {
-            final NPC temp = npc;
+            NPC temp = npc;
             Bukkit.getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(), () -> {
                 if (temporaryRegistry.getByUniqueId(temp.getUniqueId()) == temp) {
                     temp.destroy();
                 }
             }, temporaryTicks);
         }
-
         npc.getOrAddTrait(MobType.class).setType(type);
 
         if (args.hasFlag('p')) {
             npc.addTrait(PacketNPC.class);
         }
-
         Location spawnLoc = args.getSenderLocation();
 
         CommandSenderCreateNPCEvent event = sender instanceof Player ? new PlayerCreateNPCEvent((Player) sender, npc)
@@ -798,63 +769,57 @@ public class NPCCommands {
         if (event.isCancelled()) {
             npc.destroy();
             String reason = "Couldn't create NPC.";
-            if (!event.getCancelReason().isEmpty())
+            if (!event.getCancelReason().isEmpty()) {
                 reason += " Reason: " + event.getCancelReason();
+            }
             throw new CommandException(reason);
         }
-
         if (at != null) {
             spawnLoc = at;
             spawnLoc.getChunk().load();
         }
-
         if (spawnLoc == null) {
             npc.destroy();
             throw new CommandException(Messages.INVALID_SPAWN_LOCATION);
         }
-
         if (args.hasFlag('c')) {
             spawnLoc = Util.getCenterLocation(spawnLoc.getBlock());
         }
-
         if (!args.hasFlag('u')) {
             npc.spawn(spawnLoc, SpawnReason.CREATE);
         }
-
         if (traits != null) {
             Iterable<String> parts = Splitter.on(',').trimResults().split(traits);
             StringBuilder builder = new StringBuilder();
             for (String tr : parts) {
                 Trait trait = CitizensAPI.getTraitFactory().getTrait(tr);
-                if (trait == null)
+                if (trait == null) {
                     continue;
+                }
                 npc.addTrait(trait);
                 builder.append(StringHelper.wrap(tr) + ", ");
             }
             if (builder.length() > 0) {
                 builder.delete(builder.length() - 2, builder.length());
             }
-
             msg += " with traits " + builder.toString();
         }
-
         if (templateName != null) {
             Iterable<String> parts = Splitter.on(',').trimResults().split(templateName);
             StringBuilder builder = new StringBuilder();
             for (String part : parts) {
                 Template template = Template.byName(part);
-                if (template == null)
+                if (template == null) {
                     continue;
+                }
                 template.apply(npc);
                 builder.append(StringHelper.wrap(part) + ", ");
             }
             if (builder.length() > 0) {
                 builder.delete(builder.length() - 2, builder.length());
             }
-
             msg += " with templates " + builder.toString();
         }
-
         selector.select(sender, npc);
         history.add(sender, new CreateNPCHistoryItem(npc));
         Messaging.send(sender, msg + '.');
@@ -896,7 +861,7 @@ public class NPCCommands {
             max = 1,
             permission = "citizens.npc.deselect")
     @Requirements
-    public void deselect(CommandContext args, final CommandSender sender, final NPC npc) {
+    public void deselect(CommandContext args, CommandSender sender, NPC npc) {
         selector.deselect(sender);
         Messaging.sendTr(sender, Messages.DESELECTED_NPC);
     }
@@ -910,19 +875,17 @@ public class NPCCommands {
             max = 2,
             permission = "citizens.npc.despawn")
     @Requirements
-    public void despawn(final CommandContext args, final CommandSender sender, NPC npc) throws CommandException {
+    public void despawn(CommandContext args, CommandSender sender, NPC npc) throws CommandException {
         NPCCommandSelector.Callback callback = npc1 -> {
-            if (npc1 == null) {
+            if (npc1 == null)
                 throw new CommandException(Messages.NO_NPC_WITH_ID_FOUND, args.getString(1));
-            }
             npc1.getOrAddTrait(Spawned.class).setSpawned(false);
             npc1.despawn(DespawnReason.REMOVAL);
             Messaging.sendTr(sender, Messages.NPC_DESPAWNED, npc1.getName());
         };
         if (npc == null || args.argsLength() == 2) {
-            if (args.argsLength() < 2) {
+            if (args.argsLength() < 2)
                 throw new CommandException(CommandMessages.MUST_HAVE_SELECTED);
-            }
             NPCCommandSelector.startWithCallback(callback, CitizensAPI.getNPCRegistry(), sender, args,
                     args.getString(1));
         } else {
@@ -1024,13 +987,11 @@ public class NPCCommands {
             Messaging.sendTr(sender, Messages.FOLLOW_MARGIN_SET, npc.getName(), margin);
             return;
         }
-
         trait.setProtect(protect);
         String name = sender.getName();
         if (args.argsLength() > 1) {
             name = args.getString(1);
         }
-
         OfflinePlayer player = Bukkit.getOfflinePlayer(name);
         if (!player.hasPlayedBefore() && !player.isOnline()) {
             NPCCommandSelector.Callback callback = followingNPC -> {
@@ -1048,7 +1009,6 @@ public class NPCCommands {
                     args.getString(1));
             return;
         }
-
         boolean following = explicit == null ? !trait.isEnabled() : explicit;
         trait.follow(following ? player.getPlayer() : null);
         Messaging.sendTr(sender, following ? Messages.FOLLOW_SET : Messages.FOLLOW_UNSET, npc.getName(),
@@ -1098,7 +1058,6 @@ public class NPCCommands {
             Messaging.sendTr(sender, Messages.GLOWING_COLOR_SET, npc.getName(), color + Util.prettyEnum(color));
             return;
         }
-
         npc.data().setPersistent(NPC.Metadata.GLOWING, !npc.data().get(NPC.Metadata.GLOWING, false));
         boolean glowing = npc.data().get(NPC.Metadata.GLOWING);
         Messaging.sendTr(sender, glowing ? Messages.GLOWING_SET : Messages.GLOWING_UNSET, npc.getName());
@@ -1143,15 +1102,17 @@ public class NPCCommands {
 
     @Command(
             aliases = { "npc" },
-            usage = "hologram add [text] | set [line #] [text] | remove [line #] | clear | lineheight [height] | margintop [line #] [margin] | marginbottom [line #] [margin]",
+            usage = "hologram add [text] | set [line #] [text] | remove [line #] | clear | lineheight [height] | viewrange [range] | margintop [line #] [margin] | marginbottom [line #] [margin]",
             desc = "Controls NPC hologram text",
             modifiers = { "hologram" },
             min = 1,
             max = -1,
             permission = "citizens.npc.hologram")
-    public void hologram(CommandContext args, CommandSender sender, NPC npc, @Arg(
-            value = 1,
-            completions = { "add", "set", "remove", "clear", "lineheight", "margintop", "marginbottom" }) String action,
+    public void hologram(CommandContext args, CommandSender sender, NPC npc,
+            @Arg(
+                    value = 1,
+                    completions = { "add", "set", "remove", "clear", "lineheight", "viewrange", "margintop",
+                            "marginbottom" }) String action,
             @Arg(value = 2, completionsProvider = HologramTrait.TabCompletions.class) String secondCompletion)
             throws CommandException {
         HologramTrait trait = npc.getOrAddTrait(HologramTrait.class);
@@ -1165,39 +1126,38 @@ public class NPCCommands {
             Messaging.send(sender, output);
             return;
         }
-
         if (action.equalsIgnoreCase("set")) {
-            if (args.argsLength() == 2) {
+            if (args.argsLength() == 2)
                 throw new CommandException(Messages.HOLOGRAM_INVALID_LINE);
-            }
 
             int idx = Math.max(0, args.getInteger(2));
-            if (idx >= trait.getLines().size()) {
+            if (idx >= trait.getLines().size())
                 throw new CommandException(Messages.HOLOGRAM_INVALID_LINE);
-            }
 
-            if (args.argsLength() == 3) {
+            if (args.argsLength() == 3)
                 throw new CommandException(Messages.HOLOGRAM_TEXT_MISSING);
-            }
 
             trait.setLine(idx, args.getJoinedStrings(3));
             Messaging.sendTr(sender, Messages.HOLOGRAM_LINE_SET, idx, args.getJoinedStrings(3));
+        } else if (action.equalsIgnoreCase("viewrange")) {
+            if (args.argsLength() == 2)
+                throw new CommandUsageException();
+
+            trait.setViewRange(args.getInteger(2));
+            Messaging.sendTr(sender, Messages.HOLOGRAM_VIEW_RANGE_SET, npc.getName(), args.getInteger(2));
         } else if (action.equalsIgnoreCase("add")) {
-            if (args.argsLength() == 2) {
+            if (args.argsLength() == 2)
                 throw new CommandException(Messages.HOLOGRAM_TEXT_MISSING);
-            }
 
             trait.addLine(args.getJoinedStrings(2));
             Messaging.sendTr(sender, Messages.HOLOGRAM_LINE_ADD, args.getJoinedStrings(2));
         } else if (action.equalsIgnoreCase("remove")) {
-            if (args.argsLength() == 2) {
+            if (args.argsLength() == 2)
                 throw new CommandException(Messages.HOLOGRAM_INVALID_LINE);
-            }
 
             int idx = Math.max(0, args.getInteger(2));
-            if (idx >= trait.getLines().size()) {
+            if (idx >= trait.getLines().size())
                 throw new CommandException(Messages.HOLOGRAM_INVALID_LINE);
-            }
 
             trait.removeLine(idx);
             Messaging.sendTr(sender, Messages.HOLOGRAM_LINE_REMOVED, idx);
@@ -1205,32 +1165,35 @@ public class NPCCommands {
             trait.clear();
             Messaging.sendTr(sender, Messages.HOLOGRAM_CLEARED);
         } else if (action.equalsIgnoreCase("lineheight")) {
+            if (args.argsLength() == 2)
+                throw new CommandUsageException();
+
             trait.setLineHeight(args.getDouble(2));
             Messaging.sendTr(sender, Messages.HOLOGRAM_LINE_HEIGHT_SET, args.getDouble(2));
         } else if (action.equalsIgnoreCase("margintop")) {
-            if (args.argsLength() == 2) {
+            if (args.argsLength() == 2)
                 throw new CommandException(Messages.HOLOGRAM_INVALID_LINE);
-            }
+
             int idx = Math.max(0, args.getInteger(2));
-            if (idx >= trait.getLines().size()) {
+            if (idx >= trait.getLines().size())
                 throw new CommandException(Messages.HOLOGRAM_INVALID_LINE);
-            }
-            if (args.argsLength() == 3) {
+
+            if (args.argsLength() == 3)
                 throw new CommandException(Messages.HOLOGRAM_MARGIN_MISSING);
-            }
+
             trait.setMargin(idx, "top", args.getDouble(3));
             Messaging.sendTr(sender, Messages.HOLOGRAM_MARGIN_SET, idx, "top", args.getDouble(3));
         } else if (action.equalsIgnoreCase("marginbottom")) {
-            if (args.argsLength() == 2) {
+            if (args.argsLength() == 2)
                 throw new CommandException(Messages.HOLOGRAM_INVALID_LINE);
-            }
+
             int idx = Math.max(0, args.getInteger(2));
-            if (idx >= trait.getLines().size()) {
+            if (idx >= trait.getLines().size())
                 throw new CommandException(Messages.HOLOGRAM_INVALID_LINE);
-            }
-            if (args.argsLength() == 3) {
+
+            if (args.argsLength() == 3)
                 throw new CommandException(Messages.HOLOGRAM_MARGIN_MISSING);
-            }
+
             trait.setMargin(idx, "bottom", args.getDouble(3));
             Messaging.sendTr(sender, Messages.HOLOGRAM_MARGIN_SET, idx, "bottom", args.getDouble(3));
         }
@@ -1296,9 +1259,8 @@ public class NPCCommands {
     public void horse(CommandContext args, CommandSender sender, NPC npc,
             @Flag({ "color", "colour" }) Horse.Color color, @Flag("style") Horse.Style style) throws CommandException {
         EntityType type = npc.getOrAddTrait(MobType.class).getType();
-        if (!Util.isHorse(type)) {
+        if (!Util.isHorse(type))
             throw new CommandException(CommandMessages.REQUIREMENTS_INVALID_MOB_TYPE, Util.prettyEnum(type));
-        }
         HorseModifiers horse = npc.getOrAddTrait(HorseModifiers.class);
         String output = "";
 
@@ -1309,7 +1271,6 @@ public class NPCCommands {
             horse.setCarryingChest(false);
             output += Messaging.tr(Messages.HORSE_CHEST_UNSET) + " ";
         }
-
         if (type == EntityType.HORSE && (args.hasValueFlag("color") || args.hasValueFlag("colour"))) {
             if (color == null) {
                 String valid = Util.listValuesPretty(Horse.Color.values());
@@ -1400,7 +1361,6 @@ public class NPCCommands {
         if (modify != null) {
             stack = Util.parseItemStack(stack, modify);
         }
-
         if (mat == null && !args.hasFlag('h'))
             throw new CommandException(Messages.UNKNOWN_MATERIAL);
         ItemStack fstack = stack.clone();
@@ -1410,7 +1370,6 @@ public class NPCCommands {
             npc.despawn(DespawnReason.PENDING_RESPAWN);
             npc.spawn(npc.getStoredLocation(), SpawnReason.RESPAWN);
         }
-
         Messaging.sendTr(sender, Messages.ITEM_SET, Util.prettyEnum(stack.getType()));
     }
 
@@ -1481,7 +1440,7 @@ public class NPCCommands {
                 : CitizensAPI.getNPCRegistry();
         if (source == null)
             throw new CommandException();
-        List<NPC> npcs = new ArrayList<NPC>();
+        List<NPC> npcs = new ArrayList<>();
 
         if (args.hasFlag('a')) {
             for (NPC add : source.sorted()) {
@@ -1500,7 +1459,6 @@ public class NPCCommands {
                 }
             }
         }
-
         if (args.hasValueFlag("type")) {
             if (type == null)
                 throw new CommandException(Messages.COMMAND_INVALID_MOBTYPE, type);
@@ -1511,7 +1469,6 @@ public class NPCCommands {
                 }
             }
         }
-
         Paginator paginator = new Paginator().header("NPCs").console(sender instanceof ConsoleCommandSender)
                 .enablePageSwitcher('/' + args.getRawCommand() + " --page $page");
         for (int i = 0; i < npcs.size(); i++) {
@@ -1524,11 +1481,9 @@ public class NPCCommands {
                     + id + "><hover:show_text:Remove this NPC><red>-</red></hover></click>)";
             paginator.addLine(line);
         }
-
         int op = page == null ? args.getInteger(1, 1) : page;
-        if (!paginator.sendPage(sender, op)) {
+        if (!paginator.sendPage(sender, op))
             throw new CommandException(Messages.COMMAND_PAGE_MISSING, op);
-        }
     }
 
     @Command(
@@ -1669,43 +1624,37 @@ public class NPCCommands {
                 } catch (NumberFormatException nfe2) {
                 }
             }
-
             if (args.hasFlag('t')) {
                 if (enumKey != null) {
                     npc.data().set(enumKey, metadata);
                 } else {
                     npc.data().set(key, metadata);
                 }
+            } else if (enumKey != null) {
+                npc.data().setPersistent(enumKey, metadata);
             } else {
-                if (enumKey != null) {
-                    npc.data().setPersistent(enumKey, metadata);
-                } else {
-                    npc.data().setPersistent(key, metadata);
-                }
+                npc.data().setPersistent(key, metadata);
             }
             Messaging.sendTr(sender, Messages.METADATA_SET, enumKey != null ? enumKey : key, args.getString(3));
         } else if (command.equals("get")) {
-            if (args.argsLength() != 3) {
+            if (args.argsLength() != 3)
                 throw new CommandException();
-            }
             Object data = enumKey != null ? npc.data().get(enumKey) : npc.data().get(key);
             if (data == null) {
                 data = "null";
             }
             sender.sendMessage(data.toString());
         } else if (command.equals("remove")) {
-            if (args.argsLength() != 3) {
+            if (args.argsLength() != 3)
                 throw new CommandException();
-            }
             if (enumKey != null) {
                 npc.data().remove(enumKey);
             } else {
                 npc.data().remove(key);
             }
             Messaging.sendTr(sender, Messages.METADATA_UNSET, enumKey != null ? enumKey : key, npc.getName());
-        } else {
+        } else
             throw new CommandUsageException();
-        }
     }
 
     @Command(
@@ -1741,7 +1690,6 @@ public class NPCCommands {
         if (args.hasValueFlag("offset")) {
             npc.data().setPersistent(NPC.Metadata.MINECART_OFFSET, args.getFlagInteger("offset"));
         }
-
         Messaging.sendTr(sender, Messages.MINECART_SET, npc.data().get(NPC.Metadata.MINECART_ITEM, ""),
                 npc.data().get(NPC.Metadata.MINECART_ITEM_DATA, 0), npc.data().get(NPC.Metadata.MINECART_OFFSET, 0));
     }
@@ -1787,7 +1735,6 @@ public class NPCCommands {
             } catch (IllegalArgumentException ex) {
                 mount = CitizensAPI.getNPCRegistry().getById(args.getFlagInteger("onnpc"));
             }
-
             if (mount == null || !mount.isSpawned())
                 throw new CommandException(Messaging.tr(Messages.MOUNT_NPC_MUST_BE_SPAWNED, onnpc));
 
@@ -1797,18 +1744,15 @@ public class NPCCommands {
             NMS.mount(mount.getEntity(), npc.getEntity());
             return;
         }
-
         if (args.hasFlag('c')) {
             npc.getOrAddTrait(MountTrait.class).unmount();
             return;
         }
-
         boolean enabled = npc.hasTrait(Controllable.class) && npc.getOrAddTrait(Controllable.class).isEnabled();
         if (!enabled) {
             Messaging.sendTr(sender, Messages.NPC_NOT_CONTROLLABLE, npc.getName());
             return;
         }
-
         if (!(sender instanceof Player))
             throw new CommandException(CommandMessages.MUST_BE_INGAME);
 
@@ -1831,9 +1775,8 @@ public class NPCCommands {
     public void moveto(CommandContext args, CommandSender sender, NPC npc) throws CommandException {
         if (!npc.isSpawned()) {
             npc.spawn(npc.getOrAddTrait(CurrentLocation.class).getLocation(), SpawnReason.COMMAND);
-            if (!npc.isSpawned()) {
+            if (!npc.isSpawned())
                 throw new CommandException("NPC could not be spawned.");
-            }
         }
         Location current = npc.getEntity().getLocation();
         Location to;
@@ -1850,16 +1793,21 @@ public class NPCCommands {
             to = new Location(world, x, y, z, current.getYaw(), current.getPitch());
         } else {
             to = current.clone();
-            if (args.hasValueFlag("x"))
+            if (args.hasValueFlag("x")) {
                 to.setX(args.getFlagDouble("x"));
-            if (args.hasValueFlag("y"))
+            }
+            if (args.hasValueFlag("y")) {
                 to.setY(args.getFlagDouble("y"));
-            if (args.hasValueFlag("z"))
+            }
+            if (args.hasValueFlag("z")) {
                 to.setZ(args.getFlagDouble("z"));
-            if (args.hasValueFlag("yaw"))
+            }
+            if (args.hasValueFlag("yaw")) {
                 to.setYaw((float) args.getFlagDouble("yaw"));
-            if (args.hasValueFlag("pitch"))
+            }
+            if (args.hasValueFlag("pitch")) {
                 to.setPitch((float) args.getFlagDouble("pitch"));
+            }
             if (args.hasValueFlag("world")) {
                 World world = Bukkit.getWorld(args.getFlag("world"));
                 if (world == null)
@@ -1867,7 +1815,6 @@ public class NPCCommands {
                 to.setWorld(world);
             }
         }
-
         npc.teleport(to, TeleportCause.COMMAND);
         NMS.look(npc.getEntity(), to.getYaw(), to.getPitch());
         Messaging.sendTr(sender, Messages.MOVETO_TELEPORTED, npc.getName(), Util.prettyPrintLocation(to));
@@ -1896,7 +1843,7 @@ public class NPCCommands {
     }
 
     @Command(aliases = { "npc" }, desc = "Show basic NPC information", max = 0, permission = "citizens.npc.info")
-    public void npc(CommandContext args, CommandSender sender, final NPC npc) {
+    public void npc(CommandContext args, CommandSender sender, NPC npc) {
         Messaging.send(sender, StringHelper.wrapHeader(npc.getName()));
         Messaging.send(sender, "    ID: [[" + npc.getId());
         EntityType type = npc.getOrAddTrait(MobType.class).getType();
@@ -1962,7 +1909,6 @@ public class NPCCommands {
             Messaging.sendTr(sender, Messages.NPC_OWNER, npc.getName(), ownerTrait.getOwner());
             return;
         }
-
         OfflinePlayer p;
         UUID uuid;
         if (args.getString(1).equalsIgnoreCase("SERVER")) {
@@ -1972,7 +1918,6 @@ public class NPCCommands {
         } else {
             uuid = UUID.fromString(args.getString(1));
         }
-
         if (ownerTrait.isOwnedBy(uuid))
             throw new CommandException(Messages.ALREADY_OWNER, uuid, npc.getName());
 
@@ -1995,7 +1940,6 @@ public class NPCCommands {
         if (explicit == null) {
             explicit = !npc.hasTrait(PacketNPC.class);
         }
-
         if (explicit) {
             npc.getOrAddTrait(PacketNPC.class);
             Messaging.sendTr(sender, Messages.NPC_PACKET_ENABLED, npc.getName());
@@ -2022,7 +1966,6 @@ public class NPCCommands {
             Messaging.sendTr(sender, Messages.PAINTING_ART_SET, npc.getName(), Util.prettyEnum(art));
             return;
         }
-
         throw new CommandUsageException();
     }
 
@@ -2103,9 +2046,9 @@ public class NPCCommands {
             output += " "
                     + Messaging.tr(Messages.PATHFINDING_OPTIONS_FALLING_DISTANCE_SET, npc.getName(), fallingDistance);
         }
-        if (output.isEmpty()) {
+        if (output.isEmpty())
             throw new CommandUsageException();
-        } else {
+        else {
             Messaging.send(sender, output.trim());
         }
     }
@@ -2137,13 +2080,12 @@ public class NPCCommands {
             throws CommandException {
         Location loc = npc.getStoredLocation();
         if (args.argsLength() == 2) {
-            if ((option.equalsIgnoreCase("me") || option.equalsIgnoreCase("here"))) {
+            if (option.equalsIgnoreCase("me") || option.equalsIgnoreCase("here")) {
                 loc = args.getSenderLocation();
             } else if (option.equalsIgnoreCase("cursor")) {
                 loc = ((Player) sender).getTargetBlockExact(32).getLocation();
-            } else {
+            } else
                 throw new CommandUsageException();
-            }
         } else {
             loc.setX(args.getDouble(1));
             loc.setY(args.getDouble(2));
@@ -2221,7 +2163,7 @@ public class NPCCommands {
 
     @Command(
             aliases = { "npc" },
-            usage = "playerfilter -a(llowlist) -e(mpty) -d(enylist) --add [uuid] --remove [uuid] --addgroup [group] --removegroup [group] -c(lear)",
+            usage = "playerfilter -a(llowlist) -e(mpty) -d(enylist) --add [uuid] --remove [uuid] --addgroup [group] --removegroup [group] -c(lear) --applywithin [blocks range]",
             desc = "Sets the NPC filter",
             modifiers = { "playerfilter" },
             min = 1,
@@ -2229,7 +2171,8 @@ public class NPCCommands {
             flags = "adce",
             permission = "citizens.npc.playerfilter")
     public void playerfilter(CommandContext args, CommandSender sender, NPC npc, @Flag("add") UUID add,
-            @Flag("remove") UUID remove, @Flag("removegroup") String removegroup, @Flag("addgroup") String addgroup) {
+            @Flag("remove") UUID remove, @Flag("removegroup") String removegroup, @Flag("addgroup") String addgroup,
+            @Flag("applywithin") Double applyRange) {
         PlayerFilter trait = npc.getOrAddTrait(PlayerFilter.class);
         if (add != null) {
             trait.addPlayer(add);
@@ -2247,6 +2190,10 @@ public class NPCCommands {
             trait.removeGroup(removegroup);
             Messaging.sendTr(sender, Messages.PLAYERFILTER_GROUP_REMOVED, removegroup, npc.getName());
         }
+        if (applyRange != null) {
+            trait.setApplyRange(applyRange);
+            Messaging.sendTr(sender, Messages.PLAYERFILTER_APPLYRANGE_SET, npc.getName(), applyRange);
+        }
         if (args.hasFlag('e')) {
             trait.setPlayers(Collections.emptySet());
             Messaging.sendTr(sender, Messages.PLAYERFILTER_EMPTY_SET, npc.getName());
@@ -2331,16 +2278,13 @@ public class NPCCommands {
             if (yaw != null) {
                 loc.setYaw(yaw);
             }
-
             if (pitch != null) {
                 loc.setPitch(pitch);
             }
-
             if (trait.addPose(save, loc, args.hasFlag('d'))) {
                 Messaging.sendTr(sender, Messages.POSE_ADDED);
-            } else {
+            } else
                 throw new CommandException(Messages.POSE_ALREADY_EXISTS, save);
-            }
         } else if (mirror != null) {
             if (mirror.isEmpty())
                 throw new CommandException(Messages.INVALID_POSE_NAME);
@@ -2350,9 +2294,8 @@ public class NPCCommands {
 
             if (trait.addPose(mirror, args.getSenderLocation(), args.hasFlag('d'))) {
                 Messaging.sendTr(sender, Messages.POSE_ADDED);
-            } else {
+            } else
                 throw new CommandException(Messages.POSE_ALREADY_EXISTS, mirror);
-            }
         } else if (defaultPose != null) {
             if (!trait.hasPose(defaultPose))
                 throw new CommandException(Messages.POSE_MISSING, defaultPose);
@@ -2377,7 +2320,6 @@ public class NPCCommands {
         } else if (!args.hasFlag('a')) {
             trait.describe(sender, args.getInteger(1, 1));
         }
-
         if (args.hasFlag('a')) {
             if (args.getSenderLocation() == null)
                 throw new ServerCommandException();
@@ -2447,7 +2389,7 @@ public class NPCCommands {
             min = 1,
             max = 2)
     @Requirements
-    public void remove(final CommandContext args, final CommandSender sender, NPC npc, @Flag("owner") String owner,
+    public void remove(CommandContext args, CommandSender sender, NPC npc, @Flag("owner") String owner,
             @Flag("eid") UUID eid, @Flag("world") String world, @Arg(value = 1, completions = "all") String action)
             throws CommandException {
         if (owner != null) {
@@ -2461,12 +2403,11 @@ public class NPCCommands {
                 }
             }
             for (NPC rem : Lists.newArrayList(CitizensAPI.getNPCRegistry())) {
-                if (!rem.getOrAddTrait(Owner.class).isOwnedBy(sender))
+                if (!rem.getOrAddTrait(Owner.class).isOwnedBy(sender)) {
                     continue;
-                if (uuid != null && rem.getOrAddTrait(Owner.class).isOwnedBy(uuid)) {
-                    history.add(sender, new RemoveNPCHistoryItem(rem));
-                    rem.destroy(sender);
-                } else if (rem.getOrAddTrait(Owner.class).isOwnedBy(owner)) {
+                }
+                if (uuid != null && rem.getOrAddTrait(Owner.class).isOwnedBy(uuid)
+                        || rem.getOrAddTrait(Owner.class).isOwnedBy(owner)) {
                     history.add(sender, new RemoveNPCHistoryItem(rem));
                     rem.destroy(sender);
                 }
@@ -2474,7 +2415,6 @@ public class NPCCommands {
             Messaging.sendTr(sender, Messages.NPCS_REMOVED);
             return;
         }
-
         if (world != null) {
             for (NPC rem : Lists.newArrayList(CitizensAPI.getNPCRegistry())) {
                 Location loc = rem.getStoredLocation();
@@ -2488,7 +2428,6 @@ public class NPCCommands {
             Messaging.sendTr(sender, Messages.NPCS_REMOVED);
             return;
         }
-
         if (eid != null) {
             Entity entity = Bukkit.getServer().getEntity(eid);
             if (entity != null && (npc = CitizensAPI.getNPCRegistry().getNPC(entity)) != null
@@ -2496,13 +2435,11 @@ public class NPCCommands {
                 history.add(sender, new RemoveNPCHistoryItem(npc));
                 npc.destroy(sender);
                 Messaging.sendTr(sender, Messages.NPC_REMOVED, npc.getName(), npc.getId());
-                return;
             } else {
                 Messaging.sendErrorTr(sender, Messages.NPC_NOT_FOUND);
-                return;
             }
+            return;
         }
-
         if (args.argsLength() == 2) {
             if ("all".equalsIgnoreCase(action)) {
                 if (!sender.hasPermission("citizens.admin.remove.all") && !sender.hasPermission("citizens.admin"))
@@ -2512,7 +2449,6 @@ public class NPCCommands {
                 }
                 CitizensAPI.getNPCRegistry().deregisterAll();
                 Messaging.sendTr(sender, Messages.REMOVED_ALL_NPCS);
-                return;
             } else {
                 NPCCommandSelector.Callback callback = npc1 -> {
                     if (npc1 == null)
@@ -2527,8 +2463,8 @@ public class NPCCommands {
                 };
                 NPCCommandSelector.startWithCallback(callback, CitizensAPI.getNPCRegistry(), sender, args,
                         args.getString(1));
-                return;
             }
+            return;
         }
         if (npc == null)
             throw new CommandException(CommandMessages.MUST_HAVE_SELECTED);
@@ -2606,7 +2542,6 @@ public class NPCCommands {
             npc.getOrAddTrait(RotationTrait.class).getPhysicalSession().rotateToHave(yaw, pitch);
             return;
         }
-
         if (yaw != null) {
             NMS.setBodyYaw(npc.getEntity(), yaw);
             if (npc.getEntity().getType() == EntityType.PLAYER) {
@@ -2614,11 +2549,9 @@ public class NPCCommands {
                 PlayerAnimation.ARM_SWING.play((Player) npc.getEntity());
             }
         }
-
         if (pitch != null) {
             NMS.setPitch(npc.getEntity(), pitch);
         }
-
         if (head != null) {
             NMS.setHeadYaw(npc.getEntity(), head);
         }
@@ -2633,7 +2566,7 @@ public class NPCCommands {
             max = 2,
             permission = "citizens.npc.select")
     @Requirements
-    public void select(CommandContext args, final CommandSender sender, final NPC npc,
+    public void select(CommandContext args, CommandSender sender, NPC npc,
             @Flag(value = "range", defValue = "10") double range, @Flag("registry") String registryName)
             throws CommandException {
         NPCCommandSelector.Callback callback = toSelect -> {
@@ -2653,7 +2586,7 @@ public class NPCCommands {
         if (args.argsLength() <= 1) {
             if (args.getSenderLocation() == null)
                 throw new ServerCommandException();
-            final Location location = args.getSenderLocation();
+            Location location = args.getSenderLocation();
             List<NPC> search = location.getWorld().getNearbyEntities(location, range, range, range).stream()
                     .map(e -> registry.getNPC(e)).filter(e -> e != null).collect(Collectors.toList());
             Collections.sort(search, (o1, o2) -> Double.compare(o1.getEntity().getLocation().distanceSquared(location),
@@ -2718,9 +2651,8 @@ public class NPCCommands {
             }
             hasArg = true;
         }
-        if (!hasArg) {
+        if (!hasArg)
             throw new CommandException();
-        }
     }
 
     @Command(
@@ -2759,9 +2691,8 @@ public class NPCCommands {
             shop.displayEditor(npc == null ? null : npc.getOrAddTrait(ShopTrait.class), sender);
         } else if (action.equalsIgnoreCase("show")) {
             shop.display(sender);
-        } else {
+        } else
             throw new CommandUsageException();
-        }
     }
 
     @Command(
@@ -2799,10 +2730,10 @@ public class NPCCommands {
             flags = "ectls",
             permission = "citizens.npc.skin")
     @Requirements(types = EntityType.PLAYER, selected = true, ownership = true)
-    public void skin(final CommandContext args, final CommandSender sender, final NPC npc, @Flag("url") String url,
+    public void skin(CommandContext args, CommandSender sender, NPC npc, @Flag("url") String url,
             @Flag("file") String file) throws CommandException {
         String skinName = npc.getName();
-        final SkinTrait trait = npc.getOrAddTrait(SkinTrait.class);
+        SkinTrait trait = npc.getOrAddTrait(SkinTrait.class);
         if (args.hasFlag('c')) {
             trait.clearTexture();
             Messaging.sendTr(sender, Messages.SKIN_CLEARED);
@@ -2832,12 +2763,10 @@ public class NPCCommands {
                         FileOutputStream out = new FileOutputStream(skin)) {
                     out.getChannel().transferFrom(in, 0, 10000);
                 }
-
                 Messaging.send(sender, Messages.SKIN_EXPORTED, skin.getName());
             } catch (Exception e) {
                 throw new CommandException("Couldn't parse texture: " + e.getMessage());
             }
-
             return;
         } else if (url != null || file != null) {
             Messaging.sendTr(sender, Messages.FETCHING_SKIN, url == null ? file : url);
@@ -2853,14 +2782,12 @@ public class NPCCommands {
                                     () -> Messaging.sendErrorTr(sender, Messages.INVALID_SKIN_FILE, file));
                             return;
                         }
-
                         data = MojangSkinGenerator.generateFromPNG(Files.readAllBytes(skin.toPath()),
                                 args.hasFlag('s'));
                     } else {
                         data = MojangSkinGenerator.generateFromURL(Placeholders.replace(url, sender, npc),
                                 args.hasFlag('s'));
                     }
-
                     String uuid = (String) data.get("uuid");
                     JSONObject texture = (JSONObject) data.get("texture");
                     String textureEncoded = (String) texture.get("value");
@@ -2898,16 +2825,14 @@ public class NPCCommands {
             if (sender instanceof Player && ((Player) sender).getInventory().addItem(is).isEmpty()) {
             } else if (args.getSenderLocation() != null) {
                 args.getSenderLocation().getWorld().dropItem(args.getSenderLocation(), is);
-            } else {
+            } else
                 throw new ServerCommandException();
-            }
         } else {
             if (args.argsLength() != 2)
                 throw new CommandException(Messages.SKIN_REQUIRED);
             if (args.hasFlag('l')) {
                 trait.setShouldUpdateSkins(true);
             }
-
             skinName = args.getString(1);
         }
         Messaging.sendTr(sender, Messages.SKIN_SET, npc.getName(), skinName);
@@ -2923,32 +2848,27 @@ public class NPCCommands {
             max = 5,
             permission = "citizens.npc.skinlayers")
     @Requirements(types = EntityType.PLAYER, selected = true, ownership = true)
-    public void skinLayers(final CommandContext args, final CommandSender sender, final NPC npc,
-            @Flag("cape") Boolean cape, @Flag("hat") Boolean hat, @Flag("jacket") Boolean jacket,
-            @Flag("sleeves") Boolean sleeves, @Flag("pants") Boolean pants) throws CommandException {
+    public void skinLayers(CommandContext args, CommandSender sender, NPC npc, @Flag("cape") Boolean cape,
+            @Flag("hat") Boolean hat, @Flag("jacket") Boolean jacket, @Flag("sleeves") Boolean sleeves,
+            @Flag("pants") Boolean pants) throws CommandException {
         SkinLayers trait = npc.getOrAddTrait(SkinLayers.class);
         if (cape != null) {
             trait.setVisible(Layer.CAPE, cape);
         }
-
         if (hat != null) {
             trait.setVisible(Layer.HAT, hat);
         }
-
         if (jacket != null) {
             trait.setVisible(Layer.JACKET, jacket);
         }
-
         if (sleeves != null) {
             trait.setVisible(Layer.LEFT_SLEEVE, sleeves);
             trait.setVisible(Layer.RIGHT_SLEEVE, sleeves);
         }
-
         if (pants != null) {
             trait.setVisible(Layer.LEFT_PANTS, pants);
             trait.setVisible(Layer.RIGHT_PANTS, pants);
         }
-
         Messaging.sendTr(sender, Messages.SKIN_LAYERS_SET, npc.getName(), trait.isVisible(Layer.CAPE),
                 trait.isVisible(Layer.HAT), trait.isVisible(Layer.JACKET),
                 trait.isVisible(Layer.LEFT_SLEEVE) || trait.isVisible(Layer.RIGHT_SLEEVE),
@@ -2970,7 +2890,6 @@ public class NPCCommands {
             trait.describe(sender);
             return;
         }
-
         int size = Math.max(-2, args.getInteger(1));
         trait.setSize(size);
         Messaging.sendTr(sender, Messages.SIZE_SET, npc.getName(), size);
@@ -2995,16 +2914,13 @@ public class NPCCommands {
             Messaging.sendTr(sender, Messages.SOUND_INFO, npc.getName(), ambientSound, hurtSound, deathSound);
             return;
         }
-
         if (args.hasFlag('n')) {
             ambientSound = deathSound = hurtSound = "";
             npc.data().setPersistent(NPC.Metadata.SILENT, true);
         }
-
         if (args.hasFlag('s')) {
             npc.data().setPersistent(NPC.Metadata.SILENT, !npc.data().get(NPC.Metadata.SILENT, false));
         }
-
         if (args.hasFlag('d')) {
             ambientSound = deathSound = hurtSound = null;
             npc.data().setPersistent(NPC.Metadata.SILENT, false);
@@ -3014,56 +2930,46 @@ public class NPCCommands {
             } else if (args.hasValueFlag("death")) {
                 deathSound = args.getFlag("death").equals("d") ? null : args.getFlag("death");
             }
-
             if (ambient != null) {
                 ambientSound = NMS.getSoundPath(ambient);
             } else if (args.hasValueFlag("ambient")) {
                 ambientSound = args.getFlag("ambient").equals("d") ? null : args.getFlag("ambient");
             }
-
             if (hurt != null) {
                 hurtSound = NMS.getSoundPath(hurt);
             } else if (args.hasValueFlag("hurt")) {
                 hurtSound = args.getFlag("hurt").equals("d") ? null : args.getFlag("hurt");
             }
         }
-
         if (deathSound == null) {
             npc.data().remove(NPC.Metadata.DEATH_SOUND);
         } else {
             npc.data().setPersistent(NPC.Metadata.DEATH_SOUND, deathSound);
         }
-
         if (hurtSound == null) {
             npc.data().remove(NPC.Metadata.HURT_SOUND);
         } else {
             npc.data().setPersistent(NPC.Metadata.HURT_SOUND, hurtSound);
         }
-
         if (ambientSound == null) {
             npc.data().remove(NPC.Metadata.AMBIENT_SOUND);
         } else {
             npc.data().setPersistent(NPC.Metadata.AMBIENT_SOUND, ambientSound);
         }
-
         if (ambientSound != null && ambientSound.isEmpty()) {
             ambientSound = "none";
         }
-
         if (hurtSound != null && hurtSound.isEmpty()) {
             hurtSound = "none";
         }
-
         if (deathSound != null && deathSound.isEmpty()) {
             deathSound = "none";
         }
-
-        if ((!Strings.isNullOrEmpty(ambientSound) && !ambientSound.equals("none"))
-                || (!Strings.isNullOrEmpty(deathSound) && !deathSound.equals("none"))
-                || (!Strings.isNullOrEmpty(hurtSound) && !hurtSound.equals("none"))) {
+        if (!Strings.isNullOrEmpty(ambientSound) && !ambientSound.equals("none")
+                || !Strings.isNullOrEmpty(deathSound) && !deathSound.equals("none")
+                || !Strings.isNullOrEmpty(hurtSound) && !hurtSound.equals("none")) {
             npc.data().setPersistent(NPC.Metadata.SILENT, false);
         }
-
         Messaging.sendTr(sender, Messages.SOUND_SET, npc.getName(), ambientSound, hurtSound, deathSound);
     }
 
@@ -3077,18 +2983,16 @@ public class NPCCommands {
             flags = "l",
             permission = "citizens.npc.spawn")
     @Requirements(ownership = true)
-    public void spawn(final CommandContext args, final CommandSender sender, NPC npc) throws CommandException {
+    public void spawn(CommandContext args, CommandSender sender, NPC npc) throws CommandException {
         NPCCommandSelector.Callback callback = respawn -> {
             if (respawn == null) {
-                if (args.argsLength() > 1) {
+                if (args.argsLength() > 1)
                     throw new CommandException(Messages.NO_NPC_WITH_ID_FOUND, args.getString(1));
-                } else {
+                else
                     throw new CommandException(CommandMessages.MUST_HAVE_SELECTED);
-                }
             }
-            if (respawn.isSpawned()) {
+            if (respawn.isSpawned())
                 throw new CommandException(Messages.NPC_ALREADY_SPAWNED, respawn.getName());
-            }
             Location location = respawn.getOrAddTrait(CurrentLocation.class).getLocation();
             if (location == null || args.hasValueFlag("location")) {
                 if (args.getSenderLocation() == null)
@@ -3130,9 +3034,10 @@ public class NPCCommands {
         Player playerRecipient = null;
         if (target != null) {
             if (target.matches("\\d+")) {
-                NPC targetNPC = CitizensAPI.getNPCRegistry().getById(Integer.valueOf(args.getFlag("target")));
-                if (targetNPC != null)
+                NPC targetNPC = CitizensAPI.getNPCRegistry().getById(Integer.parseInt(args.getFlag("target")));
+                if (targetNPC != null) {
                     context.addRecipient(targetNPC.getEntity());
+                }
             } else {
                 Player player = Bukkit.getPlayerExact(target);
                 if (player != null) {
@@ -3141,13 +3046,11 @@ public class NPCCommands {
                 }
             }
         }
-
         if (bubbleDuration != null) {
             HologramTrait trait = npc.getOrAddTrait(HologramTrait.class);
             trait.addTemporaryLine(Placeholders.replace(message, playerRecipient, npc), Util.toTicks(bubbleDuration));
             return;
         }
-
         if (range != null) {
             npc.getEntity().getNearbyEntities(range, range, range).forEach(e -> {
                 if (!CitizensAPI.getNPCRegistry().isNPC(e)) {
@@ -3155,7 +3058,6 @@ public class NPCCommands {
                 }
             });
         }
-
         npc.getDefaultSpeechController().speak(context);
     }
 
@@ -3276,9 +3178,8 @@ public class NPCCommands {
             to = target.getRelative(BlockFace.UP).getLocation();
         }
         if (!sender.hasPermission("citizens.npc.tphere.multiworld")
-                && npc.getStoredLocation().getWorld() != args.getSenderLocation().getWorld()) {
+                && npc.getStoredLocation().getWorld() != args.getSenderLocation().getWorld())
             throw new CommandException(Messages.CANNOT_TELEPORT_ACROSS_WORLDS);
-        }
         if (args.hasFlag('c')) {
             to = to.getBlock().getLocation();
             to.setX(to.getX() + 0.5);
@@ -3463,8 +3364,8 @@ public class NPCCommands {
             permission = "citizens.npc.wander")
     public void wander(CommandContext args, CommandSender sender, NPC npc) throws CommandException {
         Waypoints trait = npc.getOrAddTrait(Waypoints.class);
-        if (sender instanceof Player && Editor.hasEditor(((Player) sender))) {
-            Editor.leave(((Player) sender));
+        if (sender instanceof Player && Editor.hasEditor((Player) sender)) {
+            Editor.leave((Player) sender);
         }
         trait.setWaypointProvider(trait.getCurrentProviderName().equals("wander") ? "linear" : "wander");
         Messaging.sendTr(sender, Messages.WAYPOINT_PROVIDER_SET, trait.getCurrentProviderName());
@@ -3508,15 +3409,12 @@ public class NPCCommands {
         if (args.hasFlag('a')) {
             trait.setAngry(!trait.isAngry());
         }
-
         if (args.hasFlag('s')) {
             trait.setSitting(!trait.isSitting());
         }
-
         if (args.hasFlag('t')) {
             trait.setTamed(!trait.isTamed());
         }
-
         if (collar != null) {
             String unparsed = collar;
             DyeColor color = null;
@@ -3534,7 +3432,6 @@ public class NPCCommands {
                 throw new CommandException(Messages.COLLAR_COLOUR_NOT_SUPPORTED, unparsed);
             trait.setCollarColor(color);
         }
-
         Messaging.sendTr(sender, Messages.WOLF_TRAIT_UPDATED, npc.getName(), trait.isAngry(), trait.isSitting(),
                 trait.isTamed(), trait.getCollarColor().name());
     }
diff --git a/main/src/main/java/net/citizensnpcs/commands/TraitCommands.java b/main/src/main/java/net/citizensnpcs/commands/TraitCommands.java
index b10cf4987..407e78401 100644
--- a/main/src/main/java/net/citizensnpcs/commands/TraitCommands.java
+++ b/main/src/main/java/net/citizensnpcs/commands/TraitCommands.java
@@ -42,7 +42,6 @@ public class TraitCommands {
                 failed.add(String.format("%s: No permission", traitName));
                 continue;
             }
-
             Class<? extends Trait> clazz = CitizensAPI.getTraitFactory().getTraitClass(traitName);
             if (clazz == null) {
                 failed.add(String.format("%s: Trait not found", traitName));
@@ -108,7 +107,6 @@ public class TraitCommands {
                 failed.add(String.format("%s: No permission", traitName));
                 continue;
             }
-
             Class<? extends Trait> clazz = CitizensAPI.getTraitFactory().getTraitClass(traitName);
             if (clazz == null) {
                 failed.add(String.format("%s: Trait not found", traitName));
@@ -122,10 +120,12 @@ public class TraitCommands {
             removeTrait(npc, clazz, sender);
             removed.add(StringHelper.wrap(traitName));
         }
-        if (removed.size() > 0)
+        if (removed.size() > 0) {
             Messaging.sendTr(sender, Messages.TRAITS_REMOVED, Joiner.on(", ").join(removed));
-        if (failed.size() > 0)
+        }
+        if (failed.size() > 0) {
             Messaging.sendTr(sender, Messages.FAILED_TO_REMOVE, Joiner.on(", ").join(failed));
+        }
     }
 
     private void removeTrait(NPC npc, Class<? extends Trait> clazz, CommandSender sender) {
@@ -150,7 +150,6 @@ public class TraitCommands {
                 failed.add(String.format("%s: No permission", traitName));
                 continue;
             }
-
             Class<? extends Trait> clazz = CitizensAPI.getTraitFactory().getTraitClass(traitName);
             if (clazz == null) {
                 failed.add(String.format("%s: Trait not found", traitName));
diff --git a/main/src/main/java/net/citizensnpcs/commands/WaypointCommands.java b/main/src/main/java/net/citizensnpcs/commands/WaypointCommands.java
index 1f58237bf..2bb563459 100644
--- a/main/src/main/java/net/citizensnpcs/commands/WaypointCommands.java
+++ b/main/src/main/java/net/citizensnpcs/commands/WaypointCommands.java
@@ -130,8 +130,8 @@ public class WaypointCommands {
             waypoints.describeProviders(sender);
             return;
         }
-        if (sender instanceof Player && Editor.hasEditor(((Player) sender))) {
-            Editor.leave(((Player) sender));
+        if (sender instanceof Player && Editor.hasEditor((Player) sender)) {
+            Editor.leave((Player) sender);
         }
         boolean success = waypoints.setWaypointProvider(args.getString(1));
         if (!success)
diff --git a/main/src/main/java/net/citizensnpcs/commands/gui/NPCConfigurator.java b/main/src/main/java/net/citizensnpcs/commands/gui/NPCConfigurator.java
index af0955b69..cf9409ef5 100644
--- a/main/src/main/java/net/citizensnpcs/commands/gui/NPCConfigurator.java
+++ b/main/src/main/java/net/citizensnpcs/commands/gui/NPCConfigurator.java
@@ -20,7 +20,7 @@ import net.citizensnpcs.util.Util;
 
 @Menu(title = "Configure NPC", type = InventoryType.CHEST, dimensions = { 5, 9 })
 public class NPCConfigurator extends InventoryMenuPage {
-    private final NPC npc;
+    private NPC npc;
 
     private NPCConfigurator() {
         throw new UnsupportedOperationException();
@@ -36,7 +36,7 @@ public class NPCConfigurator extends InventoryMenuPage {
             ConfiguratorInfo info = entry.getValue();
             InventoryMenuSlot slot = ctx.getSlot(entry.getKey());
             slot.setItemStack(new ItemStack(info.material, 1));
-            slot.setClickHandler((evt) -> info.clickHandler.accept(new ConfiguratorEvent(ctx, npc, slot, evt)));
+            slot.setClickHandler(evt -> info.clickHandler.accept(new ConfiguratorEvent(ctx, npc, slot, evt)));
             info.clickHandler.accept(new ConfiguratorEvent(ctx, npc, slot, null));
         }
     }
@@ -51,7 +51,7 @@ public class NPCConfigurator extends InventoryMenuPage {
             this.ctx = ctx;
             this.npc = npc;
             this.slot = slot;
-            this.event = evt;
+            event = evt;
         }
     }
 
@@ -60,18 +60,18 @@ public class NPCConfigurator extends InventoryMenuPage {
         private final Material material;
 
         public ConfiguratorInfo(Material mat, Consumer<ConfiguratorEvent> con) {
-            this.material = mat;
-            this.clickHandler = con;
+            material = mat;
+            clickHandler = con;
         }
     }
 
     private static final Map<Integer, ConfiguratorInfo> SLOT_MAP = Maps.newHashMap();
     static {
-        SLOT_MAP.put(0, new ConfiguratorInfo(Util.getFallbackMaterial("OAK_SIGN", "SIGN"), (evt) -> {
+        SLOT_MAP.put(0, new ConfiguratorInfo(Util.getFallbackMaterial("OAK_SIGN", "SIGN"), evt -> {
             evt.slot.setDescription("Edit NPC name\n" + evt.npc.getName());
             if (evt.event != null) {
-                evt.ctx.getMenu().transition(
-                        InputMenus.stringSetter(() -> evt.npc.getName(), (input) -> evt.npc.setName(input)));
+                evt.ctx.getMenu()
+                        .transition(InputMenus.stringSetter(() -> evt.npc.getName(), input -> evt.npc.setName(input)));
             }
         }));
     }
diff --git a/main/src/main/java/net/citizensnpcs/commands/history/CreateNPCHistoryItem.java b/main/src/main/java/net/citizensnpcs/commands/history/CreateNPCHistoryItem.java
index 35ec596d4..37c7e44a3 100644
--- a/main/src/main/java/net/citizensnpcs/commands/history/CreateNPCHistoryItem.java
+++ b/main/src/main/java/net/citizensnpcs/commands/history/CreateNPCHistoryItem.java
@@ -12,7 +12,7 @@ public class CreateNPCHistoryItem implements CommandHistoryItem {
     private final UUID uuid;
 
     public CreateNPCHistoryItem(NPC npc) {
-        this.uuid = npc.getUniqueId();
+        uuid = npc.getUniqueId();
     }
 
     @Override
diff --git a/main/src/main/java/net/citizensnpcs/commands/history/RemoveNPCHistoryItem.java b/main/src/main/java/net/citizensnpcs/commands/history/RemoveNPCHistoryItem.java
index fac6b5fa2..6f8e0ca08 100644
--- a/main/src/main/java/net/citizensnpcs/commands/history/RemoveNPCHistoryItem.java
+++ b/main/src/main/java/net/citizensnpcs/commands/history/RemoveNPCHistoryItem.java
@@ -19,11 +19,11 @@ public class RemoveNPCHistoryItem implements CommandHistoryItem {
     private final UUID uuid;
 
     public RemoveNPCHistoryItem(NPC from) {
-        this.key = new MemoryDataKey();
+        key = new MemoryDataKey();
         from.save(key);
-        this.type = from.getOrAddTrait(MobType.class).getType();
-        this.uuid = from.getUniqueId();
-        this.id = from.getId();
+        type = from.getOrAddTrait(MobType.class).getType();
+        uuid = from.getUniqueId();
+        id = from.getId();
     }
 
     @Override
diff --git a/main/src/main/java/net/citizensnpcs/editor/CopierEditor.java b/main/src/main/java/net/citizensnpcs/editor/CopierEditor.java
index f7864d995..92c75600b 100644
--- a/main/src/main/java/net/citizensnpcs/editor/CopierEditor.java
+++ b/main/src/main/java/net/citizensnpcs/editor/CopierEditor.java
@@ -19,7 +19,7 @@ public class CopierEditor extends Editor {
     public CopierEditor(Player player, NPC npc) {
         this.player = player;
         this.npc = npc;
-        this.name = npc.getRawName();
+        name = npc.getRawName();
     }
 
     @Override
@@ -41,7 +41,6 @@ public class CopierEditor extends Editor {
         if (!copy.getRawName().equals(name)) {
             copy.setName(name);
         }
-
         if (copy.isSpawned() && player.isOnline()) {
             Location location = event.getClickedBlock().getLocation();
             location.setYaw(player.getLocation().getYaw());
@@ -50,7 +49,6 @@ public class CopierEditor extends Editor {
             copy.teleport(location, TeleportCause.PLUGIN);
             copy.getOrAddTrait(CurrentLocation.class).setLocation(location);
         }
-
         Messaging.sendTr(player, Messages.NPC_COPIED, npc.getName());
         event.setCancelled(true);
     }
diff --git a/main/src/main/java/net/citizensnpcs/editor/Editor.java b/main/src/main/java/net/citizensnpcs/editor/Editor.java
index 0a12c9566..a8f4c0212 100644
--- a/main/src/main/java/net/citizensnpcs/editor/Editor.java
+++ b/main/src/main/java/net/citizensnpcs/editor/Editor.java
@@ -58,5 +58,5 @@ public abstract class Editor implements Listener {
         EDITING.clear();
     }
 
-    private static final Map<UUID, Editor> EDITING = new HashMap<UUID, Editor>();
+    private static final Map<UUID, Editor> EDITING = new HashMap<>();
 }
\ No newline at end of file
diff --git a/main/src/main/java/net/citizensnpcs/editor/GenericEquipperGUI.java b/main/src/main/java/net/citizensnpcs/editor/GenericEquipperGUI.java
index 54b4c4904..8c87f4a4f 100644
--- a/main/src/main/java/net/citizensnpcs/editor/GenericEquipperGUI.java
+++ b/main/src/main/java/net/citizensnpcs/editor/GenericEquipperGUI.java
@@ -73,32 +73,32 @@ public class GenericEquipperGUI extends InventoryMenuPage {
 
     @ClickHandler(slot = { 1, 5 })
     public void setBoots(InventoryMenuSlot slot, CitizensInventoryClickEvent event) {
-        set(EquipmentSlot.BOOTS, event, (type) -> type == Material.AIR || type.name().endsWith("BOOTS"));
+        set(EquipmentSlot.BOOTS, event, type -> type == Material.AIR || type.name().endsWith("BOOTS"));
     }
 
     @ClickHandler(slot = { 1, 3 })
     public void setChest(InventoryMenuSlot slot, CitizensInventoryClickEvent event) {
         set(EquipmentSlot.CHESTPLATE, event,
-                (type) -> type == Material.AIR || type.name().endsWith("CHESTPLATE") || type.name().equals("ELYTRA"));
+                type -> type == Material.AIR || type.name().endsWith("CHESTPLATE") || type.name().equals("ELYTRA"));
     }
 
     @ClickHandler(slot = { 1, 0 })
     public void setHand(InventoryMenuSlot slot, CitizensInventoryClickEvent event) {
-        set(EquipmentSlot.HAND, event, (type) -> true);
+        set(EquipmentSlot.HAND, event, type -> true);
     }
 
     @ClickHandler(slot = { 1, 2 })
     public void setHelmet(InventoryMenuSlot slot, CitizensInventoryClickEvent event) {
-        set(EquipmentSlot.HELMET, event, (type) -> true);
+        set(EquipmentSlot.HELMET, event, type -> true);
     }
 
     @ClickHandler(slot = { 1, 4 })
     public void setLeggings(InventoryMenuSlot slot, CitizensInventoryClickEvent event) {
-        set(EquipmentSlot.LEGGINGS, event, (type) -> type == Material.AIR || type.name().endsWith("LEGGINGS"));
+        set(EquipmentSlot.LEGGINGS, event, type -> type == Material.AIR || type.name().endsWith("LEGGINGS"));
     }
 
     @ClickHandler(slot = { 1, 1 })
     public void setOffhand(InventoryMenuSlot slot, CitizensInventoryClickEvent event) {
-        set(EquipmentSlot.OFF_HAND, event, (type) -> true);
+        set(EquipmentSlot.OFF_HAND, event, type -> true);
     }
 }
diff --git a/main/src/main/java/net/citizensnpcs/npc/AbstractEntityController.java b/main/src/main/java/net/citizensnpcs/npc/AbstractEntityController.java
index df5554b8e..2e9b3bc41 100644
--- a/main/src/main/java/net/citizensnpcs/npc/AbstractEntityController.java
+++ b/main/src/main/java/net/citizensnpcs/npc/AbstractEntityController.java
@@ -43,11 +43,10 @@ public abstract class AbstractEntityController implements EntityController {
         if (bukkitEntity instanceof Player) {
             NMS.removeFromWorld(bukkitEntity);
             NMS.remove(bukkitEntity);
-            bukkitEntity = null;
         } else {
             bukkitEntity.remove();
-            bukkitEntity = null;
         }
+        bukkitEntity = null;
     }
 
     @Override
diff --git a/main/src/main/java/net/citizensnpcs/npc/CitizensNPC.java b/main/src/main/java/net/citizensnpcs/npc/CitizensNPC.java
index f3b368273..6a8b84d1f 100644
--- a/main/src/main/java/net/citizensnpcs/npc/CitizensNPC.java
+++ b/main/src/main/java/net/citizensnpcs/npc/CitizensNPC.java
@@ -82,54 +82,44 @@ public class CitizensNPC extends AbstractNPC {
             }
             return true;
         }
-
         NPCDespawnEvent event = new NPCDespawnEvent(this, reason);
         if (reason == DespawnReason.CHUNK_UNLOAD) {
             event.setCancelled(data().get(NPC.Metadata.KEEP_CHUNK_LOADED, Setting.KEEP_CHUNKS_LOADED.asBoolean()));
         }
-
         Bukkit.getPluginManager().callEvent(event);
         if (event.isCancelled() && reason != DespawnReason.DEATH) {
             Messaging.debug("Couldn't despawn", this, "due to despawn event cancellation. Will load chunk.",
                     getEntity().isValid(), ", DespawnReason." + reason);
             return false;
         }
-
         boolean keepSelected = getOrAddTrait(Spawned.class).shouldSpawn();
         if (!keepSelected) {
             data().remove("selectors");
         }
-
         if (getEntity() != null) {
             getEntity().removeMetadata("NPC", CitizensAPI.getPlugin());
             getEntity().removeMetadata("NPC-ID", CitizensAPI.getPlugin());
         }
-
         if (getEntity() instanceof Player) {
             PlayerUpdateTask.deregisterPlayer(getEntity());
         }
-
         navigator.onDespawn();
         if (reason == DespawnReason.RELOAD) {
             unloadEvents();
         }
-
-        for (Trait trait : new ArrayList<Trait>(traits.values())) {
+        for (Trait trait : new ArrayList<>(traits.values())) {
             trait.onDespawn(reason);
         }
-
         Messaging.debug("Despawned", this, "DespawnReason." + reason);
 
         if (getEntity() instanceof SkinnableEntity) {
             ((SkinnableEntity) getEntity()).getSkinTracker().onRemoveNPC();
         }
-
         if (reason == DespawnReason.DEATH) {
             entityController.die();
         } else {
             entityController.remove();
         }
-
         return true;
     }
 
@@ -190,7 +180,7 @@ public class CitizensNPC extends AbstractNPC {
     }
 
     @Override
-    public void load(final DataKey root) {
+    public void load(DataKey root) {
         super.load(root);
 
         CurrentLocation spawnLocation = getOrAddTrait(CurrentLocation.class);
@@ -201,14 +191,13 @@ public class CitizensNPC extends AbstractNPC {
                 Messaging.debug("Tried to spawn", this, "on load but world was null");
             }
         }
-
         navigator.load(root.getRelative("navigator"));
     }
 
     @Override
     public boolean requiresNameHologram() {
         return super.requiresNameHologram()
-                || (Setting.ALWAYS_USE_NAME_HOLOGRAM.asBoolean() && !data().has(NPC.Metadata.HOLOGRAM_FOR));
+                || Setting.ALWAYS_USE_NAME_HOLOGRAM.asBoolean() && !data().has(NPC.Metadata.HOLOGRAM_FOR);
     }
 
     private void resetCachedCoord() {
@@ -255,12 +244,10 @@ public class CitizensNPC extends AbstractNPC {
             prev = getEntity().getLocation();
             despawn(DespawnReason.PENDING_RESPAWN);
         }
-
         PacketNPC packet = getTraitNullable(PacketNPC.class);
         if (packet != null) {
             newController = packet.wrap(newController);
         }
-
         entityController = newController;
         if (wasSpawned) {
             spawn(prev, SpawnReason.RESPAWN);
@@ -315,7 +302,6 @@ public class CitizensNPC extends AbstractNPC {
         if (reason == SpawnReason.CHUNK_LOAD || reason == SpawnReason.COMMAND) {
             at.getChunk().load();
         }
-
         getOrAddTrait(CurrentLocation.class).setLocation(at);
         entityController.create(at.clone(), this);
         getEntity().setMetadata("NPC", new FixedMetadataValue(CitizensAPI.getPlugin(), true));
@@ -324,7 +310,6 @@ public class CitizensNPC extends AbstractNPC {
         if (getEntity() instanceof SkinnableEntity && !hasTrait(SkinLayers.class)) {
             ((SkinnableEntity) getEntity()).setSkinFlags(EnumSet.allOf(SkinLayers.Layer.class));
         }
-
         Collection<Trait> onPreSpawn = traits.values();
         for (Trait trait : onPreSpawn.toArray(new Trait[onPreSpawn.size()])) {
             try {
@@ -334,7 +319,6 @@ public class CitizensNPC extends AbstractNPC {
                 ex.printStackTrace();
             }
         }
-
         boolean loaded = Messaging.isDebugging() ? false : Util.isLoaded(at);
         boolean couldSpawn = entityController.spawn(at);
 
@@ -343,30 +327,27 @@ public class CitizensNPC extends AbstractNPC {
                 Messaging.debug("Retrying spawn of", this, "later, SpawnReason." + reason + ". Was loaded", loaded,
                         "is loaded", Util.isLoaded(at));
             }
-
             // we need to wait before trying to spawn
             entityController.remove();
             Bukkit.getPluginManager().callEvent(new NPCNeedsRespawnEvent(this, at));
             return false;
         }
-
         // send skin packets, if applicable, before other NMS packets are sent
-        SkinnableEntity skinnable = getEntity() instanceof SkinnableEntity ? ((SkinnableEntity) getEntity()) : null;
+        SkinnableEntity skinnable = getEntity() instanceof SkinnableEntity ? (SkinnableEntity) getEntity() : null;
         if (skinnable != null) {
             skinnable.getSkinTracker().onSpawnNPC();
         }
-
         NMS.setLocationDirectly(getEntity(), at);
         NMS.setHeadYaw(getEntity(), at.getYaw());
         NMS.setBodyYaw(getEntity(), at.getYaw());
 
-        final Location to = at;
+        Location to = at;
         Consumer<Runnable> postSpawn = new Consumer<Runnable>() {
             private int timer;
 
             @Override
             public void accept(Runnable cancel) {
-                if (getEntity() == null || (!hasTrait(PacketNPC.class) && !getEntity().isValid())) {
+                if (getEntity() == null || !hasTrait(PacketNPC.class) && !getEntity().isValid()) {
                     if (timer++ > Setting.ENTITY_SPAWN_WAIT_DURATION.asTicks()) {
                         Messaging.debug("Couldn't spawn ", CitizensNPC.this, "waited", timer,
                                 "ticks but entity not added to world");
@@ -374,10 +355,8 @@ public class CitizensNPC extends AbstractNPC {
                         cancel.run();
                         Bukkit.getPluginManager().callEvent(new NPCNeedsRespawnEvent(CitizensNPC.this, to));
                     }
-
                     return;
                 }
-
                 // Set the spawned state
                 getOrAddTrait(CurrentLocation.class).setLocation(to);
                 getOrAddTrait(Spawned.class).setSpawned(true);
@@ -392,7 +371,6 @@ public class CitizensNPC extends AbstractNPC {
                     cancel.run();
                     return;
                 }
-
                 navigator.onSpawn();
 
                 for (Trait trait : Iterables.toArray(traits.values(), Trait.class)) {
@@ -403,7 +381,6 @@ public class CitizensNPC extends AbstractNPC {
                         ex.printStackTrace();
                     }
                 }
-
                 EntityType type = getEntity().getType();
                 NMS.replaceTracker(getEntity());
 
@@ -414,13 +391,11 @@ public class CitizensNPC extends AbstractNPC {
                     if (NMS.getStepHeight(entity) < 1) {
                         NMS.setStepHeight(entity, 1);
                     }
-
                     if (type == EntityType.PLAYER) {
                         PlayerUpdateTask.registerPlayer(getEntity());
                     } else if (data().has(NPC.Metadata.AGGRESSIVE)) {
                         NMS.setAggressive(entity, data().<Boolean> get(NPC.Metadata.AGGRESSIVE));
                     }
-
                     if (SUPPORT_NODAMAGE_TICKS && (Setting.DEFAULT_SPAWN_NODAMAGE_DURATION.asTicks() != 20
                             || data().has(NPC.Metadata.SPAWN_NODAMAGE_TICKS))) {
                         try {
@@ -431,11 +406,9 @@ public class CitizensNPC extends AbstractNPC {
                         }
                     }
                 }
-
                 if (requiresNameHologram() && !hasTrait(HologramTrait.class)) {
                     addTrait(HologramTrait.class);
                 }
-
                 updateFlyableState();
                 updateCustomNameVisibility();
                 updateScoreboard();
@@ -451,11 +424,10 @@ public class CitizensNPC extends AbstractNPC {
             new BukkitRunnable() {
                 @Override
                 public void run() {
-                    postSpawn.accept(() -> cancel());
+                    postSpawn.accept(this::cancel);
                 }
             }.runTaskTimer(CitizensAPI.getPlugin(), 0, 1);
         }
-
         return true;
     }
 
@@ -467,13 +439,11 @@ public class CitizensNPC extends AbstractNPC {
         if (hasTrait(SitTrait.class) && getOrAddTrait(SitTrait.class).isSitting()) {
             getOrAddTrait(SitTrait.class).setSitting(location);
         }
-
         Location npcLoc = getEntity().getLocation();
         if (isSpawned() && npcLoc.getWorld() == location.getWorld()) {
             if (npcLoc.distance(location) < 1) {
                 NMS.setHeadYaw(getEntity(), location.getYaw());
             }
-
             if (getEntity().getType() == EntityType.PLAYER && !getEntity().isInsideVehicle()
                     && NMS.getPassengers(getEntity()).size() == 0) {
                 NPCTeleportEvent event = new NPCTeleportEvent(this, location);
@@ -484,7 +454,6 @@ public class CitizensNPC extends AbstractNPC {
                 return;
             }
         }
-
         super.teleport(location, reason);
     }
 
@@ -502,7 +471,6 @@ public class CitizensNPC extends AbstractNPC {
                 resetCachedCoord();
                 return;
             }
-
             if (data().has(NPC.Metadata.ACTIVATION_RANGE)) {
                 int range = data().get(NPC.Metadata.ACTIVATION_RANGE);
                 if (range == -1 || CitizensAPI.getLocationLookup().getNearbyPlayers(getStoredLocation(), range)
@@ -510,7 +478,6 @@ public class CitizensNPC extends AbstractNPC {
                     NMS.activate(getEntity());
                 }
             }
-
             boolean shouldSwim = data().get(NPC.Metadata.SWIMMING, SwimmingExaminer.isWaterMob(getEntity()))
                     && MinecraftBlockExaminer.isLiquid(getEntity().getLocation().getBlock().getType());
             if (navigator.isNavigating()) {
@@ -528,7 +495,6 @@ public class CitizensNPC extends AbstractNPC {
                     NMS.trySwim(getEntity());
                 }
             }
-
             if (SUPPORT_GLOWING && data().has(NPC.Metadata.GLOWING)) {
                 try {
                     getEntity().setGlowing(data().get(NPC.Metadata.GLOWING, false));
@@ -536,7 +502,6 @@ public class CitizensNPC extends AbstractNPC {
                     SUPPORT_GLOWING = false;
                 }
             }
-
             if (SUPPORT_SILENT && data().has(NPC.Metadata.SILENT)) {
                 try {
                     getEntity().setSilent(Boolean.parseBoolean(data().get(NPC.Metadata.SILENT).toString()));
@@ -544,7 +509,6 @@ public class CitizensNPC extends AbstractNPC {
                     SUPPORT_SILENT = false;
                 }
             }
-
             boolean isLiving = getEntity() instanceof LivingEntity;
             if (isUpdating(NPCUpdate.PACKET)) {
                 if (data().get(NPC.Metadata.KEEP_CHUNK_LOADED, Setting.KEEP_CHUNKS_LOADED.asBoolean())) {
@@ -572,7 +536,6 @@ public class CitizensNPC extends AbstractNPC {
                         SUPPORT_PICKUP_ITEMS = false;
                     }
                 }
-
                 if (getEntity() instanceof Player) {
                     updateUsingItemState((Player) getEntity());
                     if (data().has(NPC.Metadata.SNEAKING) && !hasTrait(SneakTrait.class)) {
@@ -580,7 +543,6 @@ public class CitizensNPC extends AbstractNPC {
                     }
                 }
             }
-
             navigator.run();
 
             updateCounter++;
@@ -616,16 +578,12 @@ public class CitizensNPC extends AbstractNPC {
             return;
 
         EntityType type = isSpawned() ? getEntity().getType() : getOrAddTrait(MobType.class).getType();
-        if (type == null)
-            return;
-
-        if (!Util.isAlwaysFlyable(type))
+        if (type == null || !Util.isAlwaysFlyable(type))
             return;
 
         if (!data().has(NPC.Metadata.FLYABLE)) {
             data().setPersistent(NPC.Metadata.FLYABLE, true);
         }
-
         if (!hasTrait(Gravity.class)) {
             getOrAddTrait(Gravity.class).setEnabled(true);
         }
@@ -657,7 +615,7 @@ public class CitizensNPC extends AbstractNPC {
         }
     }
 
-    private static final SetMultimap<ChunkCoord, NPC> CHUNK_LOADERS = HashMultimap.create();
+    private static SetMultimap<ChunkCoord, NPC> CHUNK_LOADERS = HashMultimap.create();
     private static boolean SUPPORT_GLOWING = true;
     private static boolean SUPPORT_NODAMAGE_TICKS = true;
     private static boolean SUPPORT_PICKUP_ITEMS = true;
diff --git a/main/src/main/java/net/citizensnpcs/npc/CitizensNPCRegistry.java b/main/src/main/java/net/citizensnpcs/npc/CitizensNPCRegistry.java
index f0950d1c1..726a47d18 100644
--- a/main/src/main/java/net/citizensnpcs/npc/CitizensNPCRegistry.java
+++ b/main/src/main/java/net/citizensnpcs/npc/CitizensNPCRegistry.java
@@ -2,6 +2,7 @@ package net.citizensnpcs.npc;
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -37,7 +38,7 @@ import net.citizensnpcs.util.NMS;
 
 public class CitizensNPCRegistry implements NPCRegistry {
     private final String name;
-    private final TIntObjectHashMap<NPC> npcs = new TIntObjectHashMap<NPC>();
+    private final TIntObjectHashMap<NPC> npcs = new TIntObjectHashMap<>();
     private final NPCDataStore saves;
     private final Map<UUID, NPC> uniqueNPCs = Maps.newHashMap();
 
@@ -74,11 +75,9 @@ public class CitizensNPCRegistry implements NPCRegistry {
         if (type == EntityType.ARMOR_STAND && !npc.hasTrait(ArmorStandTrait.class)) {
             npc.addTrait(ArmorStandTrait.class);
         }
-
         if (Setting.DEFAULT_LOOK_CLOSE.asBoolean()) {
             npc.addTrait(LookClose.class);
         }
-
         npc.addTrait(MountTrait.class);
         return npc;
     }
@@ -93,9 +92,8 @@ public class CitizensNPCRegistry implements NPCRegistry {
             npc.data().set(NPC.Metadata.ITEM_ID, item.getType().name());
             npc.data().set(NPC.Metadata.ITEM_DATA, item.getData().getData());
             npc.setItemProvider(() -> item);
-        } else {
+        } else
             throw new UnsupportedOperationException("Not an item entity type");
-        }
         return npc;
     }
 
@@ -174,14 +172,13 @@ public class CitizensNPCRegistry implements NPCRegistry {
         if (npc != null)
             return npc;
         for (NPCRegistry registry : CitizensAPI.getNPCRegistries()) {
-            if (registry == this)
+            if (registry == this) {
                 continue;
-            NPC other = registry.getByUniqueId(uuid);
-            if (other != null) {
-                return other;
             }
+            NPC other = registry.getByUniqueId(uuid);
+            if (other != null)
+                return other;
         }
-
         return null;
     }
 
@@ -243,8 +240,8 @@ public class CitizensNPCRegistry implements NPCRegistry {
 
     @Override
     public Iterable<NPC> sorted() {
-        List<NPC> vals = new ArrayList<NPC>(npcs.valueCollection());
-        Collections.sort(vals, (a, b) -> Integer.compare(a.getId(), b.getId()));
+        List<NPC> vals = new ArrayList<>(npcs.valueCollection());
+        Collections.sort(vals, Comparator.comparing(NPC::getId));
         return vals;
     }
 }
diff --git a/main/src/main/java/net/citizensnpcs/npc/CitizensTraitFactory.java b/main/src/main/java/net/citizensnpcs/npc/CitizensTraitFactory.java
index 12461f341..d445e1520 100644
--- a/main/src/main/java/net/citizensnpcs/npc/CitizensTraitFactory.java
+++ b/main/src/main/java/net/citizensnpcs/npc/CitizensTraitFactory.java
@@ -157,9 +157,8 @@ public class CitizensTraitFactory implements TraitFactory {
     @Override
     public <T extends Trait> T getTrait(Class<T> clazz) {
         for (TraitInfo entry : registered.values()) {
-            if (clazz == entry.getTraitClass()) {
+            if (clazz == entry.getTraitClass())
                 return create(entry);
-            }
         }
         return null;
     }
@@ -183,9 +182,8 @@ public class CitizensTraitFactory implements TraitFactory {
     public void registerTrait(TraitInfo info) {
         Preconditions.checkNotNull(info, "info cannot be null");
         info.checkValid();
-        if (registered.containsKey(info.getTraitName())) {
+        if (registered.containsKey(info.getTraitName()))
             throw new IllegalArgumentException("Trait name " + info.getTraitName() + " already registered");
-        }
         registered.put(info.getTraitName(), info);
         if (info.isDefaultTrait()) {
             defaultTraits.add(info);
diff --git a/main/src/main/java/net/citizensnpcs/npc/EntityControllers.java b/main/src/main/java/net/citizensnpcs/npc/EntityControllers.java
index 3f4fc7818..88db2bfc3 100644
--- a/main/src/main/java/net/citizensnpcs/npc/EntityControllers.java
+++ b/main/src/main/java/net/citizensnpcs/npc/EntityControllers.java
@@ -37,6 +37,5 @@ public class EntityControllers {
         }
     }
 
-    private static final Map<EntityType, Constructor<? extends EntityController>> TYPES = Maps
-            .newEnumMap(EntityType.class);
+    private static Map<EntityType, Constructor<? extends EntityController>> TYPES = Maps.newEnumMap(EntityType.class);
 }
diff --git a/main/src/main/java/net/citizensnpcs/npc/NPCSelector.java b/main/src/main/java/net/citizensnpcs/npc/NPCSelector.java
index bc19c6114..175190f4b 100644
--- a/main/src/main/java/net/citizensnpcs/npc/NPCSelector.java
+++ b/main/src/main/java/net/citizensnpcs/npc/NPCSelector.java
@@ -57,11 +57,11 @@ public class NPCSelector implements Listener, net.citizensnpcs.api.npc.NPCSelect
         if (event.getSelected() != null)
             return event.getSelected();
 
-        if (sender instanceof Player) {
+        if (sender instanceof Player)
             return getSelectedFromMetadatable((Player) sender);
-        } else if (sender instanceof BlockCommandSender) {
+        else if (sender instanceof BlockCommandSender)
             return getSelectedFromMetadatable(((BlockCommandSender) sender).getBlock());
-        } else if (sender instanceof ConsoleCommandSender) {
+        else if (sender instanceof ConsoleCommandSender) {
             if (consoleSelectedNPC == null)
                 return null;
             return CitizensAPI.getNPCRegistry().getByUniqueIdGlobal(consoleSelectedNPC);
@@ -90,7 +90,7 @@ public class NPCSelector implements Listener, net.citizensnpcs.api.npc.NPCSelect
             if (value.equals("console")) {
                 consoleSelectedNPC = null;
             } else if (value.startsWith("@")) {
-                String[] parts = value.substring(1, value.length()).split(":");
+                String[] parts = value.substring(1).split(":");
                 World world = Bukkit.getWorld(parts[0]);
                 if (world != null) {
                     Block block = world.getBlockAt(Integer.parseInt(parts[1]), Integer.parseInt(parts[2]),
@@ -159,7 +159,6 @@ public class NPCSelector implements Listener, net.citizensnpcs.api.npc.NPCSelect
             consoleSelectedNPC = npc.getUniqueId();
             selectors.add("console");
         }
-
         Bukkit.getPluginManager().callEvent(new NPCSelectEvent(npc, sender));
     }
 
diff --git a/main/src/main/java/net/citizensnpcs/npc/Template.java b/main/src/main/java/net/citizensnpcs/npc/Template.java
index ecc696609..f351108d6 100644
--- a/main/src/main/java/net/citizensnpcs/npc/Template.java
+++ b/main/src/main/java/net/citizensnpcs/npc/Template.java
@@ -50,9 +50,10 @@ public class Template {
                     queue.add(new Node(fullKey, (Map<String, Object>) entry.getValue()));
                     continue;
                 }
-                boolean overwrite = memoryKey.keyExists(fullKey) | override;
-                if (!overwrite || fullKey.equals("uuid"))
+                boolean overwrite = memoryKey.keyExists(fullKey) || override;
+                if (!overwrite || fullKey.equals("uuid")) {
                     continue;
+                }
                 memoryKey.setRaw(fullKey, entry.getValue());
             }
         }
diff --git a/main/src/main/java/net/citizensnpcs/npc/ai/AStarNavigationStrategy.java b/main/src/main/java/net/citizensnpcs/npc/ai/AStarNavigationStrategy.java
index 630e3ae4b..fa9444789 100644
--- a/main/src/main/java/net/citizensnpcs/npc/ai/AStarNavigationStrategy.java
+++ b/main/src/main/java/net/citizensnpcs/npc/ai/AStarNavigationStrategy.java
@@ -40,15 +40,15 @@ public class AStarNavigationStrategy extends AbstractPathStrategy {
         super(TargetType.LOCATION);
         List<Vector> list = Lists.newArrayList(path);
         this.params = params;
-        this.destination = list.get(list.size() - 1).toLocation(npc.getStoredLocation().getWorld());
+        destination = list.get(list.size() - 1).toLocation(npc.getStoredLocation().getWorld());
         this.npc = npc;
-        this.plan = new Path(list);
+        plan = new Path(list);
     }
 
     public AStarNavigationStrategy(NPC npc, Location dest, NavigatorParameters params) {
         super(TargetType.LOCATION);
         this.params = params;
-        this.destination = dest;
+        destination = dest;
         this.npc = npc;
     }
 
@@ -91,9 +91,8 @@ public class AStarNavigationStrategy extends AbstractPathStrategy {
                 planner = null;
             }
         }
-        if (getCancelReason() != null || plan == null || plan.isComplete()) {
+        if (getCancelReason() != null || plan == null || plan.isComplete())
             return true;
-        }
         if (vector == null) {
             vector = plan.getCurrentVector();
         }
@@ -116,23 +115,20 @@ public class AStarNavigationStrategy extends AbstractPathStrategy {
         double xzDistance = dX * dX + dZ * dZ;
         if (Math.abs(dY) < 1 && Math.sqrt(xzDistance) <= params.distanceMargin()) {
             plan.update(npc);
-            if (plan.isComplete()) {
+            if (plan.isComplete())
                 return true;
-            }
             vector = plan.getCurrentVector();
             return false;
         }
-
         if (params.debug()) {
             npc.getEntity().getWorld().playEffect(dest, Effect.ENDER_SIGNAL, 0);
         }
-
         if (npc.getEntity() instanceof LivingEntity && !npc.getEntity().getType().name().contains("ARMOR_STAND")) {
             NMS.setDestination(npc.getEntity(), dest.getX(), dest.getY(), dest.getZ(), params.speed());
         } else {
             Vector dir = dest.toVector().subtract(npc.getEntity().getLocation().toVector()).normalize().multiply(0.2);
             boolean liquidOrInLiquid = MinecraftBlockExaminer.isLiquidOrInLiquid(loc.getBlock());
-            if ((dY >= 1 && Math.sqrt(xzDistance) <= 0.4) || (dY >= 0.2 && liquidOrInLiquid)) {
+            if (dY >= 1 && Math.sqrt(xzDistance) <= 0.4 || dY >= 0.2 && liquidOrInLiquid) {
                 dir.add(new Vector(0, 0.75, 0));
             }
             npc.getEntity().setVelocity(dir);
@@ -176,18 +172,16 @@ public class AStarNavigationStrategy extends AbstractPathStrategy {
         }
 
         public CancelReason tick(int iterationsPerTick, int maxIterations) {
-            if (this.plan != null)
+            if (plan != null)
                 return null;
             Path plan = ASTAR.run(state, iterationsPerTick);
             if (plan == null) {
-                if (state.isEmpty()) {
+                if (state.isEmpty())
                     return CancelReason.STUCK;
-                }
                 if (iterationsPerTick > 0 && maxIterations > 0) {
                     iterations += iterationsPerTick;
-                    if (iterations > maxIterations) {
+                    if (iterations > maxIterations)
                         return CancelReason.STUCK;
-                    }
                 }
             } else {
                 this.plan = plan;
@@ -200,5 +194,5 @@ public class AStarNavigationStrategy extends AbstractPathStrategy {
         }
     }
 
-    private static final AStarMachine<VectorNode, Path> ASTAR = AStarMachine.createWithDefaultStorage();
+    private static AStarMachine<VectorNode, Path> ASTAR = AStarMachine.createWithDefaultStorage();
 }
diff --git a/main/src/main/java/net/citizensnpcs/npc/ai/BoundingBoxExaminer.java b/main/src/main/java/net/citizensnpcs/npc/ai/BoundingBoxExaminer.java
index 1b488e5ec..19e0f6139 100644
--- a/main/src/main/java/net/citizensnpcs/npc/ai/BoundingBoxExaminer.java
+++ b/main/src/main/java/net/citizensnpcs/npc/ai/BoundingBoxExaminer.java
@@ -18,8 +18,8 @@ public class BoundingBoxExaminer implements BlockExaminer {
 
     public BoundingBoxExaminer(Entity entity) {
         if (entity != null) {
-            this.height = NMS.getHeight(entity);
-            this.width = NMS.getWidth(entity);
+            height = NMS.getHeight(entity);
+            width = NMS.getWidth(entity);
         }
     }
 
diff --git a/main/src/main/java/net/citizensnpcs/npc/ai/CitizensNavigator.java b/main/src/main/java/net/citizensnpcs/npc/ai/CitizensNavigator.java
index 7f08145fc..097947b23 100644
--- a/main/src/main/java/net/citizensnpcs/npc/ai/CitizensNavigator.java
+++ b/main/src/main/java/net/citizensnpcs/npc/ai/CitizensNavigator.java
@@ -73,7 +73,6 @@ public class CitizensNavigator implements Navigator, Runnable {
                 !Setting.DEFAULT_STUCK_ACTION.asString().contains("teleport"))) {
             defaultParams.stuckAction(null);
         }
-
         defaultParams.examiner(new SwimmingExaminer(npc));
     }
 
@@ -116,9 +115,8 @@ public class CitizensNavigator implements Navigator, Runnable {
 
     @Override
     public NavigatorParameters getLocalParameters() {
-        if (!isNavigating()) {
+        if (!isNavigating())
             return defaultParams;
-        }
         return localParams;
     }
 
@@ -156,23 +154,18 @@ public class CitizensNavigator implements Navigator, Runnable {
         if (root.keyExists("pathfindingrange")) {
             defaultParams.range((float) root.getDouble("pathfindingrange"));
         }
-
         if (root.keyExists("stationaryticks")) {
             defaultParams.stationaryTicks(root.getInt("stationaryticks"));
         }
-
         if (root.keyExists("distancemargin")) {
             defaultParams.distanceMargin(root.getDouble("distancemargin"));
         }
-
         if (root.keyExists("destinationteleportmargin")) {
             defaultParams.destinationTeleportMargin(root.getDouble("destinationteleportmargin"));
         }
-
         if (root.keyExists("updatepathrate")) {
             defaultParams.updatePathRate(root.getInt("updatepathrate"));
         }
-
         defaultParams.speedModifier((float) root.getDouble("speedmodifier", 1F));
         defaultParams.avoidWater(root.getBoolean("avoidwater"));
         if (!root.getBoolean("usedefaultstuckaction") && defaultParams.stuckAction() == TeleportStuckAction.INSTANCE) {
@@ -188,7 +181,6 @@ public class CitizensNavigator implements Navigator, Runnable {
         if (defaultParams.baseSpeed() == UNINITIALISED_SPEED) {
             defaultParams.baseSpeed(NMS.getSpeedFor(npc));
         }
-
         updatePathfindingRange();
     }
 
@@ -205,7 +197,6 @@ public class CitizensNavigator implements Navigator, Runnable {
             stopNavigating(CancelReason.STUCK);
             return;
         }
-
         if (updateStationaryStatus())
             return;
 
@@ -214,7 +205,6 @@ public class CitizensNavigator implements Navigator, Runnable {
         if (!finished) {
             localParams.run();
         }
-
         if (localParams.lookAtFunction() != null) {
             if (session == null) {
                 RotationTrait trait = npc.getOrAddTrait(RotationTrait.class);
@@ -223,14 +213,12 @@ public class CitizensNavigator implements Navigator, Runnable {
             }
             session.getSession().rotateToFace(localParams.lookAtFunction().apply(this));
         }
-
         if (localParams.destinationTeleportMargin() > 0
                 && npcLoc.distance(targetLoc) <= localParams.destinationTeleportMargin()) {
             // TODO: easing?
             npc.teleport(targetLoc, TeleportCause.PLUGIN);
             finished = true;
         }
-
         if (!finished)
             return;
 
@@ -252,37 +240,31 @@ public class CitizensNavigator implements Navigator, Runnable {
         } else {
             root.removeKey("pathfindingrange");
         }
-
         if (defaultParams.stationaryTicks() != Setting.DEFAULT_STATIONARY_DURATION.asTicks()) {
             root.setInt("stationaryticks", defaultParams.stationaryTicks());
         } else {
             root.removeKey("stationaryticks");
         }
-
         if (defaultParams.destinationTeleportMargin() != Setting.DEFAULT_DESTINATION_TELEPORT_MARGIN.asDouble()) {
             root.setDouble("destinationteleportmargin", defaultParams.destinationTeleportMargin());
         } else {
             root.removeKey("destinationteleportmargin");
         }
-
         if (defaultParams.distanceMargin() != Setting.DEFAULT_DISTANCE_MARGIN.asDouble()) {
             root.setDouble("distancemargin", defaultParams.distanceMargin());
         } else {
             root.removeKey("distancemargin");
         }
-
         if (defaultParams.updatePathRate() != Setting.DEFAULT_PATHFINDER_UPDATE_PATH_RATE.asTicks()) {
             root.setInt("updatepathrate", defaultParams.updatePathRate());
         } else {
             root.removeKey("updatepathrate");
         }
-
         if (defaultParams.useNewPathfinder() != Setting.USE_NEW_PATHFINDER.asBoolean()) {
             root.setBoolean("usenewpathfinder", defaultParams.useNewPathfinder());
         } else {
             root.removeKey("usenewpathfinder");
         }
-
         root.setDouble("speedmodifier", defaultParams.speedModifier());
         root.setBoolean("avoidwater", defaultParams.avoidWater());
         root.setBoolean("usedefaultstuckaction", defaultParams.stuckAction() == TeleportStuckAction.INSTANCE);
@@ -305,7 +287,6 @@ public class CitizensNavigator implements Navigator, Runnable {
             cancelNavigation();
             return;
         }
-
         setTarget(params -> {
             params.straightLineTargetingDistance(100000);
             return new MCTargetStrategy(npc, target, aggressive, params);
@@ -321,7 +302,6 @@ public class CitizensNavigator implements Navigator, Runnable {
             cancelNavigation();
             return;
         }
-
         setTarget(params -> new StraightLineNavigationStrategy(npc, target.clone(), params));
     }
 
@@ -334,7 +314,6 @@ public class CitizensNavigator implements Navigator, Runnable {
             cancelNavigation();
             return;
         }
-
         setTarget(params -> new MCTargetStrategy(npc, target, aggressive, params));
     }
 
@@ -354,15 +333,13 @@ public class CitizensNavigator implements Navigator, Runnable {
             cancelNavigation();
             return;
         }
-
         setTarget(params -> {
-            if (npc.isFlyable()) {
+            if (npc.isFlyable())
                 return new FlyingAStarNavigationStrategy(npc, path, params);
-            } else if (params.useNewPathfinder() || !(npc.getEntity() instanceof LivingEntity)) {
+            else if (params.useNewPathfinder() || !(npc.getEntity() instanceof LivingEntity))
                 return new AStarNavigationStrategy(npc, path, params);
-            } else {
+            else
                 return new MCNavigationStrategy(npc, path, params);
-            }
         });
     }
 
@@ -374,16 +351,14 @@ public class CitizensNavigator implements Navigator, Runnable {
             cancelNavigation();
             return;
         }
-
-        final Location target = targetIn.clone();
+        Location target = targetIn.clone();
         setTarget(params -> {
-            if (npc.isFlyable()) {
+            if (npc.isFlyable())
                 return new FlyingAStarNavigationStrategy(npc, target, params);
-            } else if (params.useNewPathfinder() || !(npc.getEntity() instanceof LivingEntity)) {
+            else if (params.useNewPathfinder() || !(npc.getEntity() instanceof LivingEntity))
                 return new AStarNavigationStrategy(npc, target, params);
-            } else {
+            else
                 return new MCNavigationStrategy(npc, target, params);
-            }
         });
     }
 
@@ -391,7 +366,6 @@ public class CitizensNavigator implements Navigator, Runnable {
         if (executing != null) {
             executing.stop();
         }
-
         executing = null;
 
         localParams = defaultParams;
@@ -402,16 +376,11 @@ public class CitizensNavigator implements Navigator, Runnable {
             npc.getEntity().setVelocity(velocity);
             NMS.cancelMoveDestination(npc.getEntity());
         }
-
         if (!SUPPORT_CHUNK_TICKETS || !CitizensAPI.hasImplementation() || !CitizensAPI.getPlugin().isEnabled())
             return;
 
-        Bukkit.getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(), new Runnable() {
-            @Override
-            public void run() {
-                updateTicket(isNavigating() ? executing.getTargetAsLocation() : null);
-            }
-        }, 10);
+        Bukkit.getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(),
+                () -> updateTicket(isNavigating() ? executing.getTargetAsLocation() : null), 10);
 
         // Location loc = npc.getEntity().getLocation(STATIONARY_LOCATION);
         // NMS.look(npc.getEntity(), loc.getYaw(), 0);
@@ -424,28 +393,23 @@ public class CitizensNavigator implements Navigator, Runnable {
         if (reason == CancelReason.STUCK && Messaging.isDebugging()) {
             Messaging.debug(npc, "navigation ended, stuck", executing);
         }
-
         if (session != null) {
             session.end();
             session = null;
         }
-
         Iterator<NavigatorCallback> itr = localParams.callbacks().iterator();
-        List<NavigatorCallback> callbacks = new ArrayList<NavigatorCallback>();
+        List<NavigatorCallback> callbacks = new ArrayList<>();
         while (itr.hasNext()) {
             callbacks.add(itr.next());
             itr.remove();
         }
-
         for (NavigatorCallback callback : callbacks) {
             callback.onCompletion(reason);
         }
-
         if (reason == null) {
             stopNavigating();
             return;
         }
-
         if (reason == CancelReason.STUCK) {
             StuckAction action = localParams.stuckAction();
             NavigationStuckEvent event = new NavigationStuckEvent(this, action);
@@ -458,7 +422,6 @@ public class CitizensNavigator implements Navigator, Runnable {
                 return;
             }
         }
-
         NavigationCancelEvent event = new NavigationCancelEvent(this, reason);
         PathStrategy old = executing;
         Bukkit.getPluginManager().callEvent(event);
@@ -534,7 +497,6 @@ public class CitizensNavigator implements Navigator, Runnable {
             stopNavigating(CancelReason.STUCK);
             return true;
         }
-
         if (lastX == current.getBlockX() && lastY == current.getBlockY() && lastZ == current.getBlockZ()) {
             if (++stationaryTicks >= localParams.stationaryTicks()) {
                 stopNavigating(CancelReason.STUCK);
@@ -543,7 +505,6 @@ public class CitizensNavigator implements Navigator, Runnable {
         } else {
             stationaryTicks = 0;
         }
-
         lastX = current.getBlockX();
         lastY = current.getBlockY();
         lastZ = current.getBlockZ();
@@ -554,32 +515,29 @@ public class CitizensNavigator implements Navigator, Runnable {
         if (!SUPPORT_CHUNK_TICKETS || !CitizensAPI.hasImplementation() || !CitizensAPI.getPlugin().isEnabled())
             return;
 
-        if (target != null && this.activeTicket != null
-                && new ChunkCoord(target.getChunk()).equals(new ChunkCoord(this.activeTicket.getChunk()))) {
-            this.activeTicket = target.clone();
+        if (target != null && activeTicket != null
+                && new ChunkCoord(target.getChunk()).equals(new ChunkCoord(activeTicket.getChunk()))) {
+            activeTicket = target.clone();
             return;
         }
-
-        if (this.activeTicket != null) {
+        if (activeTicket != null) {
             try {
-                this.activeTicket.getChunk().removePluginChunkTicket(CitizensAPI.getPlugin());
+                activeTicket.getChunk().removePluginChunkTicket(CitizensAPI.getPlugin());
             } catch (NoSuchMethodError e) {
                 SUPPORT_CHUNK_TICKETS = false;
-                this.activeTicket = null;
+                activeTicket = null;
             }
         }
-
         if (target == null) {
-            this.activeTicket = null;
+            activeTicket = null;
             return;
         }
-
-        this.activeTicket = target.clone();
+        activeTicket = target.clone();
         try {
-            this.activeTicket.getChunk().addPluginChunkTicket(CitizensAPI.getPlugin());
+            activeTicket.getChunk().addPluginChunkTicket(CitizensAPI.getPlugin());
         } catch (NoSuchMethodError e) {
             SUPPORT_CHUNK_TICKETS = false;
-            this.activeTicket = null;
+            activeTicket = null;
         }
     }
 
diff --git a/main/src/main/java/net/citizensnpcs/npc/ai/FlyingAStarNavigationStrategy.java b/main/src/main/java/net/citizensnpcs/npc/ai/FlyingAStarNavigationStrategy.java
index 4deecab50..cb5adb22d 100644
--- a/main/src/main/java/net/citizensnpcs/npc/ai/FlyingAStarNavigationStrategy.java
+++ b/main/src/main/java/net/citizensnpcs/npc/ai/FlyingAStarNavigationStrategy.java
@@ -43,16 +43,16 @@ public class FlyingAStarNavigationStrategy extends AbstractPathStrategy {
     public FlyingAStarNavigationStrategy(NPC npc, Iterable<Vector> path, NavigatorParameters params) {
         super(TargetType.LOCATION);
         List<Vector> list = Lists.newArrayList(path);
-        this.target = list.get(list.size() - 1).toLocation(npc.getStoredLocation().getWorld());
-        this.parameters = params;
+        target = list.get(list.size() - 1).toLocation(npc.getStoredLocation().getWorld());
+        parameters = params;
         this.npc = npc;
         setPlan(new Path(list));
     }
 
-    public FlyingAStarNavigationStrategy(final NPC npc, Location dest, NavigatorParameters params) {
+    public FlyingAStarNavigationStrategy(NPC npc, Location dest, NavigatorParameters params) {
         super(TargetType.LOCATION);
-        this.target = dest;
-        this.parameters = params;
+        target = dest;
+        parameters = params;
         this.npc = npc;
     }
 
@@ -89,7 +89,7 @@ public class FlyingAStarNavigationStrategy extends AbstractPathStrategy {
     }
 
     public void setPlan(Path path) {
-        this.plan = path;
+        plan = path;
         if (plan == null || plan.isComplete()) {
             setCancelReason(CancelReason.STUCK);
         } else {
@@ -133,15 +133,13 @@ public class FlyingAStarNavigationStrategy extends AbstractPathStrategy {
                 setPlan(plan);
             }
         }
-        if (getCancelReason() != null || plan == null || plan.isComplete()) {
+        if (getCancelReason() != null || plan == null || plan.isComplete())
             return true;
-        }
         Location current = npc.getEntity().getLocation();
         if (current.toVector().distance(vector) <= parameters.distanceMargin()) {
             plan.update(npc);
-            if (plan.isComplete()) {
+            if (plan.isComplete())
                 return true;
-            }
             vector = plan.getCurrentVector();
         }
         if (parameters.debug()) {
@@ -159,7 +157,6 @@ public class FlyingAStarNavigationStrategy extends AbstractPathStrategy {
                 // 1.8 compatibility
             }
         }
-
         Vector centeredDest = new Vector(vector.getX() + 0.5D, vector.getY() + 0.1D, vector.getZ() + 0.5D);
         double d0 = centeredDest.getX() - current.getX();
         double d1 = centeredDest.getY() - current.getY();
@@ -178,10 +175,9 @@ public class FlyingAStarNavigationStrategy extends AbstractPathStrategy {
             NMS.setVerticalMovement(npc.getEntity(), 0.5);
             Util.faceLocation(npc.getEntity(), centeredDest.toLocation(npc.getEntity().getWorld()));
         }
-
         plan.run(npc);
         return false;
     }
 
-    private static final AStarMachine<VectorNode, Path> ASTAR = AStarMachine.createWithDefaultStorage();
+    private static AStarMachine<VectorNode, Path> ASTAR = AStarMachine.createWithDefaultStorage();
 }
diff --git a/main/src/main/java/net/citizensnpcs/npc/ai/MCNavigationStrategy.java b/main/src/main/java/net/citizensnpcs/npc/ai/MCNavigationStrategy.java
index d1f32cb25..886a61f17 100644
--- a/main/src/main/java/net/citizensnpcs/npc/ai/MCNavigationStrategy.java
+++ b/main/src/main/java/net/citizensnpcs/npc/ai/MCNavigationStrategy.java
@@ -23,24 +23,24 @@ public class MCNavigationStrategy extends AbstractPathStrategy {
     private final NavigatorParameters parameters;
     private final Location target;
 
-    MCNavigationStrategy(final NPC npc, Iterable<Vector> path, NavigatorParameters params) {
+    MCNavigationStrategy(NPC npc, Iterable<Vector> path, NavigatorParameters params) {
         super(TargetType.LOCATION);
         List<Vector> list = Lists.newArrayList(path);
-        this.target = list.get(list.size() - 1).toLocation(npc.getStoredLocation().getWorld());
-        this.parameters = params;
+        target = list.get(list.size() - 1).toLocation(npc.getStoredLocation().getWorld());
+        parameters = params;
         entity = npc.getEntity();
-        this.navigator = NMS.getTargetNavigator(npc.getEntity(), list, params);
+        navigator = NMS.getTargetNavigator(npc.getEntity(), list, params);
     }
 
-    MCNavigationStrategy(final NPC npc, Location dest, NavigatorParameters params) {
+    MCNavigationStrategy(NPC npc, Location dest, NavigatorParameters params) {
         super(TargetType.LOCATION);
         if (!MinecraftBlockExaminer.canStandIn(dest.getBlock())) {
             dest = MinecraftBlockExaminer.findValidLocationAbove(dest, 2);
         }
-        this.target = Util.getCenterLocation(dest.getBlock());
-        this.parameters = params;
+        target = Util.getCenterLocation(dest.getBlock());
+        parameters = params;
         entity = npc.getEntity();
-        this.navigator = NMS.getTargetNavigator(entity, target, params);
+        navigator = NMS.getTargetNavigator(entity, target, params);
     }
 
     @Override
diff --git a/main/src/main/java/net/citizensnpcs/npc/ai/MCTargetStrategy.java b/main/src/main/java/net/citizensnpcs/npc/ai/MCTargetStrategy.java
index b3fff6fc4..a66588e98 100644
--- a/main/src/main/java/net/citizensnpcs/npc/ai/MCTargetStrategy.java
+++ b/main/src/main/java/net/citizensnpcs/npc/ai/MCTargetStrategy.java
@@ -31,17 +31,17 @@ public class MCTargetStrategy implements PathStrategy, EntityTarget {
 
     public MCTargetStrategy(NPC npc, org.bukkit.entity.Entity target, boolean aggro, NavigatorParameters params) {
         this.npc = npc;
-        this.parameters = params;
-        this.handle = npc.getEntity();
+        parameters = params;
+        handle = npc.getEntity();
         this.target = target;
         TargetNavigator nms = NMS.getTargetNavigator(npc.getEntity(), target, params);
-        this.targetNavigator = nms != null && !params.useNewPathfinder() ? nms : new AStarTargeter();
+        targetNavigator = nms != null && !params.useNewPathfinder() ? nms : new AStarTargeter();
         this.aggro = aggro;
     }
 
     private boolean canAttack() {
         BoundingBox handleBB = NMS.getBoundingBox(handle), targetBB = NMS.getBoundingBox(target);
-        return attackTicks <= 0 && (handleBB.maxY > targetBB.minY && handleBB.minY < targetBB.maxY)
+        return attackTicks <= 0 && handleBB.maxY > targetBB.minY && handleBB.minY < targetBB.maxY
                 && distance() <= parameters.attackRange() && ((LivingEntity) handle).hasLineOfSight(target);
     }
 
@@ -105,19 +105,16 @@ public class MCTargetStrategy implements PathStrategy, EntityTarget {
             cancelReason = CancelReason.TARGET_DIED;
             return true;
         }
-
         if (target.getWorld() != handle.getWorld()) {
             cancelReason = CancelReason.TARGET_MOVED_WORLD;
             return true;
         }
-
         if (cancelReason != null)
             return true;
 
         if (parameters.straightLineTargetingDistance() > 0 && !(targetNavigator instanceof StraightLineTargeter)) {
             targetNavigator = new StraightLineTargeter(targetNavigator);
         }
-
         if (!aggro && distance() <= parameters.distanceMargin()) {
             stop();
             return false;
@@ -125,7 +122,6 @@ public class MCTargetStrategy implements PathStrategy, EntityTarget {
             targetNavigator.setPath();
             updateCounter = 0;
         }
-
         targetNavigator.update();
 
         NMS.look(handle, target);
@@ -137,11 +133,9 @@ public class MCTargetStrategy implements PathStrategy, EntityTarget {
             }
             attackTicks = parameters.attackDelayTicks();
         }
-
         if (attackTicks > 0) {
             attackTicks--;
         }
-
         return false;
     }
 
@@ -179,9 +173,8 @@ public class MCTargetStrategy implements PathStrategy, EntityTarget {
 
         private void setStrategy() {
             Location location = parameters.entityTargetLocationMapper().apply(target);
-            if (location == null) {
+            if (location == null)
                 throw new IllegalStateException("mapper should not return null");
-            }
             if (!npc.isFlyable()) {
                 Block block = location.getBlock();
                 while (!MinecraftBlockExaminer.canStandOn(block.getRelative(BlockFace.DOWN))) {
@@ -239,7 +232,6 @@ public class MCTargetStrategy implements PathStrategy, EntityTarget {
                 active = new StraightLineNavigationStrategy(npc, target, parameters);
                 return;
             }
-
             active = null;
             fallback.setPath();
         }
diff --git a/main/src/main/java/net/citizensnpcs/npc/ai/StraightLineNavigationStrategy.java b/main/src/main/java/net/citizensnpcs/npc/ai/StraightLineNavigationStrategy.java
index d6cd45a98..18bb33a7f 100644
--- a/main/src/main/java/net/citizensnpcs/npc/ai/StraightLineNavigationStrategy.java
+++ b/main/src/main/java/net/citizensnpcs/npc/ai/StraightLineNavigationStrategy.java
@@ -27,13 +27,13 @@ public class StraightLineNavigationStrategy extends AbstractPathStrategy {
         this.params = params;
         this.target = target;
         this.npc = npc;
-        this.destination = params.entityTargetLocationMapper().apply(target);
+        destination = params.entityTargetLocationMapper().apply(target);
     }
 
     public StraightLineNavigationStrategy(NPC npc, Location dest, NavigatorParameters params) {
         super(TargetType.LOCATION);
         this.params = params;
-        this.destination = dest;
+        destination = dest;
         this.npc = npc;
     }
 
@@ -68,7 +68,6 @@ public class StraightLineNavigationStrategy extends AbstractPathStrategy {
         if (target != null) {
             destination = params.entityTargetLocationMapper().apply(target);
         }
-
         Vector destVector = currLoc.toVector().add(destination.toVector().subtract(currLoc.toVector()).normalize());
         Location destLoc = destVector.toLocation(destination.getWorld());
         if (!npc.isFlyable() && destVector.getBlockY() > currLoc.getBlockY()) {
@@ -84,7 +83,6 @@ public class StraightLineNavigationStrategy extends AbstractPathStrategy {
             destLoc = block.getLocation();
             destVector = destLoc.toVector();
         }
-
         double dX = destVector.getX() - currLoc.getX();
         double dZ = destVector.getZ() - currLoc.getZ();
         double dY = destVector.getY() - currLoc.getY();
@@ -105,11 +103,9 @@ public class StraightLineNavigationStrategy extends AbstractPathStrategy {
             while (normalisedTargetYaw >= 180.0F) {
                 normalisedTargetYaw -= 360.0F;
             }
-
             while (normalisedTargetYaw < -180.0F) {
                 normalisedTargetYaw += 360.0F;
             }
-
             if (npc.getEntity().getType() != EntityType.ENDER_DRAGON) {
                 NMS.setVerticalMovement(npc.getEntity(), 0.5);
                 NMS.setHeadYaw(npc.getEntity(), currLoc.getYaw() + normalisedTargetYaw);
@@ -121,7 +117,7 @@ public class StraightLineNavigationStrategy extends AbstractPathStrategy {
             Vector dir = destVector.subtract(currLoc.toVector()).normalize().multiply(0.2);
             Block in = currLoc.getBlock();
             if (distance > 0 && dY >= 1 && xzDistance <= 2.75
-                    || (dY >= 0.2 && MinecraftBlockExaminer.isLiquidOrInLiquid(in))) {
+                    || dY >= 0.2 && MinecraftBlockExaminer.isLiquidOrInLiquid(in)) {
                 dir.add(new Vector(0, 0.75, 0));
             }
             Util.faceLocation(npc.getEntity(), destLoc);
diff --git a/main/src/main/java/net/citizensnpcs/npc/profile/ProfileFetchResult.java b/main/src/main/java/net/citizensnpcs/npc/profile/ProfileFetchResult.java
index be70c648d..1e563c44d 100644
--- a/main/src/main/java/net/citizensnpcs/npc/profile/ProfileFetchResult.java
+++ b/main/src/main/java/net/citizensnpcs/npc/profile/ProfileFetchResult.java
@@ -4,14 +4,6 @@ package net.citizensnpcs.npc.profile;
  * The result status of a profile fetch.
  */
 public enum ProfileFetchResult {
-    /**
-     * The profile has not been fetched yet.
-     */
-    PENDING,
-    /**
-     * The profile was successfully fetched.
-     */
-    SUCCESS,
     /**
      * The profile request failed for unknown reasons.
      */
@@ -20,6 +12,14 @@ public enum ProfileFetchResult {
      * The profile request failed because the profile was not found.
      */
     NOT_FOUND,
+    /**
+     * The profile has not been fetched yet.
+     */
+    PENDING,
+    /**
+     * The profile was successfully fetched.
+     */
+    SUCCESS,
     /**
      * The profile request failed because too many requests were sent.
      */
diff --git a/main/src/main/java/net/citizensnpcs/npc/profile/ProfileFetchThread.java b/main/src/main/java/net/citizensnpcs/npc/profile/ProfileFetchThread.java
index a75d3f23d..7808be69a 100644
--- a/main/src/main/java/net/citizensnpcs/npc/profile/ProfileFetchThread.java
+++ b/main/src/main/java/net/citizensnpcs/npc/profile/ProfileFetchThread.java
@@ -31,8 +31,8 @@ import net.citizensnpcs.util.NMS;
  * @see ProfileFetcher
  */
 class ProfileFetchThread implements Runnable {
-    private final Deque<ProfileRequest> queue = new ArrayDeque<ProfileRequest>();
-    private final Map<String, ProfileRequest> requested = new HashMap<String, ProfileRequest>(40);
+    private final Deque<ProfileRequest> queue = new ArrayDeque<>();
+    private final Map<String, ProfileRequest> requested = new HashMap<>(40);
     private final Object sync = new Object(); // sync for queue & requested fields
 
     ProfileFetchThread() {
@@ -65,7 +65,6 @@ class ProfileFetchThread implements Runnable {
                 queue.add(request);
             }
         }
-
         if (handler != null) {
             if (request.getResult() == ProfileFetchResult.PENDING
                     || request.getResult() == ProfileFetchResult.TOO_MANY_REQUESTS) {
@@ -100,7 +99,6 @@ class ProfileFetchThread implements Runnable {
                 return;
             }
         }
-
         if (handler != null) {
             if (request.getResult() == ProfileFetchResult.PENDING
                     || request.getResult() == ProfileFetchResult.TOO_MANY_REQUESTS) {
@@ -117,7 +115,7 @@ class ProfileFetchThread implements Runnable {
      * @param requests
      *            The profile requests.
      */
-    private void fetchRequests(final Collection<ProfileRequest> requests) {
+    private void fetchRequests(Collection<ProfileRequest> requests) {
         Preconditions.checkNotNull(requests);
 
         String[] playerNames = new String[requests.size()];
@@ -126,7 +124,6 @@ class ProfileFetchThread implements Runnable {
         for (ProfileRequest request : requests) {
             playerNames[i++] = request.getPlayerName();
         }
-
         NMS.findProfilesByNames(playerNames, new ProfileLookupCallback() {
             @SuppressWarnings("unused")
             public void onProfileLookupFailed(GameProfile profile, Exception e) {
@@ -139,7 +136,6 @@ class ProfileFetchThread implements Runnable {
                     Messaging.debug("Profile lookup for player '" + profileName + "' failed: " + getExceptionMsg(e));
                     Messaging.debug(Throwables.getStackTraceAsString(e));
                 }
-
                 ProfileRequest request = findRequest(profileName, requests);
                 if (request == null)
                     return;
@@ -154,7 +150,7 @@ class ProfileFetchThread implements Runnable {
             }
 
             @Override
-            public void onProfileLookupSucceeded(final GameProfile profile) {
+            public void onProfileLookupSucceeded(GameProfile profile) {
                 Messaging.idebug(() -> "Fetched profile " + profile.getId() + " for player " + profile.getName());
 
                 ProfileRequest request = findRequest(profile.getName(), requests);
@@ -169,7 +165,6 @@ class ProfileFetchThread implements Runnable {
                                 + getExceptionMsg(e) + " " + isTooManyRequests(e));
                         Messaging.debug(Throwables.getStackTraceAsString(e));
                     }
-
                     if (isTooManyRequests(e)) {
                         request.setResult(null, ProfileFetchResult.TOO_MANY_REQUESTS);
                     } else {
@@ -188,10 +183,9 @@ class ProfileFetchThread implements Runnable {
             if (queue.isEmpty())
                 return;
 
-            requests = new ArrayList<ProfileRequest>(queue);
+            requests = new ArrayList<>(queue);
             queue.clear();
         }
-
         try {
             fetchRequests(requests);
         } catch (Exception ex) {
@@ -202,7 +196,7 @@ class ProfileFetchThread implements Runnable {
         }
     }
 
-    private static void addHandler(final ProfileRequest request, final ProfileFetchHandler handler) {
+    private static void addHandler(ProfileRequest request, ProfileFetchHandler handler) {
         Bukkit.getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(), () -> request.addHandler(handler), 1);
     }
 
@@ -211,9 +205,8 @@ class ProfileFetchThread implements Runnable {
         name = name.toLowerCase();
 
         for (ProfileRequest request : requests) {
-            if (request.getPlayerName().equals(name)) {
+            if (request.getPlayerName().equals(name))
                 return request;
-            }
         }
         return null;
     }
@@ -226,19 +219,18 @@ class ProfileFetchThread implements Runnable {
         String message = e.getMessage();
         String cause = e.getCause() != null ? e.getCause().getMessage() : null;
 
-        return (message != null && message.contains("did not find"))
-                || (cause != null && cause.contains("did not find"));
+        return message != null && message.contains("did not find") || cause != null && cause.contains("did not find");
     }
 
     private static boolean isTooManyRequests(Throwable e) {
         String message = e.getMessage();
         String cause = e.getCause() != null ? e.getCause().getMessage() : null;
 
-        return (message != null && message.contains("too many requests"))
-                || (cause != null && cause.contains("too many requests"));
+        return message != null && message.contains("too many requests")
+                || cause != null && cause.contains("too many requests");
     }
 
-    private static void sendResult(final ProfileFetchHandler handler, final ProfileRequest request) {
+    private static void sendResult(ProfileFetchHandler handler, ProfileRequest request) {
         Bukkit.getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(), () -> handler.onResult(request), 1);
     }
 }
diff --git a/main/src/main/java/net/citizensnpcs/npc/profile/ProfileFetcher.java b/main/src/main/java/net/citizensnpcs/npc/profile/ProfileFetcher.java
index 844553e6f..caa3cd325 100644
--- a/main/src/main/java/net/citizensnpcs/npc/profile/ProfileFetcher.java
+++ b/main/src/main/java/net/citizensnpcs/npc/profile/ProfileFetcher.java
@@ -48,7 +48,6 @@ public class ProfileFetcher {
         if (THREAD_TASK != null) {
             THREAD_TASK.cancel();
         }
-
         PROFILE_THREAD = new ProfileFetchThread();
         THREAD_TASK = Bukkit.getScheduler().runTaskTimerAsynchronously(CitizensAPI.getPlugin(), PROFILE_THREAD, 21, 20);
     }
diff --git a/main/src/main/java/net/citizensnpcs/npc/profile/ProfileRequest.java b/main/src/main/java/net/citizensnpcs/npc/profile/ProfileRequest.java
index 4fe5167f2..184a98b52 100644
--- a/main/src/main/java/net/citizensnpcs/npc/profile/ProfileRequest.java
+++ b/main/src/main/java/net/citizensnpcs/npc/profile/ProfileRequest.java
@@ -61,10 +61,9 @@ public class ProfileRequest {
             handler.onResult(this);
             return;
         }
-
-        if (handlers == null)
-            handlers = new ArrayDeque<ProfileFetchHandler>();
-
+        if (handlers == null) {
+            handlers = new ArrayDeque<>();
+        }
         handlers.addLast(handler);
     }
 
@@ -105,24 +104,20 @@ public class ProfileRequest {
      * @param result
      *            The result of the request.
      */
-    void setResult(final @Nullable GameProfile profile, final ProfileFetchResult result) {
+    void setResult(@Nullable GameProfile profile, ProfileFetchResult result) {
         if (!CitizensAPI.hasImplementation())
             return;
-        Bukkit.getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(), new Runnable() {
-            @Override
-            public void run() {
-                ProfileRequest.this.profile = profile;
-                ProfileRequest.this.result = result;
+        Bukkit.getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(), () -> {
+            ProfileRequest.this.profile = profile;
+            ProfileRequest.this.result = result;
 
-                if (handlers == null)
-                    return;
+            if (handlers == null)
+                return;
 
-                while (!handlers.isEmpty()) {
-                    handlers.removeFirst().onResult(ProfileRequest.this);
-                }
-
-                handlers = null;
+            while (!handlers.isEmpty()) {
+                handlers.removeFirst().onResult(ProfileRequest.this);
             }
+            handlers = null;
         });
     }
 }
diff --git a/main/src/main/java/net/citizensnpcs/npc/skin/Skin.java b/main/src/main/java/net/citizensnpcs/npc/skin/Skin.java
index c8cfe1eb4..5129560d2 100644
--- a/main/src/main/java/net/citizensnpcs/npc/skin/Skin.java
+++ b/main/src/main/java/net/citizensnpcs/npc/skin/Skin.java
@@ -22,9 +22,7 @@ import net.citizensnpcs.api.event.DespawnReason;
 import net.citizensnpcs.api.event.SpawnReason;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.api.util.Messaging;
-import net.citizensnpcs.npc.profile.ProfileFetchHandler;
 import net.citizensnpcs.npc.profile.ProfileFetcher;
-import net.citizensnpcs.npc.profile.ProfileRequest;
 import net.citizensnpcs.trait.SkinTrait;
 import net.citizensnpcs.util.SkinProperty;
 
@@ -36,7 +34,7 @@ public class Skin {
     private int fetchRetries = -1;
     private boolean hasFetched;
     private volatile boolean isValid = true;
-    private final Map<SkinnableEntity, Void> pending = new WeakHashMap<SkinnableEntity, Void>(15);
+    private final Map<SkinnableEntity, Void> pending = new WeakHashMap<>(15);
     private BukkitTask retryTask;
     private volatile SkinProperty skinData;
     private volatile UUID skinId;
@@ -58,7 +56,6 @@ public class Skin {
 
             CACHE.put(this.skinName, this);
         }
-
         // fetch();
     }
 
@@ -84,29 +81,27 @@ public class Skin {
         // If npc requires latest skin, cache is used for faster availability until the latest skin can be loaded.
         String cachedName = npc.data().get(CACHED_SKIN_UUID_NAME_METADATA);
         String texture = skinTrait.getTexture();
-        if (this.skinName.equals(cachedName) && texture != null && !texture.equals("cache")) {
+        if (skinName.equals(cachedName) && texture != null && !texture.equals("cache")) {
             setNPCTexture(entity, new SkinProperty("textures", texture, skinTrait.getSignature()));
 
             // check if NPC prefers to use cached skin over the latest skin.
             if (entity.getNPC().data().has("player-skin-use-latest")) {
                 entity.getNPC().data().remove("player-skin-use-latest");
             }
-            if (!skinTrait.shouldUpdateSkins()) {
+            if (!skinTrait.shouldUpdateSkins())
                 // cache preferred
                 return true;
-            }
         }
-
         if (!hasSkinData()) {
             String defaultSkinName = ChatColor.stripColor(npc.getName()).toLowerCase();
 
-            if (npc.hasTrait(SkinTrait.class) && this.skinName.equals(defaultSkinName)
+            if (npc.hasTrait(SkinTrait.class) && skinName.equals(defaultSkinName)
                     && !npc.getOrAddTrait(SkinTrait.class).fetchDefaultSkin())
                 return false;
 
-            if (hasFetched) {
+            if (hasFetched)
                 return true;
-            } else {
+            else {
                 if (!fetching) {
                     fetch();
                 }
@@ -114,7 +109,6 @@ public class Skin {
                 return false;
             }
         }
-
         setNPCSkinData(entity, skinName, skinId, skinData);
 
         return true;
@@ -144,64 +138,54 @@ public class Skin {
     }
 
     private void fetch() {
-        final int maxRetries = Setting.MAX_NPC_SKIN_RETRIES.asInt();
+        int maxRetries = Setting.MAX_NPC_SKIN_RETRIES.asInt();
         if (maxRetries > -1 && fetchRetries >= maxRetries) {
             if (Messaging.isDebugging()) {
                 Messaging.debug("Reached max skin fetch retries for '" + skinName + "'");
             }
             return;
         }
-
         if (skinName.length() < 3 || skinName.length() > 16) {
             if (Messaging.isDebugging()) {
                 Messaging.debug("Skin name invalid length '" + skinName + "'");
             }
             return;
         }
-
-        if (skinName.toLowerCase().startsWith("cit-")) {
+        if (skinName.toLowerCase().startsWith("cit-"))
             return;
-        }
 
         fetching = true;
 
-        ProfileFetcher.fetch(this.skinName, new ProfileFetchHandler() {
-            @Override
-            public void onResult(ProfileRequest request) {
-                hasFetched = true;
+        ProfileFetcher.fetch(skinName, request -> {
+            hasFetched = true;
 
-                switch (request.getResult()) {
-                    case NOT_FOUND:
-                        isValid = false;
+            switch (request.getResult()) {
+                case NOT_FOUND:
+                    isValid = false;
+                    break;
+                case TOO_MANY_REQUESTS:
+                    if (maxRetries == 0) {
                         break;
-                    case TOO_MANY_REQUESTS:
-                        if (maxRetries == 0) {
-                            break;
-                        }
-                        fetchRetries++;
-                        long delay = Setting.NPC_SKIN_RETRY_DELAY.asTicks();
-                        retryTask = Bukkit.getScheduler().runTaskLater(CitizensAPI.getPlugin(), new Runnable() {
-                            @Override
-                            public void run() {
-                                fetch();
-                            }
-                        }, delay);
+                    }
+                    fetchRetries++;
+                    long delay = Setting.NPC_SKIN_RETRY_DELAY.asTicks();
+                    retryTask = Bukkit.getScheduler().runTaskLater(CitizensAPI.getPlugin(), (Runnable) this::fetch,
+                            delay);
 
-                        Messaging.idebug(() -> "Retrying skin fetch for '" + skinName + "' in " + delay + " ticks.");
-                        break;
-                    case SUCCESS:
-                        GameProfile profile = request.getProfile();
-                        setData(profile);
-                        break;
-                    default:
-                        break;
-                }
+                    Messaging.idebug(() -> "Retrying skin fetch for '" + skinName + "' in " + delay + " ticks.");
+                    break;
+                case SUCCESS:
+                    GameProfile profile = request.getProfile();
+                    setData(profile);
+                    break;
+                default:
+                    break;
             }
         });
     }
 
     private void fetchForced() {
-        final int maxRetries = Setting.MAX_NPC_SKIN_RETRIES.asInt();
+        int maxRetries = Setting.MAX_NPC_SKIN_RETRIES.asInt();
         if (maxRetries > -1 && fetchRetries >= maxRetries) {
             Messaging.idebug(() -> "Reached max skin fetch retries for '" + skinName + "'");
             return;
@@ -210,44 +194,35 @@ public class Skin {
             Messaging.idebug(() -> "Skin name invalid length '" + skinName + "'");
             return;
         }
-
-        if (skinName.toLowerCase().startsWith("cit-")) {
+        if (skinName.toLowerCase().startsWith("cit-"))
             return;
-        }
 
         fetching = true;
 
-        ProfileFetcher.fetchForced(this.skinName, new ProfileFetchHandler() {
-            @Override
-            public void onResult(ProfileRequest request) {
-                hasFetched = true;
+        ProfileFetcher.fetchForced(skinName, request -> {
+            hasFetched = true;
 
-                switch (request.getResult()) {
-                    case NOT_FOUND:
-                        isValid = false;
+            switch (request.getResult()) {
+                case NOT_FOUND:
+                    isValid = false;
+                    break;
+                case TOO_MANY_REQUESTS:
+                    if (maxRetries == 0) {
                         break;
-                    case TOO_MANY_REQUESTS:
-                        if (maxRetries == 0) {
-                            break;
-                        }
-                        fetchRetries++;
-                        int delay = Setting.NPC_SKIN_RETRY_DELAY.asTicks();
-                        retryTask = Bukkit.getScheduler().runTaskLater(CitizensAPI.getPlugin(), new Runnable() {
-                            @Override
-                            public void run() {
-                                fetchForced();
-                            }
-                        }, delay);
+                    }
+                    fetchRetries++;
+                    int delay = Setting.NPC_SKIN_RETRY_DELAY.asTicks();
+                    retryTask = Bukkit.getScheduler().runTaskLater(CitizensAPI.getPlugin(),
+                            (Runnable) this::fetchForced, delay);
 
-                        Messaging.idebug(() -> "Retrying skin fetch for '" + skinName + "' in " + delay + " ticks.");
-                        break;
-                    case SUCCESS:
-                        GameProfile profile = request.getProfile();
-                        setData(profile);
-                        break;
-                    default:
-                        break;
-                }
+                    Messaging.idebug(() -> "Retrying skin fetch for '" + skinName + "' in " + delay + " ticks.");
+                    break;
+                case SUCCESS:
+                    GameProfile profile = request.getProfile();
+                    setData(profile);
+                    break;
+                default:
+                    break;
             }
         });
     }
@@ -288,16 +263,14 @@ public class Skin {
             isValid = false;
             return;
         }
-
         if (!profile.getName().toLowerCase().equals(skinName)) {
             Messaging.debug("GameProfile name (" + profile.getName() + ") and " + "skin name (" + skinName
                     + ") do not match. Has the user renamed recently?");
         }
-
         skinId = profile.getId();
         skinData = SkinProperty.fromMojangProfile(profile);
 
-        List<SkinnableEntity> entities = new ArrayList<SkinnableEntity>(pending.keySet());
+        List<SkinnableEntity> entities = new ArrayList<>(pending.keySet());
         for (SkinnableEntity entity : entities) {
             applyAndRespawn(entity);
         }
@@ -371,13 +344,11 @@ public class Skin {
         synchronized (CACHE) {
             skin = CACHE.get(skinName);
         }
-
         if (skin == null) {
             skin = new Skin(skinName);
         } else if (forceUpdate) {
             skin.fetchForced();
         }
-
         return skin;
     }
 
@@ -405,14 +376,13 @@ public class Skin {
         // packet errors that disconnect the client.
         SkinProperty current = SkinProperty.fromMojangProfile(profile);
         if (current != null && current.value.equals(skinProperty.value) && current.signature != null
-                && current.signature.equals(skinProperty.signature)) {
+                && current.signature.equals(skinProperty.signature))
             return;
-        }
 
         skinProperty.apply(profile);
     }
 
-    private static final Map<String, Skin> CACHE = new HashMap<String, Skin>(20);
-    public static final String CACHED_SKIN_UUID_METADATA = "cached-skin-uuid";
-    public static final String CACHED_SKIN_UUID_NAME_METADATA = "cached-skin-uuid-name";
+    private static Map<String, Skin> CACHE = new HashMap<>(20);
+    public static String CACHED_SKIN_UUID_METADATA = "cached-skin-uuid";
+    public static String CACHED_SKIN_UUID_NAME_METADATA = "cached-skin-uuid-name";
 }
diff --git a/main/src/main/java/net/citizensnpcs/npc/skin/SkinPacketTracker.java b/main/src/main/java/net/citizensnpcs/npc/skin/SkinPacketTracker.java
index f851370f8..06412cad2 100644
--- a/main/src/main/java/net/citizensnpcs/npc/skin/SkinPacketTracker.java
+++ b/main/src/main/java/net/citizensnpcs/npc/skin/SkinPacketTracker.java
@@ -28,7 +28,7 @@ import net.citizensnpcs.util.NMS;
  */
 public class SkinPacketTracker {
     private final SkinnableEntity entity;
-    private final Map<UUID, PlayerEntry> inProgress = new HashMap<UUID, PlayerEntry>(
+    private final Map<UUID, PlayerEntry> inProgress = new HashMap<>(
             Math.max(128, Math.min(1024, Bukkit.getMaxPlayers() / 2)));
     private boolean isRemoved;
     private Skin skin;
@@ -43,7 +43,7 @@ public class SkinPacketTracker {
         Preconditions.checkNotNull(entity);
 
         this.entity = entity;
-        this.skin = Skin.get(entity);
+        skin = Skin.get(entity);
 
         if (LISTENER == null) {
             LISTENER = new PlayerListener();
@@ -76,10 +76,7 @@ public class SkinPacketTracker {
      */
     void notifyRemovePacketSent(UUID playerId) {
         PlayerEntry entry = inProgress.get(playerId);
-        if (entry == null)
-            return;
-
-        if (entry.removeCount == 0)
+        if (entry == null || entry.removeCount == 0)
             return;
 
         entry.removeCount -= 1;
@@ -94,7 +91,7 @@ public class SkinPacketTracker {
      * Notify that the NPC skin has been changed.
      */
     public void notifySkinChange(boolean forceUpdate) {
-        this.skin = Skin.get(entity, forceUpdate);
+        skin = Skin.get(entity, forceUpdate);
         skin.applyAndRespawn(entity);
     }
 
@@ -111,9 +108,9 @@ public class SkinPacketTracker {
         Collection<? extends Player> players = Bukkit.getOnlinePlayers();
 
         for (Player player : players) {
-            if (player.hasMetadata("NPC"))
+            if (player.hasMetadata("NPC")) {
                 continue;
-
+            }
             // send packet now and later to ensure removal from player list
             NMS.sendTabListRemove(player, entity.getBukkitEntity());
             TAB_LIST_REMOVER.sendPacket(player, entity);
@@ -137,7 +134,7 @@ public class SkinPacketTracker {
         }.runTaskLater(CitizensAPI.getPlugin(), 15);
     }
 
-    private void scheduleRemovePacket(final PlayerEntry entry) {
+    private void scheduleRemovePacket(PlayerEntry entry) {
         if (isRemoved || !CitizensAPI.hasImplementation() || !CitizensAPI.getPlugin().isEnabled()
                 || !shouldRemoveFromTabList())
             return;
@@ -177,7 +174,7 @@ public class SkinPacketTracker {
      * @param player
      *            The player.
      */
-    public void updateViewer(final Player player) {
+    public void updateViewer(Player player) {
         Preconditions.checkNotNull(player);
 
         if (isRemoved || player.hasMetadata("NPC"))
@@ -189,7 +186,6 @@ public class SkinPacketTracker {
         } else {
             entry = new PlayerEntry(player);
         }
-
         TAB_LIST_REMOVER.cancelPackets(player, entity);
 
         inProgress.put(player.getUniqueId(), entry);
@@ -199,7 +195,7 @@ public class SkinPacketTracker {
         }
     }
 
-    private class PlayerEntry {
+    private static class PlayerEntry {
         Player player;
         int removeCount;
         BukkitTask removeTask;
@@ -228,6 +224,6 @@ public class SkinPacketTracker {
     }
 
     private static PlayerListener LISTENER;
-    private static final int PACKET_DELAY_REMOVE = 2;
-    private static final TabListRemover TAB_LIST_REMOVER = new TabListRemover();
+    private static int PACKET_DELAY_REMOVE = 2;
+    private static TabListRemover TAB_LIST_REMOVER = new TabListRemover();
 }
diff --git a/main/src/main/java/net/citizensnpcs/npc/skin/SkinUpdateTracker.java b/main/src/main/java/net/citizensnpcs/npc/skin/SkinUpdateTracker.java
index 111012e02..bb5775928 100644
--- a/main/src/main/java/net/citizensnpcs/npc/skin/SkinUpdateTracker.java
+++ b/main/src/main/java/net/citizensnpcs/npc/skin/SkinUpdateTracker.java
@@ -37,8 +37,8 @@ import net.citizensnpcs.util.Util;
  * @see net.citizensnpcs.EventListen
  */
 public class SkinUpdateTracker {
-    private final Map<SkinnableEntity, Void> navigating = new WeakHashMap<SkinnableEntity, Void>(25);
-    private final Map<UUID, PlayerTracker> playerTrackers = new HashMap<UUID, PlayerTracker>(
+    private final Map<SkinnableEntity, Void> navigating = new WeakHashMap<>(25);
+    private final Map<UUID, PlayerTracker> playerTrackers = new HashMap<>(
             Math.max(128, Math.min(1024, Bukkit.getMaxPlayers() / 2)));
     private final NPCNavigationUpdater updater = new NPCNavigationUpdater();
 
@@ -57,13 +57,7 @@ public class SkinUpdateTracker {
     // skinnable entity is within the player's field of view.
     private boolean canSee(Player player, SkinnableEntity skinnable, boolean checkFov) {
         Player entity = skinnable.getBukkitEntity();
-        if (entity == null)
-            return false;
-
-        if (!player.canSee(entity))
-            return false;
-
-        if (!player.getWorld().equals(entity.getWorld()))
+        if (entity == null || !player.canSee(entity) || !player.getWorld().equals(entity.getWorld()))
             return false;
 
         Location playerLoc = player.getLocation();
@@ -92,7 +86,6 @@ public class SkinUpdateTracker {
             }
             return hasMoved;
         }
-
         return true;
     }
 
@@ -101,17 +94,14 @@ public class SkinUpdateTracker {
     }
 
     private List<SkinnableEntity> getNearbyNPCs(Player player, boolean reset, boolean checkFov) {
-        List<SkinnableEntity> results = new ArrayList<SkinnableEntity>();
+        List<SkinnableEntity> results = new ArrayList<>();
         PlayerTracker tracker = getTracker(player, reset);
         for (NPC npc : getAllNPCs()) {
             SkinnableEntity skinnable = getSkinnable(npc);
-            if (skinnable == null)
-                continue;
-
             // if checking field of view, don't add skins that have already been updated for FOV
-            if (checkFov && tracker.fovVisibleSkins.contains(skinnable))
+            if (skinnable == null || checkFov && tracker.fovVisibleSkins.contains(skinnable)) {
                 continue;
-
+            }
             if (canSee(player, skinnable, checkFov)) {
                 results.add(skinnable);
             }
@@ -126,9 +116,9 @@ public class SkinUpdateTracker {
         for (SkinnableEntity skinnable : navigating.keySet()) {
             // make sure player hasn't already been updated to prevent excessive tab list flashing
             // while NPC's are navigating and to reduce the number of times #canSee is invoked.
-            if (tracker.fovVisibleSkins.contains(skinnable))
+            if (tracker.fovVisibleSkins.contains(skinnable)) {
                 continue;
-
+            }
             if (canSee(player, skinnable, true)) {
                 output.add(skinnable);
             }
@@ -231,10 +221,7 @@ public class SkinUpdateTracker {
     public void onPlayerMove(Player player) {
         Preconditions.checkNotNull(player);
         PlayerTracker updateTracker = playerTrackers.get(player.getUniqueId());
-        if (updateTracker == null)
-            return;
-
-        if (!updateTracker.shouldUpdate(player))
+        if (updateTracker == null || !updateTracker.shouldUpdate(player))
             return;
 
         updatePlayer(player, 10, false);
@@ -277,14 +264,13 @@ public class SkinUpdateTracker {
         Location location = entity.getLocation();
         List<Player> players = entity.getWorld().getPlayers();
         for (Player player : players) {
-            if (player.hasMetadata("NPC"))
+            if (player.hasMetadata("NPC")) {
                 continue;
+            }
             Location ploc = player.getLocation();
-            if (ploc.getWorld() != location.getWorld())
+            if (ploc.getWorld() != location.getWorld() || ploc.distance(location) > viewDistance) {
                 continue;
-            if (ploc.distance(location) > viewDistance)
-                continue;
-
+            }
             PlayerTracker tracker = playerTrackers.get(player.getUniqueId());
             if (tracker != null) {
                 tracker.hardReset(player);
@@ -302,7 +288,7 @@ public class SkinUpdateTracker {
      * @param reset
      *            True to hard reset the players tracking info, otherwise false.
      */
-    public void updatePlayer(final Player player, long delay, final boolean reset) {
+    public void updatePlayer(Player player, long delay, boolean reset) {
         if (player.hasMetadata("NPC"))
             return;
 
@@ -328,13 +314,13 @@ public class SkinUpdateTracker {
             if (navigating.isEmpty() || playerTrackers.isEmpty())
                 return;
 
-            List<SkinnableEntity> nearby = new ArrayList<SkinnableEntity>(10);
+            List<SkinnableEntity> nearby = new ArrayList<>(10);
             Set<UUID> seen = Sets.newHashSet();
             for (Player player : Bukkit.getOnlinePlayers()) {
                 seen.add(player.getUniqueId());
-                if (player.hasMetadata("NPC"))
+                if (player.hasMetadata("NPC")) {
                     continue;
-
+                }
                 getNewVisibleNavigating(player, nearby);
 
                 for (SkinnableEntity skinnable : nearby) {
@@ -342,7 +328,6 @@ public class SkinUpdateTracker {
                     tracker.fovVisibleSkins.add(skinnable);
                     updater.queue.offer(new UpdateInfo(player, skinnable));
                 }
-
                 nearby.clear();
             }
             playerTrackers.keySet().removeIf(uuid -> !seen.contains(uuid));
@@ -351,8 +336,8 @@ public class SkinUpdateTracker {
 
     // Updates players. Repeating task used to schedule updates without
     // causing excessive scheduling.
-    private class NPCNavigationUpdater extends BukkitRunnable {
-        Queue<UpdateInfo> queue = new ArrayDeque<UpdateInfo>(20);
+    private static class NPCNavigationUpdater extends BukkitRunnable {
+        Queue<UpdateInfo> queue = new ArrayDeque<>(20);
 
         @Override
         public void run() {
@@ -365,10 +350,10 @@ public class SkinUpdateTracker {
 
     // Tracks player location and yaw to determine when the player should be updated
     // with nearby skins.
-    private class PlayerTracker {
-        final Set<SkinnableEntity> fovVisibleSkins = new HashSet<SkinnableEntity>(10);
+    private static class PlayerTracker {
+        Set<SkinnableEntity> fovVisibleSkins = new HashSet<>(10);
         boolean hasMoved;
-        final Location location = new Location(null, 0, 0, 0);
+        Location location = new Location(null, 0, 0, 0);
         float lowerBound;
         int rotationCount;
         float startYaw;
@@ -380,22 +365,22 @@ public class SkinUpdateTracker {
 
         // reset all
         void hardReset(Player player) {
-            this.hasMoved = false;
-            this.rotationCount = 0;
-            this.lowerBound = this.upperBound = this.startYaw = 0;
-            this.fovVisibleSkins.clear();
+            hasMoved = false;
+            rotationCount = 0;
+            lowerBound = upperBound = startYaw = 0;
+            fovVisibleSkins.clear();
             reset(player);
         }
 
         // resets initial yaw and location to the players current location and yaw.
         void reset(Player player) {
-            player.getLocation(this.location);
+            player.getLocation(location);
             if (rotationCount < 3) {
                 float rotationDegrees = Setting.NPC_SKIN_ROTATION_UPDATE_DEGREES.asFloat();
-                float yaw = Util.clamp(this.location.getYaw());
-                this.startYaw = yaw;
-                this.upperBound = Util.clamp(yaw + rotationDegrees);
-                this.lowerBound = Util.clamp(yaw - rotationDegrees);
+                float yaw = Util.clamp(location.getYaw());
+                startYaw = yaw;
+                upperBound = Util.clamp(yaw + rotationDegrees);
+                lowerBound = Util.clamp(yaw - rotationDegrees);
                 if (upperBound == -180.0 && startYaw > 0) {
                     upperBound = 0;
                 }
@@ -406,16 +391,14 @@ public class SkinUpdateTracker {
             Location currentLoc = player.getLocation();
 
             // make sure player is in same world
-            if (!currentLoc.getWorld().equals(this.location.getWorld())) {
+            if (!currentLoc.getWorld().equals(location.getWorld())) {
                 hardReset(player);
                 return true;
             }
-
             if (!hasMoved) {
                 hasMoved = true;
                 return true;
             }
-
             if (rotationCount < 3) {
                 float yaw = Util.clamp(currentLoc.getYaw());
                 boolean hasRotated;
@@ -424,7 +407,6 @@ public class SkinUpdateTracker {
                 } else {
                     hasRotated = yaw < lowerBound || yaw > upperBound;
                 }
-
                 // update the first 3 times the player rotates. helps load skins around player
                 // after the player logs/teleports.
                 if (hasRotated) {
@@ -433,14 +415,12 @@ public class SkinUpdateTracker {
                     return true;
                 }
             }
-
             // update every time a player moves a certain distance
-            if (currentLoc.distance(this.location) > MOVEMENT_SKIN_UPDATE_DISTANCE) {
+            if (currentLoc.distance(location) > MOVEMENT_SKIN_UPDATE_DISTANCE) {
                 reset(player);
                 return true;
-            } else {
+            } else
                 return false;
-            }
         }
     }
 
@@ -454,6 +434,6 @@ public class SkinUpdateTracker {
         }
     }
 
-    private static final float FIELD_OF_VIEW = 70F;
-    private static final int MOVEMENT_SKIN_UPDATE_DISTANCE = 25;
+    private static float FIELD_OF_VIEW = 70F;
+    private static int MOVEMENT_SKIN_UPDATE_DISTANCE = 25;
 }
diff --git a/main/src/main/java/net/citizensnpcs/npc/skin/TabListRemover.java b/main/src/main/java/net/citizensnpcs/npc/skin/TabListRemover.java
index 7eb70eafe..e818fe5b1 100644
--- a/main/src/main/java/net/citizensnpcs/npc/skin/TabListRemover.java
+++ b/main/src/main/java/net/citizensnpcs/npc/skin/TabListRemover.java
@@ -26,7 +26,7 @@ import net.citizensnpcs.util.NMS;
  * </p>
  */
 public class TabListRemover {
-    private final Map<UUID, PlayerEntry> pending = new HashMap<UUID, PlayerEntry>(
+    private final Map<UUID, PlayerEntry> pending = new HashMap<>(
             Math.max(128, Math.min(1024, Bukkit.getMaxPlayers() / 2)));
 
     TabListRemover() {
@@ -70,7 +70,6 @@ public class TabListRemover {
         if (entry.toRemove.remove(skinnable)) {
             skinnable.getSkinTracker().notifyRemovePacketCancelled(player.getUniqueId());
         }
-
         if (entry.toRemove.isEmpty()) {
             pending.remove(player.getUniqueId());
         }
@@ -82,7 +81,6 @@ public class TabListRemover {
             entry = new PlayerEntry(player);
             pending.put(player.getUniqueId(), entry);
         }
-
         return entry;
     }
 
@@ -103,9 +101,9 @@ public class TabListRemover {
         entry.toRemove.add(entity);
     }
 
-    private class PlayerEntry {
+    private static class PlayerEntry {
         Player player;
-        Set<SkinnableEntity> toRemove = new HashSet<SkinnableEntity>(20);
+        Set<SkinnableEntity> toRemove = new HashSet<>(20);
 
         PlayerEntry(Player player) {
             this.player = player;
@@ -125,30 +123,27 @@ public class TabListRemover {
                 int listSize = Math.min(maxPacketEntries, entry.toRemove.size());
                 boolean sendAll = listSize == entry.toRemove.size();
 
-                List<SkinnableEntity> skinnableList = new ArrayList<SkinnableEntity>(listSize);
+                List<SkinnableEntity> skinnableList = new ArrayList<>(listSize);
 
                 int i = 0;
                 Iterator<SkinnableEntity> skinIterator = entry.toRemove.iterator();
                 while (skinIterator.hasNext()) {
-                    if (i >= maxPacketEntries)
+                    if (i >= maxPacketEntries) {
                         break;
-
+                    }
                     SkinnableEntity skinnable = skinIterator.next();
                     skinnableList.add(skinnable);
 
                     skinIterator.remove();
                     i++;
                 }
-
                 if (entry.player.isOnline()) {
                     NMS.sendTabListRemove(entry.player, skinnableList);
                 }
-
                 // notify skin trackers that a remove packet has been sent to a player
                 for (SkinnableEntity entity : skinnableList) {
                     entity.getSkinTracker().notifyRemovePacketSent(entry.player.getUniqueId());
                 }
-
                 if (sendAll) {
                     entryIterator.remove();
                 }
diff --git a/main/src/main/java/net/citizensnpcs/trait/Age.java b/main/src/main/java/net/citizensnpcs/trait/Age.java
index 8f5eb7c17..aba7969a6 100644
--- a/main/src/main/java/net/citizensnpcs/trait/Age.java
+++ b/main/src/main/java/net/citizensnpcs/trait/Age.java
@@ -50,13 +50,12 @@ public class Age extends Trait implements Toggleable {
             entity.setAge(age);
             entity.setAgeLock(locked);
             ageable = entity;
-        } else if (npc.getEntity() instanceof Zombie) {
-            ((Zombie) npc.getEntity()).setBaby(age < 0);
-            ageable = null;
-        } else if (npc.isSpawned() && npc.getEntity().getType().name().equals("TADPOLE")) {
-            ((Tadpole) npc.getEntity()).setAge(age);
-            ageable = null;
         } else {
+            if (npc.getEntity() instanceof Zombie) {
+                ((Zombie) npc.getEntity()).setBaby(age < 0);
+            } else if (npc.isSpawned() && npc.getEntity().getType().name().equals("TADPOLE")) {
+                ((Tadpole) npc.getEntity()).setAge(age);
+            }
             ageable = null;
         }
     }
@@ -78,7 +77,6 @@ public class Age extends Trait implements Toggleable {
         if (isAgeable()) {
             ageable.setAgeLock(locked);
         }
-
     }
 
     /**
diff --git a/main/src/main/java/net/citizensnpcs/trait/Anchors.java b/main/src/main/java/net/citizensnpcs/trait/Anchors.java
index 48fc8f834..5031a154a 100644
--- a/main/src/main/java/net/citizensnpcs/trait/Anchors.java
+++ b/main/src/main/java/net/citizensnpcs/trait/Anchors.java
@@ -21,7 +21,7 @@ import net.citizensnpcs.util.Messages;
  */
 @TraitName("anchors")
 public class Anchors extends Trait {
-    private final List<Anchor> anchors = new ArrayList<Anchor>();
+    private final List<Anchor> anchors = new ArrayList<>();
 
     public Anchors() {
         super("anchors");
@@ -61,8 +61,8 @@ public class Anchors extends Trait {
             String[] parts = sub.getString("").split(";");
             Location location;
             try {
-                location = new Location(Bukkit.getServer().getWorld(parts[1]), Double.valueOf(parts[2]),
-                        Double.valueOf(parts[3]), Double.valueOf(parts[4]));
+                location = new Location(Bukkit.getServer().getWorld(parts[1]), Double.parseDouble(parts[2]),
+                        Double.parseDouble(parts[3]), Double.parseDouble(parts[4]));
                 anchors.add(new Anchor(parts[0], location));
             } catch (NumberFormatException e) {
                 Messaging.logTr(Messages.SKIPPING_INVALID_ANCHOR, sub.name(), e.getMessage());
@@ -85,8 +85,9 @@ public class Anchors extends Trait {
     @Override
     public void save(DataKey key) {
         key.removeKey("list");
-        for (int i = 0; i < anchors.size(); i++)
+        for (int i = 0; i < anchors.size(); i++) {
             key.setString("list." + String.valueOf(i), anchors.get(i).stringValue());
+        }
     }
 
 }
diff --git a/main/src/main/java/net/citizensnpcs/trait/ArmorStandTrait.java b/main/src/main/java/net/citizensnpcs/trait/ArmorStandTrait.java
index 53b0c4d7b..2a1631699 100644
--- a/main/src/main/java/net/citizensnpcs/trait/ArmorStandTrait.java
+++ b/main/src/main/java/net/citizensnpcs/trait/ArmorStandTrait.java
@@ -158,14 +158,14 @@ public class ArmorStandTrait extends Trait {
      * @see ArmorStand#setArms(boolean)
      */
     public void setHasArms(boolean arms) {
-        this.hasarms = arms;
+        hasarms = arms;
     }
 
     /**
      * @see ArmorStand#setBasePlate(boolean)
      */
     public void setHasBaseplate(boolean baseplate) {
-        this.hasbaseplate = baseplate;
+        hasbaseplate = baseplate;
     }
 
     /**
diff --git a/main/src/main/java/net/citizensnpcs/trait/BoundingBoxTrait.java b/main/src/main/java/net/citizensnpcs/trait/BoundingBoxTrait.java
index 02c7ce3d6..e541f9785 100644
--- a/main/src/main/java/net/citizensnpcs/trait/BoundingBoxTrait.java
+++ b/main/src/main/java/net/citizensnpcs/trait/BoundingBoxTrait.java
@@ -67,7 +67,7 @@ public class BoundingBoxTrait extends Trait implements Supplier<BoundingBox> {
     }
 
     public void setBoundingBoxFunction(Function<EntityDim, BoundingBox> func) {
-        this.function = func;
+        function = func;
     }
 
     public void setHeight(float height) {
diff --git a/main/src/main/java/net/citizensnpcs/trait/ClickRedirectTrait.java b/main/src/main/java/net/citizensnpcs/trait/ClickRedirectTrait.java
index bbc9d9ed0..49fae855a 100644
--- a/main/src/main/java/net/citizensnpcs/trait/ClickRedirectTrait.java
+++ b/main/src/main/java/net/citizensnpcs/trait/ClickRedirectTrait.java
@@ -25,7 +25,7 @@ public class ClickRedirectTrait extends Trait {
 
     public ClickRedirectTrait(NPC npc) {
         this();
-        this.redirectNPC = npc;
+        redirectNPC = npc;
         if (redirectNPC != null && redirectNPC.hasTrait(PlayerFilter.class)) {
             redirectNPC.getOrAddTrait(PlayerFilter.class).addChildNPC(npc);
         }
diff --git a/main/src/main/java/net/citizensnpcs/trait/CommandTrait.java b/main/src/main/java/net/citizensnpcs/trait/CommandTrait.java
index 7fd7f6cce..306ed9d2d 100644
--- a/main/src/main/java/net/citizensnpcs/trait/CommandTrait.java
+++ b/main/src/main/java/net/citizensnpcs/trait/CommandTrait.java
@@ -3,6 +3,7 @@ package net.citizensnpcs.trait;
 import java.time.Duration;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.EnumSet;
 import java.util.Iterator;
 import java.util.List;
@@ -218,13 +219,11 @@ public class CommandTrait extends Trait {
         } else {
             outputList.add(0, executionMode.toString());
         }
-
         StringBuilder output = new StringBuilder();
         for (String item : outputList) {
             output.append(item);
             output.append(" ");
         }
-
         Messaging.send(sender, output.toString().trim());
     }
 
@@ -252,9 +251,9 @@ public class CommandTrait extends Trait {
         return output;
     }
 
-    public void dispatch(final Player player, Hand handIn) {
-        final Hand hand = player.isSneaking()
-                ? (handIn == CommandTrait.Hand.LEFT ? CommandTrait.Hand.SHIFT_LEFT : CommandTrait.Hand.SHIFT_RIGHT)
+    public void dispatch(Player player, Hand handIn) {
+        Hand hand = player.isSneaking()
+                ? handIn == CommandTrait.Hand.LEFT ? CommandTrait.Hand.SHIFT_LEFT : CommandTrait.Hand.SHIFT_RIGHT
                 : handIn;
         NPCCommandDispatchEvent event = new NPCCommandDispatchEvent(npc, player);
         Bukkit.getServer().getPluginManager().callEvent(event);
@@ -266,9 +265,8 @@ public class CommandTrait extends Trait {
 
             @Override
             public void run() {
-                List<NPCCommand> commandList = Lists.newArrayList(Iterables.filter(commands.values(), command -> {
-                    return command.hand == hand || command.hand == Hand.BOTH;
-                }));
+                List<NPCCommand> commandList = Lists.newArrayList(Iterables.filter(commands.values(),
+                        command -> (command.hand == hand || command.hand == Hand.BOTH)));
                 if (executionMode == ExecutionMode.RANDOM) {
                     if (commandList.size() > 0) {
                         runCommand(player, commandList.get(Util.getFastRandom().nextInt(commandList.size())));
@@ -277,7 +275,7 @@ public class CommandTrait extends Trait {
                 }
                 int max = -1;
                 if (executionMode == ExecutionMode.SEQUENTIAL) {
-                    Collections.sort(commandList, (o1, o2) -> Integer.compare(o1.id, o2.id));
+                    Collections.sort(commandList, Comparator.comparing(o1 -> o1.id));
                     max = commandList.size() > 0 ? commandList.get(commandList.size() - 1).id : -1;
                 }
                 if (executionMode == ExecutionMode.LINEAR) {
@@ -299,13 +297,13 @@ public class CommandTrait extends Trait {
                         }
                     }
                     runCommand(player, command);
-                    if (executionMode == ExecutionMode.SEQUENTIAL || (charged != null && charged == false)) {
+                    if (executionMode == ExecutionMode.SEQUENTIAL || charged != null && !charged) {
                         break;
                     }
                 }
             }
 
-            private void runCommand(final Player player, NPCCommand command) {
+            private void runCommand(Player player, NPCCommand command) {
                 Runnable runnable = () -> {
                     PlayerNPCCommand info = playerTracking.get(player.getUniqueId());
                     if (info == null && (executionMode == ExecutionMode.SEQUENTIAL
@@ -320,14 +318,12 @@ public class CommandTrait extends Trait {
                             return;
                         }
                     }
-
                     if (info != null && !info.canUse(CommandTrait.this, player, command))
                         return;
 
                     if (charged == null) {
                         charge.run();
                     }
-
                     if (temporaryPermissions.size() > 0) {
                         PermissionAttachment attachment = player.addAttachment(CitizensAPI.getPlugin());
                         if (attachment != null) {
@@ -434,9 +430,8 @@ public class CommandTrait extends Trait {
 
     private void sendErrorMessage(Player player, CommandTraitError msg, Function<String, String> transform,
             Object... objects) {
-        if (hideErrorMessages) {
+        if (hideErrorMessages)
             return;
-        }
         Set<CommandTraitError> sent = executionErrors.get(player.getUniqueId().toString());
         if (sent != null) {
             if (sent.contains(msg))
@@ -465,7 +460,7 @@ public class CommandTrait extends Trait {
     }
 
     public void setExecutionMode(ExecutionMode mode) {
-        this.executionMode = mode;
+        executionMode = mode;
     }
 
     public void setExperienceCost(int experienceCost) {
@@ -477,7 +472,7 @@ public class CommandTrait extends Trait {
     }
 
     public void setHideErrorMessages(boolean hide) {
-        this.hideErrorMessages = hide;
+        hideErrorMessages = hide;
     }
 
     public void setItemCost(List<ItemStack> itemCost, int id) {
@@ -550,7 +545,7 @@ public class CommandTrait extends Trait {
 
         @Override
         public void initialise(MenuContext ctx) {
-            this.inventory = ctx.getInventory();
+            inventory = ctx.getInventory();
             if (id == -1) {
                 for (ItemStack stack : trait.itemRequirements) {
                     inventory.addItem(stack.clone());
@@ -576,10 +571,10 @@ public class CommandTrait extends Trait {
                 }
             }
             if (id == -1) {
-                this.trait.itemRequirements.clear();
-                this.trait.itemRequirements.addAll(requirements);
+                trait.itemRequirements.clear();
+                trait.itemRequirements.addAll(requirements);
             } else {
-                this.trait.setItemCost(requirements, id);
+                trait.setItemCost(requirements, id);
             }
         }
     }
@@ -649,7 +644,7 @@ public class CommandTrait extends Trait {
         }
 
         public NPCCommandBuilder addPerm(String permission) {
-            this.perms.add(permission);
+            perms.add(permission);
             return this;
         }
 
@@ -697,7 +692,7 @@ public class CommandTrait extends Trait {
         }
 
         public NPCCommandBuilder globalCooldown(int cooldown) {
-            this.globalCooldown = cooldown;
+            globalCooldown = cooldown;
             return this;
         }
 
@@ -739,8 +734,8 @@ public class CommandTrait extends Trait {
             double cost = root.keyExists("cost") ? root.getDouble("cost") : -1;
             int exp = root.keyExists("experienceCost") ? root.getInt("experienceCost") : -1;
             return new NPCCommand(Integer.parseInt(root.name()), root.getString("command"),
-                    Hand.valueOf(root.getString("hand")), Boolean.valueOf(root.getString("player")),
-                    Boolean.valueOf(root.getString("op")), root.getInt("cooldown"), perms, root.getInt("n"),
+                    Hand.valueOf(root.getString("hand")), Boolean.parseBoolean(root.getString("player")),
+                    Boolean.parseBoolean(root.getString("op")), root.getInt("cooldown"), perms, root.getInt("n"),
                     root.getInt("delay"), root.getInt("globalcooldown"), cost, exp, items);
         }
 
@@ -848,14 +843,12 @@ public class CommandTrait extends Trait {
                     }
                 }
             }
-
             Set<String> diff = Sets.newHashSet(lastUsed.keySet());
             diff.removeAll(commandKeys);
             for (String key : diff) {
                 lastUsed.remove(key);
                 nUsed.remove(key);
             }
-
             if (globalCooldowns != null) {
                 diff = Sets.newHashSet(globalCooldowns.keySet());
                 diff.removeAll(commandKeys);
@@ -867,7 +860,7 @@ public class CommandTrait extends Trait {
 
         public static boolean requiresTracking(NPCCommand command) {
             return command.globalCooldown > 0 || command.cooldown > 0 || command.n > 0
-                    || (command.perms != null && command.perms.size() > 0)
+                    || command.perms != null && command.perms.size() > 0
                     || Setting.NPC_COMMAND_GLOBAL_COMMAND_COOLDOWN.asSeconds() > 0;
         }
     }
diff --git a/main/src/main/java/net/citizensnpcs/trait/Controllable.java b/main/src/main/java/net/citizensnpcs/trait/Controllable.java
index b1e92f864..8b929343c 100644
--- a/main/src/main/java/net/citizensnpcs/trait/Controllable.java
+++ b/main/src/main/java/net/citizensnpcs/trait/Controllable.java
@@ -74,7 +74,6 @@ public class Controllable extends Trait implements Toggleable, CommandConfigurab
         } else if (args.hasValueFlag("explicittype")) {
             explicitType = Util.matchEnum(EntityType.values(), args.getFlag("explicittype"));
         }
-
         if (npc.isSpawned()) {
             loadController();
         }
@@ -90,10 +89,8 @@ public class Controllable extends Trait implements Toggleable, CommandConfigurab
         }
         if (!player.hasPermission(
                 "citizens.npc.controllable." + npc.getEntity().getType().name().toLowerCase().replace("_", ""))
-                || !player.hasPermission("citizens.npc.controllable"))
-            return;
-
-        if (ownerRequired && !npc.getOrAddTrait(Owner.class).isOwnedBy(player))
+                || !player.hasPermission("citizens.npc.controllable")
+                || ownerRequired && !npc.getOrAddTrait(Owner.class).isOwnedBy(player))
             return;
 
         NMS.mount(npc.getEntity(), player);
@@ -146,9 +143,8 @@ public class Controllable extends Trait implements Toggleable, CommandConfigurab
      */
     public boolean mount(Player toMount) {
         List<Entity> passengers = NMS.getPassengers(npc.getEntity());
-        if (passengers.size() != 0) {
+        if (passengers.size() != 0)
             return false;
-        }
         boolean found = false;
         for (Entity passenger : passengers) {
             if (passenger != null && passenger == toMount) {
@@ -156,9 +152,8 @@ public class Controllable extends Trait implements Toggleable, CommandConfigurab
                 break;
             }
         }
-        if (found) {
+        if (found)
             return false;
-        }
         enterOrLeaveVehicle(toMount);
         return true;
     }
@@ -232,7 +227,7 @@ public class Controllable extends Trait implements Toggleable, CommandConfigurab
      *            the explicit type
      */
     public void setExplicitType(EntityType type) {
-        this.explicitType = type;
+        explicitType = type;
     }
 
     private void setMountedYaw(Entity entity) {
@@ -240,9 +235,8 @@ public class Controllable extends Trait implements Toggleable, CommandConfigurab
             return; // EnderDragon handles this separately
         Location loc = entity.getLocation();
         Vector vel = entity.getVelocity();
-        if (vel.lengthSquared() == 0) {
+        if (vel.lengthSquared() == 0)
             return;
-        }
 
         double tX = loc.getX() + vel.getX();
         double tZ = loc.getZ() + vel.getZ();
@@ -287,7 +281,6 @@ public class Controllable extends Trait implements Toggleable, CommandConfigurab
 
             vel = vel.setX(dXcos * speed * speedMod).setZ(dXsin * speed * speedMod);
         }
-
         vel = vel.add(new Vector(
                 passenger.getVelocity().getX() * speedMod * Setting.CONTROLLABLE_GROUND_DIRECTION_MODIFIER.asDouble(),
                 0D,
@@ -301,11 +294,10 @@ public class Controllable extends Trait implements Toggleable, CommandConfigurab
         }
         handle.setVelocity(vel);
 
-        if (newSpeed > oldSpeed && speed < maxSpeed) {
-            return (float) Math.min(maxSpeed, (speed + ((maxSpeed - speed) / 50.0D)));
-        } else {
-            return (float) Math.max(0, (speed - (speed / 50.0D)));
-        }
+        if (newSpeed > oldSpeed && speed < maxSpeed)
+            return (float) Math.min(maxSpeed, speed + (maxSpeed - speed) / 50.0D);
+        else
+            return (float) Math.max(0, speed - speed / 50.0D);
     }
 
     public class GroundController implements MovementController {
@@ -329,13 +321,12 @@ public class Controllable extends Trait implements Toggleable, CommandConfigurab
         public void run(Player rider) {
             boolean onGround = NMS.isOnGround(npc.getEntity());
             float speedMod = npc.getNavigator().getDefaultParameters()
-                    .modifiedSpeed((onGround ? GROUND_SPEED : AIR_SPEED));
+                    .modifiedSpeed(onGround ? GROUND_SPEED : AIR_SPEED);
             if (!Util.isHorse(npc.getEntity().getType())) {
                 // use minecraft horse physics
                 speed = updateHorizontalSpeed(npc.getEntity(), rider, speed, speedMod,
                         Setting.MAX_CONTROLLABLE_GROUND_SPEED.asDouble());
             }
-
             boolean shouldJump = NMS.shouldJump(rider);
             if (shouldJump) {
                 if (onGround && jumpTicks == 0) {
@@ -420,14 +411,12 @@ public class Controllable extends Trait implements Toggleable, CommandConfigurab
                 npc.getEntity().setVelocity(npc.getEntity().getVelocity().setY(0.001F));
                 return;
             }
-
             speed = updateHorizontalSpeed(npc.getEntity(), rider, speed, 1F,
                     Setting.MAX_CONTROLLABLE_FLIGHT_SPEED.asDouble());
             boolean shouldJump = NMS.shouldJump(rider);
             if (shouldJump) {
                 npc.getEntity().setVelocity(npc.getEntity().getVelocity().setY(0.25F));
             }
-
             npc.getEntity().setVelocity(npc.getEntity().getVelocity().multiply(new Vector(1, 0.98, 1)));
             setMountedYaw(npc.getEntity());
         }
@@ -461,7 +450,7 @@ public class Controllable extends Trait implements Toggleable, CommandConfigurab
         }
     }
 
-    private static final Map<EntityType, Constructor<? extends MovementController>> CONTROLLER_TYPES = Maps
+    private static Map<EntityType, Constructor<? extends MovementController>> CONTROLLER_TYPES = Maps
             .newEnumMap(EntityType.class);
 
     static {
diff --git a/main/src/main/java/net/citizensnpcs/trait/CurrentLocation.java b/main/src/main/java/net/citizensnpcs/trait/CurrentLocation.java
index 3c22dc18f..e4cfa3e7c 100644
--- a/main/src/main/java/net/citizensnpcs/trait/CurrentLocation.java
+++ b/main/src/main/java/net/citizensnpcs/trait/CurrentLocation.java
@@ -51,7 +51,7 @@ public class CurrentLocation extends Trait {
     }
 
     public void setLocation(Location loc) {
-        this.location = loc.clone();
+        location = loc.clone();
     }
 
     @Override
diff --git a/main/src/main/java/net/citizensnpcs/trait/DropsTrait.java b/main/src/main/java/net/citizensnpcs/trait/DropsTrait.java
index 031c93db3..f3d2beff5 100644
--- a/main/src/main/java/net/citizensnpcs/trait/DropsTrait.java
+++ b/main/src/main/java/net/citizensnpcs/trait/DropsTrait.java
@@ -70,7 +70,7 @@ public class DropsTrait extends Trait {
 
         @Override
         public void initialise(MenuContext ctx) {
-            this.inventory = ctx.getInventory();
+            inventory = ctx.getInventory();
             int k = 0;
             for (int i = 1; i < 5; i += 2) {
                 for (int j = 0; j < 9; j++) {
@@ -87,7 +87,7 @@ public class DropsTrait extends Trait {
                     InventoryMenuSlot slot = ctx.getSlot(i * 9 + j);
                     slot.setItemStack(new ItemStack(Util.getFallbackMaterial("BARRIER", "FIRE")),
                             "Drop chance <e>" + chance + "%");
-                    slot.setClickHandler(new PercentageSlotHandler((pct) -> {
+                    slot.setClickHandler(new PercentageSlotHandler(pct -> {
                         if (chances.containsKey(islot)) {
                             chances.put(islot, pct / 100.0);
                         }
@@ -116,12 +116,13 @@ public class DropsTrait extends Trait {
                 for (int j = 0; j < 9; j++) {
                     int slot = i * 9 + j;
                     ItemStack stack = inventory.getItem(slot);
-                    if (stack == null || stack.getType() == Material.AIR)
+                    if (stack == null || stack.getType() == Material.AIR) {
                         continue;
+                    }
                     drops.add(new ItemDrop(stack.clone(), chances.getOrDefault(slot, 1.0)));
                 }
             }
-            this.trait.drops = drops;
+            trait.drops = drops;
         }
     }
 
diff --git a/main/src/main/java/net/citizensnpcs/trait/FollowTrait.java b/main/src/main/java/net/citizensnpcs/trait/FollowTrait.java
index ed71d5fe8..513961c7d 100644
--- a/main/src/main/java/net/citizensnpcs/trait/FollowTrait.java
+++ b/main/src/main/java/net/citizensnpcs/trait/FollowTrait.java
@@ -40,7 +40,7 @@ public class FollowTrait extends Trait {
      * Sets the {@link Entity} to follow
      */
     public void follow(Entity entity) {
-        this.followingUUID = entity == null ? null : entity.getUniqueId();
+        followingUUID = entity == null ? null : entity.getUniqueId();
         if (npc.getNavigator().isNavigating() && this.entity != null && npc.getNavigator().getEntityTarget() != null
                 && this.entity == npc.getNavigator().getEntityTarget().getTarget()) {
             npc.getNavigator().cancelNavigation();
@@ -112,13 +112,11 @@ public class FollowTrait extends Trait {
             }
             return;
         }
-
         if (!npc.getNavigator().isNavigating()) {
             npc.getNavigator().setTarget(entity, false);
             if (margin > 0) {
                 npc.getNavigator().getLocalParameters().distanceMargin(margin);
             }
-
         } else {
             flock.run();
         }
diff --git a/main/src/main/java/net/citizensnpcs/trait/Gravity.java b/main/src/main/java/net/citizensnpcs/trait/Gravity.java
index 60748fe48..2ea7b1e4e 100644
--- a/main/src/main/java/net/citizensnpcs/trait/Gravity.java
+++ b/main/src/main/java/net/citizensnpcs/trait/Gravity.java
@@ -51,7 +51,7 @@ public class Gravity extends Trait implements Toggleable {
     }
 
     public void setEnabled(boolean enabled) {
-        this.nogravity = enabled;
+        nogravity = enabled;
     }
 
     @Override
diff --git a/main/src/main/java/net/citizensnpcs/trait/HologramTrait.java b/main/src/main/java/net/citizensnpcs/trait/HologramTrait.java
index 997036643..d8db1ac01 100644
--- a/main/src/main/java/net/citizensnpcs/trait/HologramTrait.java
+++ b/main/src/main/java/net/citizensnpcs/trait/HologramTrait.java
@@ -35,7 +35,6 @@ import net.citizensnpcs.api.persistence.Persist;
 import net.citizensnpcs.api.trait.Trait;
 import net.citizensnpcs.api.trait.TraitName;
 import net.citizensnpcs.api.util.DataKey;
-import net.citizensnpcs.api.util.Messaging;
 import net.citizensnpcs.api.util.Placeholders;
 import net.citizensnpcs.api.util.SpigotUtil;
 import net.citizensnpcs.util.NMS;
@@ -59,6 +58,8 @@ public class HologramTrait extends Trait {
     private final NPCRegistry registry = CitizensAPI.createCitizensBackedNPCRegistry(new MemoryNPCDataStore());
     private int t;
     private boolean useDisplayEntities = Setting.DISPLAY_ENTITY_HOLOGRAMS.asBoolean();
+    @Persist
+    private int viewRange = -1;
 
     public HologramTrait() {
         super("hologramtrait");
@@ -109,12 +110,13 @@ public class HologramTrait extends Trait {
             hologramNPC = registry.createNPC(EntityType.ARMOR_STAND, line);
             hologramNPC.getOrAddTrait(ArmorStandTrait.class).setAsHelperEntityWithName(npc);
         }
-
         if (Setting.PACKET_HOLOGRAMS.asBoolean()) {
             hologramNPC.addTrait(PacketNPC.class);
         }
-
         hologramNPC.data().set(NPC.Metadata.HOLOGRAM_FOR, npc.getUniqueId().toString());
+        if (viewRange != -1) {
+            hologramNPC.data().set(NPC.Metadata.TRACKING_RANGE, viewRange);
+        }
         hologramNPC.spawn(currentLoc.clone().add(0, getEntityHeight() + heightOffset, 0));
 
         Matcher itemMatcher = ITEM_MATCHER.matcher(line);
@@ -122,7 +124,7 @@ public class HologramTrait extends Trait {
             Material item = SpigotUtil.isUsing1_13API() ? Material.matchMaterial(itemMatcher.group(1), false)
                     : Material.matchMaterial(itemMatcher.group(1));
             ItemStack itemStack = new ItemStack(item, 1);
-            final NPC itemNPC = registry.createNPCUsingItem(EntityType.DROPPED_ITEM, "", itemStack);
+            NPC itemNPC = registry.createNPCUsingItem(EntityType.DROPPED_ITEM, "", itemStack);
             itemNPC.data().setPersistent(NPC.Metadata.NAMEPLATE_VISIBLE, false);
             if (itemMatcher.group(2) != null) {
                 if (itemMatcher.group(2).charAt(1) == '{') {
@@ -135,14 +137,13 @@ public class HologramTrait extends Trait {
             }
             itemNPC.getOrAddTrait(MountTrait.class).setMountedOn(hologramNPC.getUniqueId());
             itemNPC.spawn(currentLoc);
-            final NPC hn = hologramNPC;
+            NPC hn = hologramNPC;
             itemNPC.addRunnable(() -> {
                 if (!itemNPC.isSpawned() || !hn.isSpawned()) {
                     itemNPC.destroy();
                 }
             });
         }
-
         lastEntityHeight = getEntityHeight();
         return hologramNPC;
     }
@@ -152,7 +153,7 @@ public class HologramTrait extends Trait {
     }
 
     private double getHeight(int lineNumber) {
-        double base = (lastNameplateVisible ? 0 : -getLineHeight());
+        double base = lastNameplateVisible ? 0 : -getLineHeight();
         for (int i = 0; i <= lineNumber; i++) {
             HologramLine line = lines.get(i);
             base += line.mb + getLineHeight();
@@ -192,6 +193,17 @@ public class HologramTrait extends Trait {
         return nameLine != null && nameLine.hologram.isSpawned() ? nameLine.hologram.getEntity() : null;
     }
 
+    public double getViewRange() {
+        return viewRange;
+    }
+
+    public boolean isHologramSneaking(NPC hologram, Player player) {
+        if (nameLine != null && hologram == nameLine.hologram && npc.getEntity() instanceof Player
+                && ((Player) npc.getEntity()).isSneaking())
+            return true;
+        return false;
+    }
+
     @Override
     public void load(DataKey root) {
         clear();
@@ -210,7 +222,6 @@ public class HologramTrait extends Trait {
             nameLine.removeNPC();
             nameLine = null;
         }
-
         for (HologramLine line : lines) {
             line.removeNPC();
         }
@@ -229,11 +240,9 @@ public class HologramTrait extends Trait {
                     }
                 }
             }
-
             if (height == -1)
                 return;
 
-            Messaging.debug(npc, "hologram interaction ", hologram.getEntity(), "height offset set to", height);
             NMS.linkTextInteraction(player, hologram.getEntity(), npc.getEntity(), height);
         }
     }
@@ -255,7 +264,6 @@ public class HologramTrait extends Trait {
             nameLine = new HologramLine(npc.getRawName(), false);
             nameLine.spawnNPC(0);
         }
-
         for (int i = 0; i < lines.size(); i++) {
             lines.get(i).spawnNPC(getHeight(i));
         }
@@ -265,7 +273,6 @@ public class HologramTrait extends Trait {
         for (HologramLine line : lines) {
             line.removeNPC();
         }
-
         if (!npc.isSpawned())
             return;
 
@@ -294,11 +301,9 @@ public class HologramTrait extends Trait {
             onDespawn();
             return;
         }
-
         if (currentLoc == null) {
             currentLoc = npc.getStoredLocation().clone();
         }
-
         boolean nameplateVisible = Boolean
                 .parseBoolean(npc.data().<Object> get(NPC.Metadata.NAMEPLATE_VISIBLE, true).toString());
         if (npc.requiresNameHologram()) {
@@ -310,7 +315,6 @@ public class HologramTrait extends Trait {
                 nameLine.spawnNPC(0);
             }
         }
-
         Location npcLoc = npc.getStoredLocation();
         boolean updatePosition = Setting.HOLOGRAM_ALWAYS_UPDATE_POSITION.asBoolean()
                 || currentLoc.getWorld() != npcLoc.getWorld() || currentLoc.distance(npcLoc) >= 0.001
@@ -321,59 +325,50 @@ public class HologramTrait extends Trait {
             t = 0;
             updateName = true;
         }
-
         lastNameplateVisible = nameplateVisible;
 
         if (updatePosition) {
             currentLoc = npcLoc.clone();
             lastEntityHeight = getEntityHeight();
         }
-
         if (nameLine != null && nameLine.hologram.isSpawned()) {
             if (updatePosition && !useDisplayEntities) {
                 nameLine.hologram.teleport(npcLoc.clone().add(0, getEntityHeight(), 0), TeleportCause.PLUGIN);
             }
-
             if (updateName) {
                 nameLine.setText(npc.getRawName());
             }
-
             if (useDisplayEntities && nameLine.hologram.getEntity().getVehicle() == null) {
                 npc.getEntity().addPassenger(nameLine.hologram.getEntity());
             }
         }
-
         for (int i = 0; i < lines.size(); i++) {
             HologramLine line = lines.get(i);
             NPC hologramNPC = line.hologram;
 
-            if (hologramNPC == null || !hologramNPC.isSpawned())
+            if (hologramNPC == null || !hologramNPC.isSpawned()) {
                 continue;
-
+            }
             if (line.ticks > 0 && --line.ticks == 0) {
                 line.removeNPC();
                 lines.remove(i--);
                 continue;
             }
-
             if (updatePosition && !useDisplayEntities) {
                 Location tp = npcLoc.clone().add(0, lastEntityHeight + getHeight(i), 0);
                 hologramNPC.teleport(tp, TeleportCause.PLUGIN);
             }
-
             if (useDisplayEntities && hologramNPC.getEntity().getVehicle() == null) {
                 npc.getEntity().addPassenger(hologramNPC.getEntity());
             }
-
             String text = line.text;
             if (ITEM_MATCHER.matcher(text).matches()) {
                 hologramNPC.data().set(NPC.Metadata.NAMEPLATE_VISIBLE, false);
                 continue;
             }
-
-            if (!updateName)
+            if (!updateName) {
                 continue;
-
+            }
             line.setText(text);
         }
     }
@@ -383,8 +378,9 @@ public class HologramTrait extends Trait {
         root.removeKey("lines");
         int i = 0;
         for (HologramLine line : lines) {
-            if (!line.persist)
+            if (!line.persist) {
                 continue;
+            }
             root.setString("lines." + i + ".text", line.text);
             root.setDouble("lines." + i + ".margin.top", line.mt);
             root.setDouble("lines." + i + ".margin.bottom", line.mb);
@@ -405,7 +401,6 @@ public class HologramTrait extends Trait {
             addLine(text);
             return;
         }
-
         HologramLine line = lines.get(idx);
         line.setText(text);
         if (line.hologram == null) {
@@ -441,7 +436,6 @@ public class HologramTrait extends Trait {
         } else if (type.equalsIgnoreCase("bottom")) {
             lines.get(idx).mb = margin;
         }
-
         reloadLineHolograms();
     }
 
@@ -449,11 +443,16 @@ public class HologramTrait extends Trait {
      * Implementation-specific method: {@see NPC.Metadata#HOLOGRAM_LINE_SUPPLIER}
      */
     public void setPerPlayerTextSupplier(BiFunction<String, Player, String> nameSupplier) {
-        this.customHologramSupplier = nameSupplier;
+        customHologramSupplier = nameSupplier;
     }
 
     public void setUseDisplayEntities(boolean use) {
-        this.useDisplayEntities = use;
+        useDisplayEntities = use;
+        reloadLineHolograms();
+    }
+
+    public void setViewRange(int range) {
+        this.viewRange = range;
         reloadLineHolograms();
     }
 
@@ -508,7 +507,7 @@ public class HologramTrait extends Trait {
 
         public void spawnNPC(double height) {
             String name = Placeholders.replace(text, null, npc);
-            this.hologram = createHologram(name, height);
+            hologram = createHologram(name, height);
             if (customHologramSupplier != null) {
                 hologram.data().set(NPC.Metadata.HOLOGRAM_LINE_SUPPLIER,
                         (Function<Player, String>) p -> customHologramSupplier.apply(text, p));
@@ -529,8 +528,8 @@ public class HologramTrait extends Trait {
             return Collections.emptyList();
         }
 
-        private static final List<String> LINE_ARGS = ImmutableList.of("set", "remove", "margintop", "marginbottom");
+        private static List<String> LINE_ARGS = ImmutableList.of("set", "remove", "margintop", "marginbottom");
     }
 
-    private static final Pattern ITEM_MATCHER = Pattern.compile("<item:(.*?)([:].*?)?>");
+    private static Pattern ITEM_MATCHER = Pattern.compile("<item:(.*?)([:].*?)?>");
 }
diff --git a/main/src/main/java/net/citizensnpcs/trait/LookClose.java b/main/src/main/java/net/citizensnpcs/trait/LookClose.java
index f813261a8..9ee07980e 100644
--- a/main/src/main/java/net/citizensnpcs/trait/LookClose.java
+++ b/main/src/main/java/net/citizensnpcs/trait/LookClose.java
@@ -125,7 +125,6 @@ public class LookClose extends Trait implements Toggleable {
             }
             sessions.clear();
         }
-
         if (lookingAt != null && !isValid(lookingAt)) {
             NPCLookCloseChangeTargetEvent event = new NPCLookCloseChangeTargetEvent(npc, lookingAt, null);
             Bukkit.getPluginManager().callEvent(event);
@@ -135,7 +134,6 @@ public class LookClose extends Trait implements Toggleable {
                 lookingAt = null;
             }
         }
-
         Player old = lookingAt;
         if (lookingAt != null) {
             if (randomSwitchTargets && t <= 0) {
@@ -150,19 +148,18 @@ public class LookClose extends Trait implements Toggleable {
             Location npcLoc = npc.getStoredLocation();
             for (Player player : getNearbyPlayers()) {
                 double dist = player.getLocation().distance(npcLoc);
-                if (dist > min)
+                if (dist > min) {
                     continue;
+                }
                 min = dist;
                 lookingAt = player;
             }
         }
-
         if (old != lookingAt) {
             NPCLookCloseChangeTargetEvent event = new NPCLookCloseChangeTargetEvent(npc, old, lookingAt);
             Bukkit.getPluginManager().callEvent(event);
-            if (lookingAt != event.getNewTarget() && event.getNewTarget() != null && !isValid(event.getNewTarget())) {
+            if (lookingAt != event.getNewTarget() && event.getNewTarget() != null && !isValid(event.getNewTarget()))
                 return;
-            }
             lookingAt = event.getNewTarget();
         }
     }
@@ -176,11 +173,12 @@ public class LookClose extends Trait implements Toggleable {
                         .map(e -> (Player) e).collect(Collectors.toList())
                 : CitizensAPI.getLocationLookup().getNearbyPlayers(npcLoc, range);
         for (Player player : nearby) {
-            if (player == lookingAt || (!targetNPCs && CitizensAPI.getNPCRegistry().getNPC(player) != null))
+            if (player == lookingAt || !targetNPCs && CitizensAPI.getNPCRegistry().getNPC(player) != null) {
                 continue;
-            if (player.getLocation().getWorld() != npcLoc.getWorld() || isInvisible(player))
+            }
+            if (player.getLocation().getWorld() != npcLoc.getWorld() || isInvisible(player)) {
                 continue;
-
+            }
             options.add(player);
         }
         return options;
@@ -221,9 +219,8 @@ public class LookClose extends Trait implements Toggleable {
 
     private boolean isPluginVanished(Player player) {
         for (MetadataValue meta : player.getMetadata("vanished")) {
-            if (meta.asBoolean()) {
+            if (meta.asBoolean())
                 return true;
-            }
         }
         return false;
     }
@@ -274,7 +271,6 @@ public class LookClose extends Trait implements Toggleable {
             lookingAt = null;
             return;
         }
-
         if (enableRandomLook) {
             if (!npc.getNavigator().isNavigating() && lookingAt == null && t <= 0) {
                 randomLook();
@@ -283,22 +279,15 @@ public class LookClose extends Trait implements Toggleable {
         }
         t--;
 
-        if (!enabled) {
+        if (!enabled || npc.getNavigator().isNavigating() && disableWhileNavigating()) {
             lookingAt = null;
             return;
         }
-
-        if (npc.getNavigator().isNavigating() && disableWhileNavigating()) {
-            lookingAt = null;
-            return;
-        }
-
         findNewTarget();
 
         if (npc.getNavigator().isNavigating() || npc.getNavigator().isPaused()) {
             npc.getNavigator().setPaused(lookingAt != null);
         }
-
         if (lookingAt == null)
             return;
 
@@ -348,15 +337,15 @@ public class LookClose extends Trait implements Toggleable {
      * Sets the delay between random looking in ticks
      */
     public void setRandomLookDelay(int delay) {
-        this.randomLookDelay = delay;
+        randomLookDelay = delay;
     }
 
     public void setRandomLookPitchRange(float min, float max) {
-        this.randomPitchRange = new float[] { min, max };
+        randomPitchRange = new float[] { min, max };
     }
 
     public void setRandomLookYawRange(float min, float max) {
-        this.randomYawRange = new float[] { min, max };
+        randomYawRange = new float[] { min, max };
     }
 
     public void setRandomlySwitchTargets(boolean randomSwitchTargets) {
@@ -374,11 +363,11 @@ public class LookClose extends Trait implements Toggleable {
      * Enables/disables realistic looking (using line of sight checks). More computationally expensive.
      */
     public void setRealisticLooking(boolean realistic) {
-        this.realisticLooking = realistic;
+        realisticLooking = realistic;
     }
 
     public void setTargetNPCs(boolean target) {
-        this.targetNPCs = target;
+        targetNPCs = target;
     }
 
     public boolean targetNPCs() {
diff --git a/main/src/main/java/net/citizensnpcs/trait/OcelotModifiers.java b/main/src/main/java/net/citizensnpcs/trait/OcelotModifiers.java
index a79e8052b..7a9c44e8b 100644
--- a/main/src/main/java/net/citizensnpcs/trait/OcelotModifiers.java
+++ b/main/src/main/java/net/citizensnpcs/trait/OcelotModifiers.java
@@ -35,7 +35,7 @@ public class OcelotModifiers extends Trait {
     }
 
     public void setSitting(boolean sit) {
-        this.sitting = sit;
+        sitting = sit;
         updateModifiers();
     }
 
diff --git a/main/src/main/java/net/citizensnpcs/trait/PacketNPC.java b/main/src/main/java/net/citizensnpcs/trait/PacketNPC.java
index 23add5fa6..8209a7e09 100644
--- a/main/src/main/java/net/citizensnpcs/trait/PacketNPC.java
+++ b/main/src/main/java/net/citizensnpcs/trait/PacketNPC.java
@@ -64,9 +64,8 @@ public class PacketNPC extends Trait {
     }
 
     public EntityController wrap(EntityController controller) {
-        if (!(controller instanceof PacketController)) {
+        if (!(controller instanceof PacketController))
             return new PacketController(controller);
-        }
         return controller;
     }
 
@@ -74,7 +73,7 @@ public class PacketNPC extends Trait {
         private final EntityController base;
 
         public PacketController(EntityController controller) {
-            this.base = controller;
+            base = controller;
         }
 
         @Override
diff --git a/main/src/main/java/net/citizensnpcs/trait/PausePathfindingTrait.java b/main/src/main/java/net/citizensnpcs/trait/PausePathfindingTrait.java
index 4c4f51b64..068878bb4 100644
--- a/main/src/main/java/net/citizensnpcs/trait/PausePathfindingTrait.java
+++ b/main/src/main/java/net/citizensnpcs/trait/PausePathfindingTrait.java
@@ -43,9 +43,7 @@ public class PausePathfindingTrait extends Trait {
 
     @Override
     public void run() {
-        if (playerRange == -1 || !npc.isSpawned())
-            return;
-        if (unpauseTaskId == -1 && !npc.getNavigator().isNavigating())
+        if (playerRange == -1 || !npc.isSpawned() || unpauseTaskId == -1 && !npc.getNavigator().isNavigating())
             return;
         if (CitizensAPI.getLocationLookup().getNearbyPlayers(npc.getStoredLocation(), playerRange).iterator()
                 .hasNext()) {
@@ -58,7 +56,7 @@ public class PausePathfindingTrait extends Trait {
     }
 
     public void setPlayerRangeBlocks(double range) {
-        this.playerRange = range;
+        playerRange = range;
     }
 
     public void setRightClick(boolean rightclick) {
diff --git a/main/src/main/java/net/citizensnpcs/trait/Poses.java b/main/src/main/java/net/citizensnpcs/trait/Poses.java
index 06c03ad01..bf2ad82fc 100644
--- a/main/src/main/java/net/citizensnpcs/trait/Poses.java
+++ b/main/src/main/java/net/citizensnpcs/trait/Poses.java
@@ -93,10 +93,8 @@ public class Poses extends Trait {
             paginator.addLine(line);
             i++;
         }
-
-        if (!paginator.sendPage(sender, page)) {
+        if (!paginator.sendPage(sender, page))
             throw new CommandException(Messages.COMMAND_PAGE_MISSING, page);
-        }
     }
 
     public Pose getPose(String name) {
@@ -115,7 +113,8 @@ public class Poses extends Trait {
         for (DataKey sub : key.getRelative("list").getIntegerSubKeys()) {
             try {
                 String[] parts = sub.getString("").split(";");
-                poses.put(parts[0].toLowerCase(), new Pose(parts[0], Float.valueOf(parts[1]), Float.valueOf(parts[2])));
+                poses.put(parts[0].toLowerCase(),
+                        new Pose(parts[0], Float.parseFloat(parts[1]), Float.parseFloat(parts[2])));
             } catch (NumberFormatException e) {
                 Messaging.logTr(Messages.SKIPPING_INVALID_POSE, sub.name(), e.getMessage());
             }
@@ -149,6 +148,6 @@ public class Poses extends Trait {
     }
 
     public void setDefaultPose(String pose) {
-        this.defaultPose = pose;
+        defaultPose = pose;
     }
 }
diff --git a/main/src/main/java/net/citizensnpcs/trait/Powered.java b/main/src/main/java/net/citizensnpcs/trait/Powered.java
index 35f6af001..7352fa82a 100644
--- a/main/src/main/java/net/citizensnpcs/trait/Powered.java
+++ b/main/src/main/java/net/citizensnpcs/trait/Powered.java
@@ -20,6 +20,10 @@ public class Powered extends Trait implements Toggleable {
         super("powered");
     }
 
+    public boolean isPowered() {
+        return powered;
+    }
+
     @Override
     public void onSpawn() {
         if (npc.getEntity() instanceof Creeper) {
@@ -27,10 +31,6 @@ public class Powered extends Trait implements Toggleable {
         }
     }
 
-    public boolean isPowered() {
-        return powered;
-    }
-
     @Override
     public boolean toggle() {
         powered = !powered;
diff --git a/main/src/main/java/net/citizensnpcs/trait/RotationTrait.java b/main/src/main/java/net/citizensnpcs/trait/RotationTrait.java
index 2d72164db..6555a6d6f 100644
--- a/main/src/main/java/net/citizensnpcs/trait/RotationTrait.java
+++ b/main/src/main/java/net/citizensnpcs/trait/RotationTrait.java
@@ -60,7 +60,6 @@ public class RotationTrait extends Trait {
         } else {
             packetSessions.add(lrs);
         }
-
         return lrs;
     }
 
@@ -82,11 +81,9 @@ public class RotationTrait extends Trait {
             return lrs;
 
         for (PacketRotationSession session : packetSessions) {
-            if (session.accepts(player) && session.triple != null) {
+            if (session.accepts(player) && session.triple != null)
                 return session;
-            }
         }
-
         return null;
     }
 
@@ -102,31 +99,28 @@ public class RotationTrait extends Trait {
         if (npc.data().get(NPC.Metadata.RESET_PITCH_ON_TICK, false)) {
             NMS.setPitch(npc.getEntity(), 0);
         }
-
         Set<PacketRotationSession> ran = Sets.newHashSet();
         for (Iterator<PacketRotationSession> itr = Iterables.concat(packetSessions, packetSessionsByUUID.values())
                 .iterator(); itr.hasNext();) {
             PacketRotationSession session = itr.next();
-            if (ran.contains(session))
+            if (ran.contains(session)) {
                 continue;
-
+            }
             ran.add(session);
             session.run(npc.getEntity());
             if (!session.isActive()) {
                 itr.remove();
             }
         }
-
-        if (npc.getNavigator().isNavigating()) {
+        if (npc.getNavigator().isNavigating())
             // npc.yHeadRot = rotateIfNecessary(npc.yHeadRot, npc.yBodyRot, 75);
             return;
-        }
 
         globalSession.run(new EntityRotation(npc.getEntity()));
     }
 
     private static class EntityRotation extends RotationTriple {
-        protected final Entity entity;
+        protected Entity entity;
 
         public EntityRotation(Entity entity) {
             super(NMS.getYaw(entity), NMS.getHeadYaw(entity), entity.getLocation().getPitch());
@@ -158,7 +152,7 @@ public class RotationTrait extends Trait {
         }
 
         public void end() {
-            this.ended = true;
+            ended = true;
         }
 
         public float getBodyYaw() {
@@ -193,7 +187,6 @@ public class RotationTrait extends Trait {
             if (triple == null) {
                 triple = new PacketRotationTriple(entity);
             }
-
             session.run(triple);
             if (!session.isActive()) {
                 triple = null;
@@ -265,7 +258,7 @@ public class RotationTrait extends Trait {
         }
 
         public RotationParams linkedBody(boolean linked) {
-            this.linkedBody = linked;
+            linkedBody = linked;
             return this;
         }
 
@@ -297,12 +290,12 @@ public class RotationTrait extends Trait {
         }
 
         public RotationParams maxPitchPerTick(float val) {
-            this.maxPitchPerTick = val;
+            maxPitchPerTick = val;
             return this;
         }
 
         public RotationParams maxYawPerTick(float val) {
-            this.maxYawPerTick = val;
+            maxYawPerTick = val;
             return this;
         }
 
@@ -312,7 +305,7 @@ public class RotationTrait extends Trait {
         }
 
         public RotationParams pitchRange(float[] val) {
-            this.pitchRange = val;
+            pitchRange = val;
             return this;
         }
 
@@ -343,29 +336,24 @@ public class RotationTrait extends Trait {
             if (headOnly) {
                 key.setBoolean("headOnly", headOnly);
             }
-
             if (immediate) {
                 key.setBoolean("immediate", immediate);
             }
-
             if (maxPitchPerTick != 10) {
                 key.setDouble("maxPitchPerTick", maxPitchPerTick);
             } else {
                 key.removeKey("maxPitchPerTick");
             }
-
             if (maxYawPerTick != 40) {
                 key.setDouble("maxYawPerTick", maxYawPerTick);
             } else {
                 key.removeKey("maxYawPerTick");
             }
-
             if (pitchRange[0] != -180 || pitchRange[1] != 180) {
                 key.setString("pitchRange", pitchRange[0] + "," + pitchRange[1]);
             } else {
                 key.removeKey("pitchRange");
             }
-
             if (yawRange[0] != -180 || yawRange[1] != 180) {
                 key.setString("yawRange", yawRange[0] + "," + yawRange[1]);
             } else {
@@ -374,7 +362,7 @@ public class RotationTrait extends Trait {
         }
 
         public RotationParams uuidFilter(List<UUID> uuids) {
-            this.uuidFilter = uuids;
+            uuidFilter = uuids;
             return this;
         }
 
@@ -383,7 +371,7 @@ public class RotationTrait extends Trait {
         }
 
         public RotationParams yawRange(float[] val) {
-            this.yawRange = val;
+            yawRange = val;
             return this;
         }
     }
@@ -489,21 +477,18 @@ public class RotationTrait extends Trait {
                     rot.bodyYaw = Math.abs(body - lo) > Math.abs(body - hi) ? hi : lo;
                 }
             }
-
             rot.pitch = params.immediate ? getTargetPitch() : params.rotatePitchTowards(t, rot.pitch, getTargetPitch());
             t++;
 
             if (params.linkedBody) {
                 rot.bodyYaw = rot.headYaw;
             }
-
             if (Math.abs(rot.pitch - getTargetPitch()) + Math.abs(rot.headYaw - getTargetYaw()) < 0.1) {
                 t = -1;
                 if (!params.headOnly) {
                     rot.bodyYaw = rot.headYaw;
                 }
             }
-
             rot.apply();
         }
     }
diff --git a/main/src/main/java/net/citizensnpcs/trait/ScoreboardTrait.java b/main/src/main/java/net/citizensnpcs/trait/ScoreboardTrait.java
index 0b5c454dd..d5b746369 100644
--- a/main/src/main/java/net/citizensnpcs/trait/ScoreboardTrait.java
+++ b/main/src/main/java/net/citizensnpcs/trait/ScoreboardTrait.java
@@ -35,18 +35,20 @@ public class ScoreboardTrait extends Trait {
     private final PerPlayerMetadata<Boolean> metadata;
     private ChatColor previousGlowingColor;
     @Persist
-    private Set<String> tags = new HashSet<String>();
+    private Set<String> tags = new HashSet<>();
 
     public ScoreboardTrait() {
         super("scoreboardtrait");
         metadata = CitizensAPI.getLocationLookup().<Boolean> registerMetadata("scoreboard", (meta, event) -> {
             for (NPC npc : CitizensAPI.getNPCRegistry()) {
                 ScoreboardTrait trait = npc.getTraitNullable(ScoreboardTrait.class);
-                if (trait == null)
+                if (trait == null) {
                     continue;
+                }
                 Team team = trait.getTeam();
-                if (team == null || meta.has(event.getPlayer().getUniqueId(), team.getName()))
+                if (team == null || meta.has(event.getPlayer().getUniqueId(), team.getName())) {
                     continue;
+                }
                 NMS.sendTeamPacket(event.getPlayer(), team, 0);
                 meta.set(event.getPlayer().getUniqueId(), team.getName(), true);
             }
@@ -161,13 +163,11 @@ public class ScoreboardTrait extends Trait {
             npc.data().remove(NPC.Metadata.SCOREBOARD_FAKE_TEAM_NAME);
             return;
         }
-
         if (npc.isSpawned()) {
             lastName = npc.getEntity() instanceof Player && npc.getEntity().getName() != null
                     ? npc.getEntity().getName()
                     : npc.getUniqueId().toString();
         }
-
         if (SUPPORT_TAGS) {
             try {
                 if (!npc.getEntity().getScoreboardTags().equals(tags)) {
@@ -177,7 +177,6 @@ public class ScoreboardTrait extends Trait {
                 SUPPORT_TAGS = false;
             }
         }
-
         if (SUPPORT_TEAM_SETOPTION) {
             try {
                 OptionStatus visibility = nameVisibility ? OptionStatus.ALWAYS : OptionStatus.NEVER;
@@ -193,7 +192,6 @@ public class ScoreboardTrait extends Trait {
         } else {
             NMS.setTeamNameTagVisible(team, nameVisibility);
         }
-
         if (SUPPORT_COLLIDABLE_SETOPTION) {
             try {
                 OptionStatus collide = npc.data().<Boolean> get(NPC.Metadata.COLLIDABLE, !npc.isProtected())
@@ -209,7 +207,6 @@ public class ScoreboardTrait extends Trait {
                 SUPPORT_COLLIDABLE_SETOPTION = false;
             }
         }
-
         if (color != null) {
             if (SUPPORT_GLOWING_COLOR && SpigotUtil.getMinecraftPackage().contains("1_12_R1")) {
                 SUPPORT_GLOWING_COLOR = false;
@@ -217,7 +214,7 @@ public class ScoreboardTrait extends Trait {
             if (SUPPORT_GLOWING_COLOR) {
                 try {
                     if (team.getColor() == null || previousGlowingColor == null
-                            || (previousGlowingColor != null && color != previousGlowingColor)) {
+                            || previousGlowingColor != null && color != previousGlowingColor) {
                         team.setColor(color);
                         previousGlowingColor = color;
                         changed = true;
@@ -225,22 +222,19 @@ public class ScoreboardTrait extends Trait {
                 } catch (NoSuchMethodError err) {
                     SUPPORT_GLOWING_COLOR = false;
                 }
-            } else {
-                if (team.getPrefix() == null || team.getPrefix().length() == 0 || previousGlowingColor == null
-                        || (previousGlowingColor != null
-                                && !team.getPrefix().equals(previousGlowingColor.toString()))) {
-                    team.setPrefix(color.toString());
-                    previousGlowingColor = color;
-                    changed = true;
-                }
+            } else if (team.getPrefix() == null || team.getPrefix().length() == 0 || previousGlowingColor == null
+                    || previousGlowingColor != null && !team.getPrefix().equals(previousGlowingColor.toString())) {
+                team.setPrefix(color.toString());
+                previousGlowingColor = color;
+                changed = true;
             }
         }
-
         if (!changed)
             return;
         for (Player player : Bukkit.getOnlinePlayers()) {
-            if (player.hasMetadata("NPC"))
+            if (player.hasMetadata("NPC")) {
                 continue;
+            }
             if (metadata.has(player.getUniqueId(), team.getName())) {
                 NMS.sendTeamPacket(player, team, 2);
             } else {
diff --git a/main/src/main/java/net/citizensnpcs/trait/SheepTrait.java b/main/src/main/java/net/citizensnpcs/trait/SheepTrait.java
index 4bf940605..4f120fae4 100644
--- a/main/src/main/java/net/citizensnpcs/trait/SheepTrait.java
+++ b/main/src/main/java/net/citizensnpcs/trait/SheepTrait.java
@@ -34,7 +34,7 @@ public class SheepTrait extends Trait {
 
     @EventHandler
     private void onPlayerShearEntityEvent(PlayerShearEntityEvent event) {
-        if (npc != null && npc.equals(CitizensAPI.getNPCRegistry().getNPC(event.getEntity()))) {
+        if (npc != null && npc.isProtected() && npc.equals(CitizensAPI.getNPCRegistry().getNPC(event.getEntity()))) {
             event.setCancelled(true);
         }
     }
diff --git a/main/src/main/java/net/citizensnpcs/trait/SitTrait.java b/main/src/main/java/net/citizensnpcs/trait/SitTrait.java
index e23b55f25..af10d2900 100644
--- a/main/src/main/java/net/citizensnpcs/trait/SitTrait.java
+++ b/main/src/main/java/net/citizensnpcs/trait/SitTrait.java
@@ -35,7 +35,6 @@ public class SitTrait extends Trait {
             ((Sittable) npc.getEntity()).setSitting(false);
             return;
         }
-
         if (chair != null) {
             if (chair.getEntity() != null) {
                 chair.getEntity().eject();
@@ -72,7 +71,6 @@ public class SitTrait extends Trait {
             }
             return;
         }
-
         if (chair == null) {
             NPCRegistry registry = CitizensAPI.getNamedNPCRegistry("SitRegistry");
             if (registry == null) {
@@ -85,22 +83,19 @@ public class SitTrait extends Trait {
                 return;
             }
         }
-
         if (chair.isSpawned() && !NMS.getPassengers(chair.getEntity()).contains(npc.getEntity())) {
             NMS.mount(chair.getEntity(), npc.getEntity());
         }
-
         if (chair.getStoredLocation() != null && chair.getStoredLocation().distance(sittingAt) >= 0.03) {
             chair.teleport(sittingAt.clone(), TeleportCause.PLUGIN);
         }
     }
 
     public void setSitting(Location at) {
-        this.sittingAt = at != null ? at.clone() : null;
+        sittingAt = at != null ? at.clone() : null;
         if (requiresPassengerOffsetCorrection()) {
             sittingAt = sittingAt.add(0, 0.3, 0);
         }
-
         if (at == null) {
             onDespawn();
         }
diff --git a/main/src/main/java/net/citizensnpcs/trait/SkinLayers.java b/main/src/main/java/net/citizensnpcs/trait/SkinLayers.java
index d389c4b5c..7d4406863 100644
--- a/main/src/main/java/net/citizensnpcs/trait/SkinLayers.java
+++ b/main/src/main/java/net/citizensnpcs/trait/SkinLayers.java
@@ -258,10 +258,10 @@ public class SkinLayers extends Trait {
         RIGHT_PANTS(5),
         RIGHT_SLEEVE(3);
 
-        final int flag;
+        int flag;
 
         Layer(int offset) {
-            this.flag = 1 << offset;
+            flag = 1 << offset;
         }
 
         public static byte toByte(Set<Layer> flags) {
diff --git a/main/src/main/java/net/citizensnpcs/trait/SkinTrait.java b/main/src/main/java/net/citizensnpcs/trait/SkinTrait.java
index 7df4ea914..80a36d670 100644
--- a/main/src/main/java/net/citizensnpcs/trait/SkinTrait.java
+++ b/main/src/main/java/net/citizensnpcs/trait/SkinTrait.java
@@ -109,14 +109,14 @@ public class SkinTrait extends Trait {
      * @see #fetchDefaultSkin
      */
     public void setFetchDefaultSkin(boolean fetch) {
-        this.fetchDefaultSkin = fetch;
+        fetchDefaultSkin = fetch;
     }
 
     /**
      * @see #shouldUpdateSkins()
      */
     public void setShouldUpdateSkins(boolean update) {
-        this.updateSkins = update;
+        updateSkins = update;
     }
 
     /**
@@ -170,14 +170,14 @@ public class SkinTrait extends Trait {
             throw new IllegalArgumentException("Invalid texture data");
 
         this.signature = signature;
-        this.textureRaw = data;
-        this.updateSkins = false;
+        textureRaw = data;
+        updateSkins = false;
         npc.data().setPersistent(Skin.CACHED_SKIN_UUID_NAME_METADATA, skinName.toLowerCase());
         onSkinChange(false);
     }
 
     public void setTexture(String value, String signature) {
-        this.textureRaw = value;
+        textureRaw = value;
         this.signature = signature;
     }
 
diff --git a/main/src/main/java/net/citizensnpcs/trait/SleepTrait.java b/main/src/main/java/net/citizensnpcs/trait/SleepTrait.java
index 2540c7379..b81ae64a2 100644
--- a/main/src/main/java/net/citizensnpcs/trait/SleepTrait.java
+++ b/main/src/main/java/net/citizensnpcs/trait/SleepTrait.java
@@ -36,7 +36,6 @@ public class SleepTrait extends Trait {
             }
             return;
         }
-
         if (SUPPORT_BLOCKDATA == null) {
             try {
                 SUPPORT_BLOCKDATA = true;
@@ -45,14 +44,13 @@ public class SleepTrait extends Trait {
                 SUPPORT_BLOCKDATA = false;
             }
         }
-
         if (npc.getEntity() instanceof Player) {
             Player player = (Player) npc.getEntity();
             if (!SUPPORT_BLOCKSTATE) {
                 NMS.sleep(player, true);
             } else {
                 try {
-                    if ((SUPPORT_BLOCKDATA && at.getBlock().getBlockData() instanceof Bed)
+                    if (SUPPORT_BLOCKDATA && at.getBlock().getBlockData() instanceof Bed
                             || at.getBlock().getState() instanceof Bed) {
                         player.sleep(at, true);
                     } else {
diff --git a/main/src/main/java/net/citizensnpcs/trait/SneakTrait.java b/main/src/main/java/net/citizensnpcs/trait/SneakTrait.java
index 19ccbb274..7773a4c1a 100644
--- a/main/src/main/java/net/citizensnpcs/trait/SneakTrait.java
+++ b/main/src/main/java/net/citizensnpcs/trait/SneakTrait.java
@@ -39,7 +39,7 @@ public class SneakTrait extends Trait {
     }
 
     public void setSneaking(boolean sneak) {
-        this.sneaking = sneak;
+        sneaking = sneak;
         apply();
     }
 }
\ No newline at end of file
diff --git a/main/src/main/java/net/citizensnpcs/trait/WolfModifiers.java b/main/src/main/java/net/citizensnpcs/trait/WolfModifiers.java
index f557c89b6..6ec1600ef 100644
--- a/main/src/main/java/net/citizensnpcs/trait/WolfModifiers.java
+++ b/main/src/main/java/net/citizensnpcs/trait/WolfModifiers.java
@@ -54,7 +54,7 @@ public class WolfModifiers extends Trait {
     }
 
     public void setCollarColor(DyeColor color) {
-        this.collarColor = color;
+        collarColor = color;
         updateModifiers();
     }
 
diff --git a/main/src/main/java/net/citizensnpcs/trait/shop/CommandAction.java b/main/src/main/java/net/citizensnpcs/trait/shop/CommandAction.java
index 967cb8ad6..8f5d684a6 100644
--- a/main/src/main/java/net/citizensnpcs/trait/shop/CommandAction.java
+++ b/main/src/main/java/net/citizensnpcs/trait/shop/CommandAction.java
@@ -98,7 +98,7 @@ public class CommandAction extends NPCShopAction {
         @Override
         public void initialise(MenuContext ctx) {
             for (int i = 0; i < 3 * 9; i++) {
-                final int idx = i;
+                int idx = i;
                 ctx.getSlot(i).clear();
                 if (i < base.commands.size()) {
                     ctx.getSlot(i).setItemStack(new ItemStack(Material.FEATHER), "<f>Set command",
@@ -114,7 +114,7 @@ public class CommandAction extends NPCShopAction {
                         return;
                     }
                     ctx.getMenu().transition(InputMenus
-                            .stringSetter(() -> idx < base.commands.size() ? base.commands.get(idx) : "", (res) -> {
+                            .stringSetter(() -> idx < base.commands.size() ? base.commands.get(idx) : "", res -> {
                                 if (res == null) {
                                     if (idx < base.commands.size()) {
                                         base.commands.remove(idx);
@@ -131,11 +131,11 @@ public class CommandAction extends NPCShopAction {
             }
             ctx.getSlot(3 * 9 + 3).setItemStack(new ItemStack(Util.getFallbackMaterial("COMMAND_BLOCK", "COMMAND")),
                     "Run commands as server", base.server ? ChatColor.GREEN + "On" : ChatColor.RED + "OFF");
-            ctx.getSlot(3 * 9 + 3).addClickHandler(InputMenus.toggler((res) -> base.server = res, base.server));
+            ctx.getSlot(3 * 9 + 3).addClickHandler(InputMenus.toggler(res -> base.server = res, base.server));
             ctx.getSlot(3 * 9 + 4).setItemStack(
                     new ItemStack(Util.getFallbackMaterial("COMPARATOR", "REDSTONE_COMPARATOR")), "Run commands as op",
                     base.op ? ChatColor.GREEN + "On" : ChatColor.RED + "OFF");
-            ctx.getSlot(3 * 9 + 4).addClickHandler(InputMenus.clickToggle((res) -> {
+            ctx.getSlot(3 * 9 + 4).addClickHandler(InputMenus.clickToggle(res -> {
                 base.op = res;
                 return res ? ChatColor.GREEN + "On" : ChatColor.RED + "Off";
             }, base.server));
diff --git a/main/src/main/java/net/citizensnpcs/trait/shop/ExperienceAction.java b/main/src/main/java/net/citizensnpcs/trait/shop/ExperienceAction.java
index 0f93b1da1..93ae97515 100644
--- a/main/src/main/java/net/citizensnpcs/trait/shop/ExperienceAction.java
+++ b/main/src/main/java/net/citizensnpcs/trait/shop/ExperienceAction.java
@@ -20,7 +20,7 @@ public class ExperienceAction extends NPCShopAction {
     }
 
     public ExperienceAction(int cost) {
-        this.exp = cost;
+        exp = cost;
     }
 
     @Override
@@ -32,6 +32,7 @@ public class ExperienceAction extends NPCShopAction {
     public int getMaxRepeats(Entity entity) {
         if (!(entity instanceof Player))
             return 0;
+
         return ((Player) entity).getLevel() / exp;
     }
 
@@ -39,11 +40,10 @@ public class ExperienceAction extends NPCShopAction {
     public Transaction grant(Entity entity, int repeats) {
         if (!(entity instanceof Player))
             return Transaction.fail();
+
         Player player = (Player) entity;
         int amount = exp * repeats;
-        return Transaction.create(() -> {
-            return true;
-        }, () -> {
+        return Transaction.create(() -> true, () -> {
             player.setLevel(player.getLevel() + amount);
         }, () -> {
             player.setLevel(player.getLevel() - amount);
@@ -54,11 +54,10 @@ public class ExperienceAction extends NPCShopAction {
     public Transaction take(Entity entity, int repeats) {
         if (!(entity instanceof Player))
             return Transaction.fail();
+
         Player player = (Player) entity;
         int amount = exp * repeats;
-        return Transaction.create(() -> {
-            return player.getLevel() >= amount;
-        }, () -> {
+        return Transaction.create(() -> (player.getLevel() >= amount), () -> {
             player.setLevel(player.getLevel() - amount);
         }, () -> {
             player.setLevel(player.getLevel() + amount);
@@ -68,12 +67,13 @@ public class ExperienceAction extends NPCShopAction {
     public static class ExperienceActionGUI implements GUI {
         @Override
         public InventoryMenuPage createEditor(NPCShopAction previous, Consumer<NPCShopAction> callback) {
-            final ExperienceAction action = previous == null ? new ExperienceAction() : (ExperienceAction) previous;
+            ExperienceAction action = previous == null ? new ExperienceAction() : (ExperienceAction) previous;
             return InputMenus.filteredStringSetter(() -> Integer.toString(action.exp), s -> {
                 try {
                     int result = Integer.parseInt(s);
                     if (result < 0)
                         return false;
+
                     action.exp = result;
                 } catch (NumberFormatException nfe) {
                     return false;
diff --git a/main/src/main/java/net/citizensnpcs/trait/shop/ItemAction.java b/main/src/main/java/net/citizensnpcs/trait/shop/ItemAction.java
index 36a776efb..90fe45fcb 100644
--- a/main/src/main/java/net/citizensnpcs/trait/shop/ItemAction.java
+++ b/main/src/main/java/net/citizensnpcs/trait/shop/ItemAction.java
@@ -56,18 +56,18 @@ public class ItemAction extends NPCShopAction {
         ItemStack[] contents = source.getContents();
         for (int i = 0; i < contents.length; i++) {
             ItemStack toMatch = contents[i];
-            if (toMatch == null || toMatch.getType() == Material.AIR)
-                continue;
-            if (tooDamaged(toMatch))
+            if (toMatch == null || toMatch.getType() == Material.AIR || tooDamaged(toMatch)) {
                 continue;
+            }
             toMatch = toMatch.clone();
             for (int j = 0; j < items.size(); j++) {
-                if (toMatch == null)
+                if (toMatch == null) {
                     break;
+                }
                 ItemStack item = items.get(j);
-                if (req.get(j) <= 0 || !matches(item, toMatch))
+                if (req.get(j) <= 0 || !matches(item, toMatch)) {
                     continue;
-
+                }
                 int remaining = req.get(j);
                 int taken = toMatch.getAmount() > remaining ? remaining : toMatch.getAmount();
 
@@ -76,7 +76,6 @@ public class ItemAction extends NPCShopAction {
                 } else {
                     toMatch.setAmount(toMatch.getAmount() - taken);
                 }
-
                 if (modify) {
                     if (toMatch == null) {
                         source.clear(i);
@@ -92,9 +91,8 @@ public class ItemAction extends NPCShopAction {
 
     @Override
     public String describe() {
-        if (items.size() == 1) {
+        if (items.size() == 1)
             return items.get(0).getAmount() + " " + Util.prettyEnum(items.get(0).getType());
-        }
         String description = items.size() + " items";
         for (int i = 0; i < items.size(); i++) {
             ItemStack item = items.get(i);
@@ -113,24 +111,25 @@ public class ItemAction extends NPCShopAction {
             return 0;
 
         Inventory source = ((InventoryHolder) entity).getInventory();
-        List<Integer> req = items.stream().map(i -> i.getAmount()).collect(Collectors.toList());
+        List<Integer> req = items.stream().map(ItemStack::getAmount).collect(Collectors.toList());
         List<Integer> has = items.stream().map(i -> 0).collect(Collectors.toList());
         ItemStack[] contents = source.getContents();
         for (int i = 0; i < contents.length; i++) {
             ItemStack toMatch = contents[i];
-            if (toMatch == null || toMatch.getType() == Material.AIR)
-                continue;
-            if (tooDamaged(toMatch))
+            if (toMatch == null || toMatch.getType() == Material.AIR || tooDamaged(toMatch))
                 continue;
+
             toMatch = toMatch.clone();
             for (int j = 0; j < items.size(); j++) {
                 if (!matches(items.get(j), toMatch))
                     continue;
+
                 int remaining = req.get(j);
                 int taken = toMatch.getAmount() > remaining ? remaining : toMatch.getAmount();
                 has.set(j, has.get(j) + taken);
-                if (toMatch.getAmount() - taken <= 0)
+                if (toMatch.getAmount() - taken <= 0) {
                     break;
+                }
                 toMatch.setAmount(toMatch.getAmount() - taken);
             }
         }
@@ -164,12 +163,12 @@ public class ItemAction extends NPCShopAction {
     }
 
     private boolean matches(ItemStack a, ItemStack b) {
-        if (a.getType() != b.getType())
-            return false;
-        if (metaFilter.size() > 0 && !metaMatches(a, b, metaFilter))
+        if (a.getType() != b.getType() || metaFilter.size() > 0 && !metaMatches(a, b, metaFilter))
             return false;
+
         if (compareSimilarity && !a.isSimilar(b))
             return false;
+
         return true;
     }
 
@@ -181,22 +180,20 @@ public class ItemAction extends NPCShopAction {
             Tag acc = source;
             Tag cmp = compare;
             for (int i = 0; i < parts.length; i++) {
-                if (acc == null)
-                    return false;
-                if (cmp == null)
+                if (acc == null || cmp == null)
                     return false;
                 if (i < parts.length - 1) {
                     if (!(acc instanceof CompoundTag) || !(cmp instanceof CompoundTag))
                         return false;
-                    if (parts[i].equals(acc.getName()) && acc.getName().equals(cmp.getName()))
+                    if (parts[i].equals(acc.getName()) && acc.getName().equals(cmp.getName())) {
                         continue;
+                    }
                     acc = ((CompoundTag) acc).getValue().get(parts[i]);
                     cmp = ((CompoundTag) cmp).getValue().get(parts[i]);
                     continue;
                 }
-                if (!acc.getName().equals(parts[i]) || !cmp.getName().equals(parts[i]))
-                    return false;
-                if (!acc.getValue().equals(cmp.getValue()))
+                if (!acc.getName().equals(parts[i]) || !cmp.getName().equals(parts[i])
+                        || !acc.getValue().equals(cmp.getValue()))
                     return false;
             }
         }
@@ -207,10 +204,9 @@ public class ItemAction extends NPCShopAction {
     public Transaction take(Entity entity, int repeats) {
         if (!(entity instanceof InventoryHolder))
             return Transaction.fail();
+
         Inventory source = ((InventoryHolder) entity).getInventory();
-        return Transaction.create(() -> {
-            return containsItems(source, repeats, false);
-        }, () -> {
+        return Transaction.create(() -> containsItems(source, repeats, false), () -> {
             containsItems(source, repeats, true);
         }, () -> {
             source.addItem(items.stream().map(ItemStack::clone).toArray(ItemStack[]::new));
@@ -220,8 +216,10 @@ public class ItemAction extends NPCShopAction {
     private boolean tooDamaged(ItemStack toMatch) {
         if (!requireUndamaged)
             return false;
+
         if (SpigotUtil.isUsing1_13API())
             return toMatch.getItemMeta() instanceof Damageable && ((Damageable) toMatch.getItemMeta()).getDamage() != 0;
+
         return toMatch.getDurability() == toMatch.getType().getMaxDurability();
     }
 
@@ -253,20 +251,19 @@ public class ItemAction extends NPCShopAction {
                     event.setCancelled(true);
                 });
             }
-
             ctx.getSlot(3 * 9 + 1).setItemStack(new ItemStack(Material.ANVIL), "Must have no damage",
                     base.requireUndamaged ? ChatColor.GREEN + "On" : ChatColor.RED + "Off");
             ctx.getSlot(3 * 9 + 1)
-                    .addClickHandler(InputMenus.toggler((res) -> base.requireUndamaged = res, base.requireUndamaged));
+                    .addClickHandler(InputMenus.toggler(res -> base.requireUndamaged = res, base.requireUndamaged));
             ctx.getSlot(3 * 9 + 2).setItemStack(
                     new ItemStack(Util.getFallbackMaterial("COMPARATOR", "REDSTONE_COMPARATOR")),
                     "Compare item similarity", base.compareSimilarity ? ChatColor.GREEN + "On" : ChatColor.RED + "Off");
             ctx.getSlot(3 * 9 + 2)
-                    .addClickHandler(InputMenus.toggler((res) -> base.compareSimilarity = res, base.compareSimilarity));
+                    .addClickHandler(InputMenus.toggler(res -> base.compareSimilarity = res, base.compareSimilarity));
             ctx.getSlot(3 * 9 + 3).setItemStack(new ItemStack(Material.BOOK), "NBT comparison filter",
                     Joiner.on("\n").join(base.metaFilter));
             ctx.getSlot(3 * 9 + 3)
-                    .addClickHandler((event) -> ctx.getMenu()
+                    .addClickHandler(event -> ctx.getMenu()
                             .transition(InputMenus.stringSetter(() -> Joiner.on(',').join(base.metaFilter),
                                     res -> base.metaFilter = res == null ? null : Arrays.asList(res.split(",")))));
         }
diff --git a/main/src/main/java/net/citizensnpcs/trait/shop/MoneyAction.java b/main/src/main/java/net/citizensnpcs/trait/shop/MoneyAction.java
index 747684a96..3dea495e8 100644
--- a/main/src/main/java/net/citizensnpcs/trait/shop/MoneyAction.java
+++ b/main/src/main/java/net/citizensnpcs/trait/shop/MoneyAction.java
@@ -22,7 +22,7 @@ public class MoneyAction extends NPCShopAction {
     }
 
     public MoneyAction(double cost) {
-        this.money = cost;
+        money = cost;
     }
 
     @Override
@@ -35,6 +35,7 @@ public class MoneyAction extends NPCShopAction {
     public int getMaxRepeats(Entity entity) {
         if (!(entity instanceof Player))
             return 0;
+
         Economy economy = Bukkit.getServicesManager().getRegistration(Economy.class).getProvider();
         return (int) Math.floor(economy.getBalance((Player) entity) / money);
     }
@@ -43,12 +44,12 @@ public class MoneyAction extends NPCShopAction {
     public Transaction grant(Entity entity, int repeats) {
         if (!(entity instanceof Player))
             return Transaction.fail();
+
         Economy economy = Bukkit.getServicesManager().getRegistration(Economy.class).getProvider();
         Player player = (Player) entity;
         double amount = money * repeats;
-        return Transaction.create(() -> {
-            return true;
-        }, () -> {
+
+        return Transaction.create(() -> true, () -> {
             economy.depositPlayer(player, amount);
         }, () -> {
             economy.withdrawPlayer(player, amount);
@@ -59,12 +60,12 @@ public class MoneyAction extends NPCShopAction {
     public Transaction take(Entity entity, int repeats) {
         if (!(entity instanceof Player))
             return Transaction.fail();
+
         Economy economy = Bukkit.getServicesManager().getRegistration(Economy.class).getProvider();
         Player player = (Player) entity;
         double amount = money * repeats;
-        return Transaction.create(() -> {
-            return economy.has(player, amount);
-        }, () -> {
+
+        return Transaction.create(() -> economy.has(player, amount), () -> {
             economy.withdrawPlayer(player, amount);
         }, () -> {
             economy.depositPlayer(player, amount);
@@ -76,12 +77,13 @@ public class MoneyAction extends NPCShopAction {
 
         @Override
         public InventoryMenuPage createEditor(NPCShopAction previous, Consumer<NPCShopAction> callback) {
-            final MoneyAction action = previous == null ? new MoneyAction() : (MoneyAction) previous;
-            return InputMenus.filteredStringSetter(() -> Double.toString(action.money), (s) -> {
+            MoneyAction action = previous == null ? new MoneyAction() : (MoneyAction) previous;
+            return InputMenus.filteredStringSetter(() -> Double.toString(action.money), s -> {
                 try {
                     double result = Double.parseDouble(s);
                     if (result < 0)
                         return false;
+
                     action.money = result;
                 } catch (NumberFormatException nfe) {
                     return false;
@@ -100,9 +102,9 @@ public class MoneyAction extends NPCShopAction {
                     supported = false;
                 }
             }
-            if (!supported) {
+            if (!supported)
                 return null;
-            }
+
             String description = null;
             if (previous != null) {
                 MoneyAction old = (MoneyAction) previous;
diff --git a/main/src/main/java/net/citizensnpcs/trait/shop/NPCShopAction.java b/main/src/main/java/net/citizensnpcs/trait/shop/NPCShopAction.java
index 9dc94c0eb..a6a37ad58 100644
--- a/main/src/main/java/net/citizensnpcs/trait/shop/NPCShopAction.java
+++ b/main/src/main/java/net/citizensnpcs/trait/shop/NPCShopAction.java
@@ -45,7 +45,7 @@ public abstract class NPCShopAction implements Cloneable {
         private final Runnable rollback;
 
         public Transaction(Supplier<Boolean> isPossible, Runnable execute, Runnable rollback) {
-            this.possible = isPossible;
+            possible = isPossible;
             this.execute = execute;
             this.rollback = rollback;
         }
@@ -88,7 +88,6 @@ public abstract class NPCShopAction implements Cloneable {
         GUI.add(gui);
     }
 
-    private static final List<GUI> GUI = Lists.newArrayList();
-    private static final PersisterRegistry<NPCShopAction> REGISTRY = PersistenceLoader
-            .createRegistry(NPCShopAction.class);
+    private static List<GUI> GUI = Lists.newArrayList();
+    private static PersisterRegistry<NPCShopAction> REGISTRY = PersistenceLoader.createRegistry(NPCShopAction.class);
 }
\ No newline at end of file
diff --git a/main/src/main/java/net/citizensnpcs/trait/shop/PermissionAction.java b/main/src/main/java/net/citizensnpcs/trait/shop/PermissionAction.java
index 5adb27f06..524a81c72 100644
--- a/main/src/main/java/net/citizensnpcs/trait/shop/PermissionAction.java
+++ b/main/src/main/java/net/citizensnpcs/trait/shop/PermissionAction.java
@@ -56,9 +56,7 @@ public class PermissionAction extends NPCShopAction {
             return Transaction.fail();
         Player player = (Player) entity;
         Permission perm = Bukkit.getServicesManager().getRegistration(Permission.class).getProvider();
-        return Transaction.create(() -> {
-            return true;
-        }, () -> {
+        return Transaction.create(() -> true, () -> {
             for (String permission : permissions) {
                 perm.playerAdd(null, player, Placeholders.replace(permission, player));
             }
@@ -77,9 +75,8 @@ public class PermissionAction extends NPCShopAction {
         Permission perm = Bukkit.getServicesManager().getRegistration(Permission.class).getProvider();
         return Transaction.create(() -> {
             for (String permission : permissions) {
-                if (!perm.playerHas(player, Placeholders.replace(permission, player))) {
+                if (!perm.playerHas(player, Placeholders.replace(permission, player)))
                     return false;
-                }
             }
             return true;
         }, () -> {
@@ -109,7 +106,7 @@ public class PermissionAction extends NPCShopAction {
         @Override
         public void initialise(MenuContext ctx) {
             for (int i = 0; i < 3 * 9; i++) {
-                final int idx = i;
+                int idx = i;
                 ctx.getSlot(i).clear();
                 if (i < base.permissions.size()) {
                     ctx.getSlot(i).setItemStack(new ItemStack(Material.FEATHER), "<f>Set permission",
@@ -124,8 +121,8 @@ public class PermissionAction extends NPCShopAction {
                         }
                         return;
                     }
-                    ctx.getMenu().transition(InputMenus.stringSetter(
-                            () -> idx < base.permissions.size() ? base.permissions.get(idx) : "", (res) -> {
+                    ctx.getMenu().transition(InputMenus
+                            .stringSetter(() -> idx < base.permissions.size() ? base.permissions.get(idx) : "", res -> {
                                 if (res == null) {
                                     if (idx < base.permissions.size()) {
                                         base.permissions.remove(idx);
@@ -166,9 +163,8 @@ public class PermissionAction extends NPCShopAction {
                     supported = false;
                 }
             }
-            if (!supported) {
+            if (!supported)
                 return null;
-            }
             String description = null;
             if (previous != null) {
                 PermissionAction old = (PermissionAction) previous;
diff --git a/main/src/main/java/net/citizensnpcs/trait/text/Text.java b/main/src/main/java/net/citizensnpcs/trait/text/Text.java
index 106d1dab9..129a2b254 100644
--- a/main/src/main/java/net/citizensnpcs/trait/text/Text.java
+++ b/main/src/main/java/net/citizensnpcs/trait/text/Text.java
@@ -55,11 +55,11 @@ public class Text extends Trait implements Runnable, Listener {
     private boolean speechBubbles;
     @Persist(value = "talk-close")
     private boolean talkClose = Setting.DEFAULT_TALK_CLOSE.asBoolean();
-    private final List<String> text = new ArrayList<String>();
+    private final List<String> text = new ArrayList<>();
 
     public Text() {
         super("text");
-        this.plugin = CitizensAPI.getPlugin();
+        plugin = CitizensAPI.getPlugin();
     }
 
     /**
@@ -87,10 +87,10 @@ public class Text extends Trait implements Runnable, Listener {
     /**
      * Builds a text editor in game for the supplied {@link Player}.
      */
-    public Editor getEditor(final Player player) {
-        final Conversation conversation = new ConversationFactory(plugin).withLocalEcho(false)
-                .withEscapeSequence("/npc text").withEscapeSequence("exit").withModality(false)
-                .withFirstPrompt(new TextBasePrompt(this)).buildConversation(player);
+    public Editor getEditor(Player player) {
+        Conversation conversation = new ConversationFactory(plugin).withLocalEcho(false).withEscapeSequence("/npc text")
+                .withEscapeSequence("exit").withModality(false).withFirstPrompt(new TextBasePrompt(this))
+                .buildConversation(player);
         return new Editor() {
             @Override
             public void begin() {
@@ -142,11 +142,9 @@ public class Text extends Trait implements Runnable, Listener {
         for (DataKey sub : key.getRelative("text").getIntegerSubKeys()) {
             text.add(sub.getString(""));
         }
-
         if (text.isEmpty()) {
             populateDefaultText();
         }
-
         range = key.getDouble("range");
     }
 
@@ -178,8 +176,9 @@ public class Text extends Trait implements Runnable, Listener {
             return;
 
         for (Player player : CitizensAPI.getLocationLookup().getNearbyPlayers(npc.getEntity().getLocation(), range)) {
-            if (player.getGameMode() == GameMode.SPECTATOR)
+            if (player.getGameMode() == GameMode.SPECTATOR) {
                 continue;
+            }
             talk(player);
         }
     }
@@ -216,7 +215,6 @@ public class Text extends Trait implements Runnable, Listener {
             }
             index = currentIndex++;
         }
-
         if (speechBubbles) {
             HologramTrait trait = npc.getOrAddTrait(HologramTrait.class);
             trait.addTemporaryLine(Placeholders.replace(text.get(index), player, npc),
@@ -271,7 +269,6 @@ public class Text extends Trait implements Runnable, Listener {
 
             cooldowns.remove(player.getUniqueId());
         }
-
         sendText(player);
 
         int delay = this.delay == -1
@@ -280,35 +277,35 @@ public class Text extends Trait implements Runnable, Listener {
                 : this.delay;
         if (delay <= 0)
             return;
-        cooldowns.put(player.getUniqueId(), System.currentTimeMillis() + (delay * 50));
+        cooldowns.put(player.getUniqueId(), System.currentTimeMillis() + delay * 50);
     }
 
     /**
      * Toggles talking at random intervals.
      */
     public boolean toggleRandomTalker() {
-        return (randomTalker = !randomTalker);
+        return randomTalker = !randomTalker;
     }
 
     /**
      * Toggles requiring line of sight before talking.
      */
     public boolean toggleRealisticLooking() {
-        return (realisticLooker = !realisticLooker);
+        return realisticLooker = !realisticLooker;
     }
 
     /**
      * Toggles using speech bubbles instead of messages.
      */
     public boolean toggleSpeechBubbles() {
-        return (speechBubbles = !speechBubbles);
+        return speechBubbles = !speechBubbles;
     }
 
     /**
      * Toggles talking to nearby Players.
      */
     public boolean toggleTalkClose() {
-        return (talkClose = !talkClose);
+        return talkClose = !talkClose;
     }
 
     public boolean useRealisticLooking() {
@@ -319,5 +316,5 @@ public class Text extends Trait implements Runnable, Listener {
         return speechBubbles;
     }
 
-    private static final Random RANDOM = Util.getFastRandom();
+    private static Random RANDOM = Util.getFastRandom();
 }
\ No newline at end of file
diff --git a/main/src/main/java/net/citizensnpcs/trait/text/TextBasePrompt.java b/main/src/main/java/net/citizensnpcs/trait/text/TextBasePrompt.java
index 47222be3f..bbe26b2d9 100644
--- a/main/src/main/java/net/citizensnpcs/trait/text/TextBasePrompt.java
+++ b/main/src/main/java/net/citizensnpcs/trait/text/TextBasePrompt.java
@@ -60,7 +60,6 @@ public class TextBasePrompt extends StringPrompt {
                 Messaging.sendErrorTr(sender, Messages.TEXT_EDITOR_INVALID_PAGE);
             }
         }
-
         Messaging.send(sender, getPromptText(context));
 
         if (input.equalsIgnoreCase("delay")) {
@@ -100,9 +99,7 @@ public class TextBasePrompt extends StringPrompt {
             }
         } else {
             Messaging.sendErrorTr(sender, Messages.TEXT_EDITOR_INVALID_EDIT_TYPE);
-            return this;
         }
-
         return this;
     }
 
@@ -117,7 +114,7 @@ public class TextBasePrompt extends StringPrompt {
                         colorToggleableText(text.isRandomTalker()), colorToggleableText(text.useSpeechBubbles()),
                         colorToggleableText(text.useRealisticLooking())));
         int page = context.getSessionData("page") == null ? 1 : (int) context.getSessionData("page");
-        text.sendPage(((Player) context.getForWhom()), page);
+        text.sendPage((Player) context.getForWhom(), page);
         return "";
     }
 }
\ No newline at end of file
diff --git a/main/src/main/java/net/citizensnpcs/trait/versioned/AllayTrait.java b/main/src/main/java/net/citizensnpcs/trait/versioned/AllayTrait.java
index b97cf25e2..af9166c09 100644
--- a/main/src/main/java/net/citizensnpcs/trait/versioned/AllayTrait.java
+++ b/main/src/main/java/net/citizensnpcs/trait/versioned/AllayTrait.java
@@ -38,7 +38,7 @@ public class AllayTrait extends Trait {
     }
 
     public void setDancing(boolean dance) {
-        this.dancing = dance;
+        dancing = dance;
     }
 
     @Command(
@@ -61,8 +61,7 @@ public class AllayTrait extends Trait {
         }
         if (!output.isEmpty()) {
             Messaging.send(sender, output.trim());
-        } else {
+        } else
             throw new CommandUsageException();
-        }
     }
 }
diff --git a/main/src/main/java/net/citizensnpcs/trait/versioned/AxolotlTrait.java b/main/src/main/java/net/citizensnpcs/trait/versioned/AxolotlTrait.java
index 69ba1c7d4..154d02b97 100644
--- a/main/src/main/java/net/citizensnpcs/trait/versioned/AxolotlTrait.java
+++ b/main/src/main/java/net/citizensnpcs/trait/versioned/AxolotlTrait.java
@@ -71,10 +71,9 @@ public class AxolotlTrait extends Trait {
         AxolotlTrait trait = npc.getOrAddTrait(AxolotlTrait.class);
         String output = "";
         if (args.hasValueFlag("variant")) {
-            if (variant == null) {
+            if (variant == null)
                 throw new CommandException(Messages.INVALID_AXOLOTL_VARIANT,
                         Util.listValuesPretty(Axolotl.Variant.values()));
-            }
             trait.setVariant(variant);
             output += ' ' + Messaging.tr(Messages.AXOLOTL_VARIANT_SET, args.getFlag("variant"));
         }
@@ -85,8 +84,7 @@ public class AxolotlTrait extends Trait {
         }
         if (!output.isEmpty()) {
             Messaging.send(sender, output.trim());
-        } else {
+        } else
             throw new CommandUsageException();
-        }
     }
 }
diff --git a/main/src/main/java/net/citizensnpcs/trait/versioned/BeeTrait.java b/main/src/main/java/net/citizensnpcs/trait/versioned/BeeTrait.java
index aa84cc515..bb995431d 100644
--- a/main/src/main/java/net/citizensnpcs/trait/versioned/BeeTrait.java
+++ b/main/src/main/java/net/citizensnpcs/trait/versioned/BeeTrait.java
@@ -75,9 +75,8 @@ public class BeeTrait extends Trait {
         BeeTrait trait = npc.getOrAddTrait(BeeTrait.class);
         String output = "";
         if (anger != null) {
-            if (anger < 0) {
+            if (anger < 0)
                 throw new CommandException(Messages.INVALID_BEE_ANGER);
-            }
             trait.setAnger(anger);
             output += ' ' + Messaging.tr(Messages.BEE_ANGER_SET, args.getFlag("anger"));
         }
@@ -93,8 +92,7 @@ public class BeeTrait extends Trait {
         }
         if (!output.isEmpty()) {
             Messaging.send(sender, output.trim());
-        } else {
+        } else
             throw new CommandUsageException();
-        }
     }
 }
diff --git a/main/src/main/java/net/citizensnpcs/trait/versioned/BossBarTrait.java b/main/src/main/java/net/citizensnpcs/trait/versioned/BossBarTrait.java
index 8e86a6d62..70b930fbc 100644
--- a/main/src/main/java/net/citizensnpcs/trait/versioned/BossBarTrait.java
+++ b/main/src/main/java/net/citizensnpcs/trait/versioned/BossBarTrait.java
@@ -69,7 +69,6 @@ public class BossBarTrait extends Trait {
             barCache = Bukkit.getServer().createBossBar(npc.getFullName(), color, style,
                     flags.toArray(new BarFlag[flags.size()]));
         }
-
         return barCache;
     }
 
@@ -106,7 +105,6 @@ public class BossBarTrait extends Trait {
         if (isBoss) {
             onDespawn();
         }
-
         return isBoss;
     }
 
@@ -164,35 +162,30 @@ public class BossBarTrait extends Trait {
                 bar.setProgress(Math.max(0, Math.min(1, number)));
             }
         }
-
         bar.setTitle(title);
         bar.setVisible(visible);
         if (progressProvider != null) {
             bar.setProgress(progressProvider.get());
         }
-
         if (style != null) {
             bar.setStyle(style);
         }
-
         if (color != null) {
             bar.setColor(color);
         }
-
         for (BarFlag flag : BarFlag.values()) {
             bar.removeFlag(flag);
         }
-
         for (BarFlag flag : flags) {
             bar.addFlag(flag);
         }
-
         bar.removeAll();
 
         for (Player player : CitizensAPI.getLocationLookup().getNearbyPlayers(npc.getEntity().getLocation(),
                 range > 0 ? range : Setting.BOSSBAR_RANGE.asInt())) {
-            if (viewPermission != null && !player.hasPermission(viewPermission))
+            if (viewPermission != null && !player.hasPermission(viewPermission)) {
                 continue;
+            }
             bar.addPlayer(player);
         }
     }
@@ -210,7 +203,7 @@ public class BossBarTrait extends Trait {
     }
 
     public void setProgressProvider(Supplier<Double> provider) {
-        this.progressProvider = provider;
+        progressProvider = provider;
     }
 
     public void setRange(int range) {
@@ -226,11 +219,11 @@ public class BossBarTrait extends Trait {
     }
 
     public void setTrackVariable(String variable) {
-        this.track = variable;
+        track = variable;
     }
 
     public void setViewPermission(String viewpermission) {
-        this.viewPermission = viewpermission;
+        viewPermission = viewpermission;
     }
 
     public void setVisible(boolean visible) {
@@ -253,31 +246,24 @@ public class BossBarTrait extends Trait {
         if (style != null) {
             trait.setStyle(style);
         }
-
         if (color != null) {
             trait.setColor(color);
         }
-
         if (track != null) {
             trait.setTrackVariable(track);
         }
-
         if (title != null) {
             trait.setTitle(Messaging.parseComponents(title));
         }
-
         if (visible != null) {
             trait.setVisible(visible);
         }
-
         if (range != null) {
             trait.setRange(range);
         }
-
         if (viewpermission != null) {
             trait.setViewPermission(viewpermission);
         }
-
         if (flags != null) {
             List<BarFlag> parsed = Lists.newArrayList();
             for (String s : Splitter.on(',').omitEmptyStrings().trimResults().split(flags)) {
diff --git a/main/src/main/java/net/citizensnpcs/trait/versioned/CamelTrait.java b/main/src/main/java/net/citizensnpcs/trait/versioned/CamelTrait.java
index 4f1bf9e9e..da56e85f2 100644
--- a/main/src/main/java/net/citizensnpcs/trait/versioned/CamelTrait.java
+++ b/main/src/main/java/net/citizensnpcs/trait/versioned/CamelTrait.java
@@ -64,7 +64,6 @@ public class CamelTrait extends Trait {
             trait.setPose(pose);
             output += Messaging.tr(Messages.CAMEL_POSE_SET, pose);
         }
-
         if (!output.isEmpty()) {
             Messaging.send(sender, output);
         }
diff --git a/main/src/main/java/net/citizensnpcs/trait/versioned/CatTrait.java b/main/src/main/java/net/citizensnpcs/trait/versioned/CatTrait.java
index e3a4ef91f..1f1071431 100644
--- a/main/src/main/java/net/citizensnpcs/trait/versioned/CatTrait.java
+++ b/main/src/main/java/net/citizensnpcs/trait/versioned/CatTrait.java
@@ -54,7 +54,7 @@ public class CatTrait extends Trait {
     }
 
     public void setCollarColor(DyeColor color) {
-        this.collarColor = color;
+        collarColor = color;
     }
 
     public void setLyingDown(boolean lying) {
@@ -74,21 +74,21 @@ public class CatTrait extends Trait {
 
     public void setType(Type type2) {
         if (type2 == null) {
-            this.type = Cat.Type.BLACK;
+            type = Cat.Type.BLACK;
             return;
         }
         switch (type2) {
             case WILD_OCELOT:
-                this.type = Cat.Type.CALICO;
+                type = Cat.Type.CALICO;
                 break;
             case BLACK_CAT:
-                this.type = Cat.Type.BLACK;
+                type = Cat.Type.BLACK;
                 break;
             case RED_CAT:
-                this.type = Cat.Type.RED;
+                type = Cat.Type.RED;
                 break;
             case SIAMESE_CAT:
-                this.type = Cat.Type.SIAMESE;
+                type = Cat.Type.SIAMESE;
                 break;
         }
     }
@@ -108,22 +108,18 @@ public class CatTrait extends Trait {
         CatTrait trait = npc.getOrAddTrait(CatTrait.class);
         String output = "";
         if (args.hasValueFlag("type")) {
-            if (type == null) {
+            if (type == null)
                 throw new CommandUsageException(Messages.INVALID_CAT_TYPE, Util.listValuesPretty(Cat.Type.values()));
-            }
             trait.setType(type);
             output += ' ' + Messaging.tr(Messages.CAT_TYPE_SET, args.getFlag("type"));
         }
-
         if (args.hasValueFlag("ccolor")) {
-            if (ccolor == null) {
+            if (ccolor == null)
                 throw new CommandUsageException(Messages.INVALID_CAT_COLLAR_COLOR,
                         Util.listValuesPretty(DyeColor.values()));
-            }
             trait.setCollarColor(ccolor);
             output += ' ' + Messaging.tr(Messages.CAT_COLLAR_COLOR_SET, args.getFlag("ccolor"));
         }
-
         if (args.hasFlag('s')) {
             trait.setSitting(true);
             output += ' ' + Messaging.tr(Messages.CAT_STARTED_SITTING, npc.getName());
@@ -131,17 +127,14 @@ public class CatTrait extends Trait {
             trait.setSitting(false);
             output += ' ' + Messaging.tr(Messages.CAT_STOPPED_SITTING, npc.getName());
         }
-
         if (args.hasFlag('l')) {
             trait.setLyingDown(!trait.isLyingDown());
             output += ' ' + Messaging.tr(trait.isLyingDown() ? Messages.CAT_STARTED_LYING : Messages.CAT_STOPPED_LYING,
                     npc.getName());
         }
-
         if (!output.isEmpty()) {
             Messaging.send(sender, output.trim());
-        } else {
+        } else
             throw new CommandUsageException();
-        }
     }
 }
diff --git a/main/src/main/java/net/citizensnpcs/trait/versioned/FoxTrait.java b/main/src/main/java/net/citizensnpcs/trait/versioned/FoxTrait.java
index edd7aff92..853802351 100644
--- a/main/src/main/java/net/citizensnpcs/trait/versioned/FoxTrait.java
+++ b/main/src/main/java/net/citizensnpcs/trait/versioned/FoxTrait.java
@@ -92,10 +92,9 @@ public class FoxTrait extends Trait {
         String output = "";
         if (rawtype != null) {
             Fox.Type type = Util.matchEnum(Fox.Type.values(), args.getFlag("type"));
-            if (type == null) {
+            if (type == null)
                 throw new CommandUsageException(
                         Messaging.tr(Messages.INVALID_FOX_TYPE, Util.listValuesPretty(Fox.Type.values())), null);
-            }
             trait.setType(type);
             output += ' ' + Messaging.tr(Messages.FOX_TYPE_SET, args.getFlag("type"), npc.getName());
         }
@@ -116,8 +115,7 @@ public class FoxTrait extends Trait {
         }
         if (!output.isEmpty()) {
             Messaging.send(sender, output.trim());
-        } else {
+        } else
             throw new CommandUsageException();
-        }
     }
 }
diff --git a/main/src/main/java/net/citizensnpcs/trait/versioned/FrogTrait.java b/main/src/main/java/net/citizensnpcs/trait/versioned/FrogTrait.java
index 926064553..7ad913ebb 100644
--- a/main/src/main/java/net/citizensnpcs/trait/versioned/FrogTrait.java
+++ b/main/src/main/java/net/citizensnpcs/trait/versioned/FrogTrait.java
@@ -57,9 +57,8 @@ public class FrogTrait extends Trait {
         FrogTrait trait = npc.getOrAddTrait(FrogTrait.class);
         String output = "";
         if (args.hasValueFlag("variant")) {
-            if (variant == null) {
+            if (variant == null)
                 throw new CommandException(Messages.INVALID_FROG_VARIANT, Util.listValuesPretty(Frog.Variant.values()));
-            }
             trait.setVariant(variant);
             output += Messaging.tr(Messages.FROG_VARIANT_SET, Util.prettyEnum(variant));
         }
diff --git a/main/src/main/java/net/citizensnpcs/trait/versioned/GoatTrait.java b/main/src/main/java/net/citizensnpcs/trait/versioned/GoatTrait.java
index dc0feed13..46de9ed9c 100644
--- a/main/src/main/java/net/citizensnpcs/trait/versioned/GoatTrait.java
+++ b/main/src/main/java/net/citizensnpcs/trait/versioned/GoatTrait.java
@@ -50,11 +50,11 @@ public class GoatTrait extends Trait {
     }
 
     public void setLeftHorn(boolean horn) {
-        this.leftHorn = horn;
+        leftHorn = horn;
     }
 
     public void setRightHorn(boolean horn) {
-        this.rightHorn = horn;
+        rightHorn = horn;
     }
 
     @Command(
diff --git a/main/src/main/java/net/citizensnpcs/trait/versioned/LlamaTrait.java b/main/src/main/java/net/citizensnpcs/trait/versioned/LlamaTrait.java
index cc96c34cf..16a90bf08 100644
--- a/main/src/main/java/net/citizensnpcs/trait/versioned/LlamaTrait.java
+++ b/main/src/main/java/net/citizensnpcs/trait/versioned/LlamaTrait.java
@@ -81,12 +81,10 @@ public class LlamaTrait extends Trait {
             trait.setColor(color);
             output += Messaging.tr(Messages.LLAMA_COLOR_SET, Util.prettyEnum(color));
         }
-
         if (strength != null) {
             trait.setStrength(Math.max(1, Math.min(5, strength)));
             output += Messaging.tr(Messages.LLAMA_STRENGTH_SET, trait.getStrength());
         }
-
         if (args.hasFlag('c')) {
             npc.getOrAddTrait(HorseModifiers.class).setCarryingChest(true);
             output += Messaging.tr(Messages.HORSE_CHEST_SET) + " ";
@@ -94,7 +92,6 @@ public class LlamaTrait extends Trait {
             npc.getOrAddTrait(HorseModifiers.class).setCarryingChest(false);
             output += Messaging.tr(Messages.HORSE_CHEST_UNSET) + " ";
         }
-
         if (!output.isEmpty()) {
             Messaging.send(sender, output);
         }
diff --git a/main/src/main/java/net/citizensnpcs/trait/versioned/MushroomCowTrait.java b/main/src/main/java/net/citizensnpcs/trait/versioned/MushroomCowTrait.java
index 553534503..ffd9d53e9 100644
--- a/main/src/main/java/net/citizensnpcs/trait/versioned/MushroomCowTrait.java
+++ b/main/src/main/java/net/citizensnpcs/trait/versioned/MushroomCowTrait.java
@@ -71,8 +71,7 @@ public class MushroomCowTrait extends Trait {
             Messaging.sendTr(sender, Messages.MUSHROOM_COW_VARIANT_SET, npc.getName(), variant);
             hasArg = true;
         }
-        if (!hasArg) {
+        if (!hasArg)
             throw new CommandUsageException();
-        }
     }
 }
diff --git a/main/src/main/java/net/citizensnpcs/trait/versioned/PandaTrait.java b/main/src/main/java/net/citizensnpcs/trait/versioned/PandaTrait.java
index ea8e655e5..4a60b2a19 100644
--- a/main/src/main/java/net/citizensnpcs/trait/versioned/PandaTrait.java
+++ b/main/src/main/java/net/citizensnpcs/trait/versioned/PandaTrait.java
@@ -88,11 +88,11 @@ public class PandaTrait extends Trait {
     }
 
     public void setHiddenGene(Panda.Gene gene) {
-        this.hiddenGene = gene;
+        hiddenGene = gene;
     }
 
     public void setMainGene(Panda.Gene gene) {
-        this.mainGene = gene;
+        mainGene = gene;
     }
 
     public void setRolling(boolean rolling) {
@@ -138,18 +138,16 @@ public class PandaTrait extends Trait {
         PandaTrait trait = npc.getOrAddTrait(PandaTrait.class);
         String output = "";
         if (args.hasValueFlag("gene")) {
-            if (gene == null) {
+            if (gene == null)
                 throw new CommandUsageException(Messages.INVALID_PANDA_GENE,
                         Util.listValuesPretty(Panda.Gene.values()));
-            }
             trait.setMainGene(gene);
             output += ' ' + Messaging.tr(Messages.PANDA_MAIN_GENE_SET, args.getFlag("gene"));
         }
         if (args.hasValueFlag("hiddengene")) {
-            if (hiddengene == null) {
+            if (hiddengene == null)
                 throw new CommandUsageException(Messages.INVALID_PANDA_GENE,
                         Util.listValuesPretty(Panda.Gene.values()));
-            }
             trait.setHiddenGene(hiddengene);
             output += ' ' + Messaging.tr(Messages.PANDA_HIDDEN_GENE_SET, hiddengene);
         }
@@ -175,9 +173,8 @@ public class PandaTrait extends Trait {
         }
         if (!output.isEmpty()) {
             Messaging.send(sender, output.trim());
-        } else {
+        } else
             throw new CommandUsageException();
-        }
     }
 
     private static boolean SUPPORT_ROLLING_SNEEZING = true;
diff --git a/main/src/main/java/net/citizensnpcs/trait/versioned/ParrotTrait.java b/main/src/main/java/net/citizensnpcs/trait/versioned/ParrotTrait.java
index bcbfbd52a..26f8368f5 100644
--- a/main/src/main/java/net/citizensnpcs/trait/versioned/ParrotTrait.java
+++ b/main/src/main/java/net/citizensnpcs/trait/versioned/ParrotTrait.java
@@ -57,9 +57,8 @@ public class ParrotTrait extends Trait {
         ParrotTrait trait = npc.getOrAddTrait(ParrotTrait.class);
         String output = "";
         if (args.hasValueFlag("variant")) {
-            if (variant == null) {
+            if (variant == null)
                 throw new CommandException(Messages.INVALID_PARROT_VARIANT, Util.listValuesPretty(Variant.values()));
-            }
             trait.setVariant(variant);
             output += Messaging.tr(Messages.PARROT_VARIANT_SET, Util.prettyEnum(variant));
         }
diff --git a/main/src/main/java/net/citizensnpcs/trait/versioned/PhantomTrait.java b/main/src/main/java/net/citizensnpcs/trait/versioned/PhantomTrait.java
index cef8a2bde..09b9b7afd 100644
--- a/main/src/main/java/net/citizensnpcs/trait/versioned/PhantomTrait.java
+++ b/main/src/main/java/net/citizensnpcs/trait/versioned/PhantomTrait.java
@@ -56,16 +56,14 @@ public class PhantomTrait extends Trait {
         PhantomTrait trait = npc.getOrAddTrait(PhantomTrait.class);
         String output = "";
         if (size != null) {
-            if (size <= 0) {
+            if (size <= 0)
                 throw new CommandUsageException();
-            }
             trait.setSize(size);
             output += Messaging.tr(Messages.PHANTOM_STATE_SET, size);
         }
         if (!output.isEmpty()) {
             Messaging.send(sender, output);
-        } else {
+        } else
             throw new CommandUsageException();
-        }
     }
 }
diff --git a/main/src/main/java/net/citizensnpcs/trait/versioned/PiglinTrait.java b/main/src/main/java/net/citizensnpcs/trait/versioned/PiglinTrait.java
index 64543e14c..078a56cd2 100644
--- a/main/src/main/java/net/citizensnpcs/trait/versioned/PiglinTrait.java
+++ b/main/src/main/java/net/citizensnpcs/trait/versioned/PiglinTrait.java
@@ -61,9 +61,8 @@ public class PiglinTrait extends Trait {
                     npc.getName());
             hasArg = true;
         }
-        if (!hasArg) {
+        if (!hasArg)
             throw new CommandUsageException();
-        }
     }
 
 }
diff --git a/main/src/main/java/net/citizensnpcs/trait/versioned/PolarBearTrait.java b/main/src/main/java/net/citizensnpcs/trait/versioned/PolarBearTrait.java
index f7baa0c9a..ad9cb96aa 100644
--- a/main/src/main/java/net/citizensnpcs/trait/versioned/PolarBearTrait.java
+++ b/main/src/main/java/net/citizensnpcs/trait/versioned/PolarBearTrait.java
@@ -62,8 +62,7 @@ public class PolarBearTrait extends Trait {
         }
         if (!output.isEmpty()) {
             Messaging.send(sender, output);
-        } else {
+        } else
             throw new CommandUsageException();
-        }
     }
 }
diff --git a/main/src/main/java/net/citizensnpcs/trait/versioned/PufferFishTrait.java b/main/src/main/java/net/citizensnpcs/trait/versioned/PufferFishTrait.java
index 1a5d39420..a29688b92 100644
--- a/main/src/main/java/net/citizensnpcs/trait/versioned/PufferFishTrait.java
+++ b/main/src/main/java/net/citizensnpcs/trait/versioned/PufferFishTrait.java
@@ -29,7 +29,7 @@ public class PufferFishTrait extends Trait {
     }
 
     public void setPuffState(int state) {
-        this.puffState = state;
+        puffState = state;
     }
 
     @Command(
diff --git a/main/src/main/java/net/citizensnpcs/trait/versioned/ShulkerTrait.java b/main/src/main/java/net/citizensnpcs/trait/versioned/ShulkerTrait.java
index cbb15e0c7..c0db15362 100644
--- a/main/src/main/java/net/citizensnpcs/trait/versioned/ShulkerTrait.java
+++ b/main/src/main/java/net/citizensnpcs/trait/versioned/ShulkerTrait.java
@@ -95,8 +95,7 @@ public class ShulkerTrait extends Trait {
             Messaging.sendTr(sender, Messages.SHULKER_COLOR_SET, npc.getName(), Util.prettyEnum(color));
             hasArg = true;
         }
-        if (!hasArg) {
+        if (!hasArg)
             throw new CommandUsageException();
-        }
     }
 }
diff --git a/main/src/main/java/net/citizensnpcs/trait/versioned/SnifferTrait.java b/main/src/main/java/net/citizensnpcs/trait/versioned/SnifferTrait.java
index 4ce2c1307..fe7a58fd7 100644
--- a/main/src/main/java/net/citizensnpcs/trait/versioned/SnifferTrait.java
+++ b/main/src/main/java/net/citizensnpcs/trait/versioned/SnifferTrait.java
@@ -71,8 +71,7 @@ public class SnifferTrait extends Trait {
         }
         if (!output.isEmpty()) {
             Messaging.send(sender, output.trim());
-        } else {
+        } else
             throw new CommandUsageException();
-        }
     }
 }
diff --git a/main/src/main/java/net/citizensnpcs/trait/versioned/SnowmanTrait.java b/main/src/main/java/net/citizensnpcs/trait/versioned/SnowmanTrait.java
index acd422759..627d42dc4 100644
--- a/main/src/main/java/net/citizensnpcs/trait/versioned/SnowmanTrait.java
+++ b/main/src/main/java/net/citizensnpcs/trait/versioned/SnowmanTrait.java
@@ -41,7 +41,7 @@ public class SnowmanTrait extends Trait {
     }
 
     public boolean toggleDerp() {
-        return this.derp = !this.derp;
+        return derp = !derp;
     }
 
     @Command(
@@ -62,8 +62,7 @@ public class SnowmanTrait extends Trait {
             Messaging.sendTr(sender, isDerp ? Messages.SNOWMAN_DERP_SET : Messages.SNOWMAN_DERP_STOPPED, npc.getName());
             hasArg = true;
         }
-        if (!hasArg) {
+        if (!hasArg)
             throw new CommandUsageException();
-        }
     }
 }
diff --git a/main/src/main/java/net/citizensnpcs/trait/versioned/SpellcasterTrait.java b/main/src/main/java/net/citizensnpcs/trait/versioned/SpellcasterTrait.java
index b9548ec04..bd41e25e6 100644
--- a/main/src/main/java/net/citizensnpcs/trait/versioned/SpellcasterTrait.java
+++ b/main/src/main/java/net/citizensnpcs/trait/versioned/SpellcasterTrait.java
@@ -38,7 +38,6 @@ public class SpellcasterTrait extends Trait {
         if (spell != null) {
             ((Spellcaster) npc.getEntity()).setSpell(spell);
         }
-
     }
 
     public void setSpell(Spell spell) {
@@ -65,8 +64,7 @@ public class SpellcasterTrait extends Trait {
         }
         if (!output.isEmpty()) {
             Messaging.send(sender, output.trim());
-        } else {
+        } else
             throw new CommandUsageException();
-        }
     }
 }
diff --git a/main/src/main/java/net/citizensnpcs/trait/versioned/TropicalFishTrait.java b/main/src/main/java/net/citizensnpcs/trait/versioned/TropicalFishTrait.java
index 0bcdfec44..b36d432fa 100644
--- a/main/src/main/java/net/citizensnpcs/trait/versioned/TropicalFishTrait.java
+++ b/main/src/main/java/net/citizensnpcs/trait/versioned/TropicalFishTrait.java
@@ -56,7 +56,7 @@ public class TropicalFishTrait extends Trait {
     }
 
     public void setBodyColor(DyeColor color) {
-        this.bodyColor = color;
+        bodyColor = color;
     }
 
     public void setPattern(Pattern pattern) {
@@ -64,7 +64,7 @@ public class TropicalFishTrait extends Trait {
     }
 
     public void setPatternColor(DyeColor color) {
-        this.patternColor = color;
+        patternColor = color;
     }
 
     @Command(
@@ -81,33 +81,29 @@ public class TropicalFishTrait extends Trait {
         TropicalFishTrait trait = npc.getOrAddTrait(TropicalFishTrait.class);
         String output = "";
         if (args.hasValueFlag("body")) {
-            if (body == null) {
+            if (body == null)
                 throw new CommandException(Messages.INVALID_TROPICALFISH_COLOR,
                         Util.listValuesPretty(DyeColor.values()));
-            }
             trait.setBodyColor(body);
             output += Messaging.tr(Messages.TROPICALFISH_BODY_COLOR_SET, Util.prettyEnum(body));
         }
         if (args.hasValueFlag("patterncolor")) {
-            if (patterncolor == null) {
+            if (patterncolor == null)
                 throw new CommandException(Messages.INVALID_TROPICALFISH_COLOR,
                         Util.listValuesPretty(DyeColor.values()));
-            }
             trait.setPatternColor(patterncolor);
             output += Messaging.tr(Messages.TROPICALFISH_PATTERN_COLOR_SET, Util.prettyEnum(patterncolor));
         }
         if (args.hasValueFlag("pattern")) {
-            if (pattern == null) {
+            if (pattern == null)
                 throw new CommandException(Messages.INVALID_TROPICALFISH_PATTERN,
                         Util.listValuesPretty(Pattern.values()));
-            }
             trait.setPattern(pattern);
             output += Messaging.tr(Messages.TROPICALFISH_PATTERN_SET, Util.prettyEnum(pattern));
         }
         if (!output.isEmpty()) {
             Messaging.send(sender, output);
-        } else {
+        } else
             throw new CommandUsageException();
-        }
     }
 }
diff --git a/main/src/main/java/net/citizensnpcs/trait/versioned/VillagerTrait.java b/main/src/main/java/net/citizensnpcs/trait/versioned/VillagerTrait.java
index 3f3752e55..8694193b4 100644
--- a/main/src/main/java/net/citizensnpcs/trait/versioned/VillagerTrait.java
+++ b/main/src/main/java/net/citizensnpcs/trait/versioned/VillagerTrait.java
@@ -76,25 +76,22 @@ public class VillagerTrait extends Trait {
         VillagerTrait trait = npc.getOrAddTrait(VillagerTrait.class);
         String output = "";
         if (level != null) {
-            if (level < 0) {
+            if (level < 0)
                 throw new CommandUsageException();
-            }
             trait.setLevel(level);
             output += " " + Messaging.tr(Messages.VILLAGER_LEVEL_SET, level);
         }
         if (args.hasValueFlag("type")) {
-            if (type == null) {
+            if (type == null)
                 throw new CommandException(Messages.INVALID_VILLAGER_TYPE,
                         Util.listValuesPretty(Villager.Type.values()));
-            }
             trait.setType(type);
             output += " " + Messaging.tr(Messages.VILLAGER_TYPE_SET, args.getFlag("type"));
         }
         if (args.hasValueFlag("profession")) {
-            if (profession == null) {
+            if (profession == null)
                 throw new CommandException(Messages.INVALID_PROFESSION, args.getFlag("profession"),
                         Joiner.on(',').join(Profession.values()));
-            }
             npc.getOrAddTrait(VillagerProfession.class).setProfession(profession);
             output += " " + Messaging.tr(Messages.PROFESSION_SET, npc.getName(), args.getFlag("profession"));
         }
@@ -103,8 +100,7 @@ public class VillagerTrait extends Trait {
         }
         if (!output.isEmpty()) {
             Messaging.send(sender, output.trim());
-        } else {
+        } else
             throw new CommandUsageException();
-        }
     }
 }
diff --git a/main/src/main/java/net/citizensnpcs/trait/versioned/WardenTrait.java b/main/src/main/java/net/citizensnpcs/trait/versioned/WardenTrait.java
index 0136a583f..40e52b372 100644
--- a/main/src/main/java/net/citizensnpcs/trait/versioned/WardenTrait.java
+++ b/main/src/main/java/net/citizensnpcs/trait/versioned/WardenTrait.java
@@ -71,7 +71,6 @@ public class WardenTrait extends Trait {
             } catch (IllegalArgumentException iae) {
                 entity = Bukkit.getOfflinePlayer(player).getPlayer();
             }
-
             if (entity != null) {
                 trait.addAnger(entity, anger);
                 output = Messaging.tr(Messages.WARDEN_ANGER_ADDED, entity, anger);
@@ -86,11 +85,9 @@ public class WardenTrait extends Trait {
             NMS.setWardenPose(npc.getEntity(), Pose.ROARING);
             output = Messaging.tr(Messages.WARDEN_POSE_SET, npc.getName(), "roar");
         }
-
         if (!output.isEmpty()) {
             Messaging.send(sender, output.trim());
-        } else {
+        } else
             throw new CommandUsageException();
-        }
     }
 }
diff --git a/main/src/main/java/net/citizensnpcs/trait/waypoint/GuidedWaypointProvider.java b/main/src/main/java/net/citizensnpcs/trait/waypoint/GuidedWaypointProvider.java
index 8c9a0d86f..db6f05a1e 100644
--- a/main/src/main/java/net/citizensnpcs/trait/waypoint/GuidedWaypointProvider.java
+++ b/main/src/main/java/net/citizensnpcs/trait/waypoint/GuidedWaypointProvider.java
@@ -3,6 +3,7 @@ package net.citizensnpcs.trait.waypoint;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Objects;
 
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
@@ -76,14 +77,14 @@ public class GuidedWaypointProvider implements EnumerableWaypointProvider {
     }
 
     @Override
-    public WaypointEditor createEditor(final CommandSender sender, CommandContext args) {
+    public WaypointEditor createEditor(CommandSender sender, CommandContext args) {
         if (!(sender instanceof Player)) {
             Messaging.sendErrorTr(sender, CommandMessages.MUST_BE_INGAME);
             return null;
         }
-        final Player player = (Player) sender;
+        Player player = (Player) sender;
         return new WaypointEditor() {
-            private final EntityMarkers<Waypoint> markers = new EntityMarkers<Waypoint>();
+            private final EntityMarkers<Waypoint> markers = new EntityMarkers<>();
             private boolean showPath = true;
 
             @Override
@@ -130,7 +131,7 @@ public class GuidedWaypointProvider implements EnumerableWaypointProvider {
                     return;
                 if (event.getMessage().equalsIgnoreCase("toggle path")) {
                     event.setCancelled(true);
-                    Bukkit.getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(), () -> togglePath());
+                    Bukkit.getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(), this::togglePath);
                 } else if (event.getMessage().equalsIgnoreCase("clear")) {
                     event.setCancelled(true);
                     Bukkit.getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(), () -> {
@@ -229,15 +230,17 @@ public class GuidedWaypointProvider implements EnumerableWaypointProvider {
                 : key.getRelative("destinations");
         for (DataKey root : dd.getIntegerSubKeys()) {
             Waypoint waypoint = PersistenceLoader.load(Waypoint.class, root);
-            if (waypoint == null)
+            if (waypoint == null) {
                 continue;
+            }
             destinations.add(waypoint);
         }
         DataKey gd = key.keyExists("helperwaypoints") ? key.getRelative("helperwaypoints") : key.getRelative("guides");
         for (DataKey root : gd.getIntegerSubKeys()) {
             Waypoint waypoint = PersistenceLoader.load(Waypoint.class, root);
-            if (waypoint == null)
+            if (waypoint == null) {
                 continue;
+            }
             guides.add(waypoint);
         }
         if (key.keyExists("distance")) {
@@ -340,12 +343,10 @@ public class GuidedWaypointProvider implements EnumerableWaypointProvider {
                 target.onReach(npc);
                 plan = null;
             }
-
             if (plan == null) {
                 selector.finish();
                 return;
             }
-
             if (npc.getNavigator().isNavigating())
                 return;
 
@@ -363,12 +364,11 @@ public class GuidedWaypointProvider implements EnumerableWaypointProvider {
             if (paused || destinations.size() == 0 || !npc.isSpawned() || npc.getNavigator().isNavigating())
                 return false;
 
-            this.target = destinations.get(Util.getFastRandom().nextInt(destinations.size()));
+            target = destinations.get(Util.getFastRandom().nextInt(destinations.size()));
             if (target.getLocation().getWorld().equals(npc.getEntity().getWorld())) {
                 target = null;
                 return false;
             }
-
             plan = ASTAR.runFully(new GuidedGoal(target), new GuidedNode(null, new Waypoint(npc.getStoredLocation())));
             return plan != null;
         }
@@ -421,20 +421,13 @@ public class GuidedWaypointProvider implements EnumerableWaypointProvider {
 
         @Override
         public boolean equals(Object obj) {
-            if (this == obj) {
+            if (this == obj)
                 return true;
-            }
-            if (obj == null || getClass() != obj.getClass()) {
+            if (obj == null || getClass() != obj.getClass())
                 return false;
-            }
             GuidedNode other = (GuidedNode) obj;
-            if (waypoint == null) {
-                if (other.waypoint != null) {
-                    return false;
-                }
-            } else if (!waypoint.equals(other.waypoint)) {
+            if (!Objects.equals(waypoint, other.waypoint))
                 return false;
-            }
             return true;
         }
 
@@ -453,7 +446,7 @@ public class GuidedWaypointProvider implements EnumerableWaypointProvider {
 
         @Override
         public int hashCode() {
-            return 31 + ((waypoint == null) ? 0 : waypoint.hashCode());
+            return 31 + (waypoint == null ? 0 : waypoint.hashCode());
         }
 
         @Override
@@ -485,5 +478,5 @@ public class GuidedWaypointProvider implements EnumerableWaypointProvider {
         }
     }
 
-    private static final AStarMachine<GuidedNode, GuidedPlan> ASTAR = AStarMachine.createWithDefaultStorage();
+    private static AStarMachine<GuidedNode, GuidedPlan> ASTAR = AStarMachine.createWithDefaultStorage();
 }
diff --git a/main/src/main/java/net/citizensnpcs/trait/waypoint/LinearWaypointProvider.java b/main/src/main/java/net/citizensnpcs/trait/waypoint/LinearWaypointProvider.java
index 9082d20cf..367fe7f15 100644
--- a/main/src/main/java/net/citizensnpcs/trait/waypoint/LinearWaypointProvider.java
+++ b/main/src/main/java/net/citizensnpcs/trait/waypoint/LinearWaypointProvider.java
@@ -4,6 +4,7 @@ import java.util.AbstractList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
@@ -124,9 +125,8 @@ public class LinearWaypointProvider implements EnumerableWaypointProvider {
     }
 
     public Waypoint getCurrentWaypoint() {
-        if (currentGoal != null && currentGoal.currentDestination != null) {
+        if (currentGoal != null && currentGoal.currentDestination != null)
             return currentGoal.currentDestination;
-        }
         return null;
     }
 
@@ -139,8 +139,9 @@ public class LinearWaypointProvider implements EnumerableWaypointProvider {
     public void load(DataKey key) {
         for (DataKey root : key.getRelative("points").getIntegerSubKeys()) {
             Waypoint waypoint = PersistenceLoader.load(Waypoint.class, root);
-            if (waypoint == null)
+            if (waypoint == null) {
                 continue;
+            }
             waypoints.add(waypoint);
         }
     }
@@ -267,7 +268,7 @@ public class LinearWaypointProvider implements EnumerableWaypointProvider {
 
         private LinearWaypointEditor(Player player) {
             this.player = player;
-            this.markers = new EntityMarkers<Waypoint>();
+            markers = new EntityMarkers<>();
         }
 
         private void addWaypoint(Location at) {
@@ -279,7 +280,6 @@ public class LinearWaypointProvider implements EnumerableWaypointProvider {
             } else {
                 waypoints.add(element);
             }
-
             if (showingMarkers) {
                 markers.createMarker(element, element.getLocation().clone());
             }
@@ -369,15 +369,10 @@ public class LinearWaypointProvider implements EnumerableWaypointProvider {
                 });
             } else if (message.equalsIgnoreCase("clear")) {
                 event.setCancelled(true);
-                Bukkit.getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(), new Runnable() {
-                    @Override
-                    public void run() {
-                        clearWaypoints();
-                    }
-                });
+                Bukkit.getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(), this::clearWaypoints);
             } else if (message.equalsIgnoreCase("toggle path") || message.equalsIgnoreCase("markers")) {
                 event.setCancelled(true);
-                Bukkit.getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(), () -> togglePath());
+                Bukkit.getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(), this::togglePath);
             } else if (message.equalsIgnoreCase("cycle")) {
                 event.setCancelled(true);
                 Bukkit.getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(), () -> {
@@ -413,7 +408,6 @@ public class LinearWaypointProvider implements EnumerableWaypointProvider {
                         return;
                     }
                 }
-
                 addWaypoint(at);
             } else if (waypoints.size() > 0 && !event.getPlayer().isSneaking()) {
                 event.setCancelled(true);
@@ -598,7 +592,7 @@ public class LinearWaypointProvider implements EnumerableWaypointProvider {
         }
 
         @Override
-        public boolean shouldExecute(final GoalSelector selector) {
+        public boolean shouldExecute(GoalSelector selector) {
             if (paused || currentDestination != null || !npc.isSpawned() || getNavigator().isNavigating())
                 return false;
 
@@ -609,7 +603,7 @@ public class LinearWaypointProvider implements EnumerableWaypointProvider {
 
             this.selector = selector;
             Waypoint next = itr.next();
-            final Location npcLoc = npc.getEntity().getLocation(cachedLocation);
+            Location npcLoc = npc.getEntity().getLocation(cachedLocation);
             if (npcLoc.getWorld() != next.getLocation().getWorld()
                     || npcLoc.distance(next.getLocation()) <= npc.getNavigator().getLocalParameters().distanceMargin())
                 return false;
@@ -626,11 +620,9 @@ public class LinearWaypointProvider implements EnumerableWaypointProvider {
                     }
                 }
             }
-
             if (!getNavigator().isNavigating()) {
                 getNavigator().setTarget(currentDestination.getLocation());
             }
-
             double margin = getNavigator().getLocalParameters().distanceMargin();
             getNavigator().getLocalParameters().addSingleUseCallback(cancelReason -> {
                 if (npc.isSpawned() && currentDestination != null && Util.locationWithinRange(npc.getStoredLocation(),
@@ -672,36 +664,23 @@ public class LinearWaypointProvider implements EnumerableWaypointProvider {
                 return false;
 
             SourceDestinationPair other = (SourceDestinationPair) obj;
-            if (from == null) {
-                if (other.from != null) {
-                    return false;
-                }
-            } else if (!from.equals(other.from)) {
+            if (!Objects.equals(from, other.from) || !Objects.equals(to, other.to))
                 return false;
-            }
-            if (to == null) {
-                if (other.to != null) {
-                    return false;
-                }
-            } else if (!to.equals(other.to)) {
-                return false;
-            }
             return true;
         }
 
         @Override
         public int hashCode() {
-            final int prime = 31;
-            int result = prime + ((from == null) ? 0 : from.hashCode());
-            return prime * result + ((to == null) ? 0 : to.hashCode());
+            int prime = 31;
+            int result = prime + (from == null ? 0 : from.hashCode());
+            return prime * result + (to == null ? 0 : to.hashCode());
         }
 
         public boolean verify(World world, Iterable<Vector> cached) {
             for (Vector vector : cached) {
                 if (!MinecraftBlockExaminer
-                        .canStandOn(world.getBlockAt(vector.getBlockX(), vector.getBlockY() - 1, vector.getBlockZ()))) {
+                        .canStandOn(world.getBlockAt(vector.getBlockX(), vector.getBlockY() - 1, vector.getBlockZ())))
                     return false;
-                }
             }
             return true;
         }
diff --git a/main/src/main/java/net/citizensnpcs/trait/waypoint/LinearWaypointsCompleteEvent.java b/main/src/main/java/net/citizensnpcs/trait/waypoint/LinearWaypointsCompleteEvent.java
index b9497da31..d69626aa7 100644
--- a/main/src/main/java/net/citizensnpcs/trait/waypoint/LinearWaypointsCompleteEvent.java
+++ b/main/src/main/java/net/citizensnpcs/trait/waypoint/LinearWaypointsCompleteEvent.java
@@ -29,12 +29,12 @@ public class LinearWaypointsCompleteEvent extends CitizensEvent {
     }
 
     public void setNextWaypoints(Iterator<Waypoint> waypoints) {
-        this.next = waypoints;
+        next = waypoints;
     }
 
-    private static final HandlerList handlers = new HandlerList();
-
     public static HandlerList getHandlerList() {
         return handlers;
     }
+
+    private static HandlerList handlers = new HandlerList();
 }
diff --git a/main/src/main/java/net/citizensnpcs/trait/waypoint/WanderWaypointProvider.java b/main/src/main/java/net/citizensnpcs/trait/waypoint/WanderWaypointProvider.java
index deb436307..c27856698 100644
--- a/main/src/main/java/net/citizensnpcs/trait/waypoint/WanderWaypointProvider.java
+++ b/main/src/main/java/net/citizensnpcs/trait/waypoint/WanderWaypointProvider.java
@@ -67,10 +67,10 @@ public class WanderWaypointProvider implements WaypointProvider {
     }
 
     @Override
-    public WaypointEditor createEditor(final CommandSender sender, CommandContext args) {
+    public WaypointEditor createEditor(CommandSender sender, CommandContext args) {
         return new WaypointEditor() {
             boolean editingRegions = false;
-            EntityMarkers<Location> markers = new EntityMarkers<Location>();
+            EntityMarkers<Location> markers = new EntityMarkers<>();
 
             @Override
             public void begin() {
@@ -190,9 +190,8 @@ public class WanderWaypointProvider implements WaypointProvider {
 
             @EventHandler(ignoreCancelled = true)
             public void onPlayerInteractEntity(PlayerInteractEntityEvent event) {
-                if (!sender.equals(event.getPlayer()) || !editingRegions || Util.isOffHand(event))
-                    return;
-                if (!event.getRightClicked().hasMetadata("wandermarker"))
+                if (!sender.equals(event.getPlayer()) || !editingRegions || Util.isOffHand(event)
+                        || !event.getRightClicked().hasMetadata("wandermarker"))
                     return;
                 regionCentres.remove(event.getRightClicked().getMetadata("wandermarker").get(0).value());
                 markers.removeMarker((Location) event.getRightClicked().getMetadata("wandermarker").get(0).value());
@@ -268,7 +267,7 @@ public class WanderWaypointProvider implements WaypointProvider {
         if (currentGoal == null) {
             currentGoal = WanderGoal.builder(npc).xrange(xrange).yrange(yrange).pathfind(pathfind)
                     .tree(() -> regionCentres.isEmpty() ? null : tree).delay(delay)
-                    .worldguardRegion(() -> getWorldGuardRegion()).build();
+                    .worldguardRegion(this::getWorldGuardRegion).build();
             if (paused) {
                 currentGoal.pause();
             }
@@ -332,8 +331,8 @@ public class WanderWaypointProvider implements WaypointProvider {
     }
 
     public void setWorldGuardRegion(String region) {
-        this.worldguardRegion = region;
-        this.worldguardRegionCache = null;
+        worldguardRegion = region;
+        worldguardRegionCache = null;
     }
 
     public void setXYRange(int xrange, int yrange) {
@@ -378,6 +377,6 @@ public class WanderWaypointProvider implements WaypointProvider {
         }
     }
 
-    private static final int DEFAULT_XRANGE = 25;
-    private static final int DEFAULT_YRANGE = 3;
+    private static int DEFAULT_XRANGE = 25;
+    private static int DEFAULT_YRANGE = 3;
 }
diff --git a/main/src/main/java/net/citizensnpcs/trait/waypoint/Waypoint.java b/main/src/main/java/net/citizensnpcs/trait/waypoint/Waypoint.java
index 0bd999f1c..a50f33e14 100644
--- a/main/src/main/java/net/citizensnpcs/trait/waypoint/Waypoint.java
+++ b/main/src/main/java/net/citizensnpcs/trait/waypoint/Waypoint.java
@@ -2,6 +2,7 @@ package net.citizensnpcs.trait.waypoint;
 
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
@@ -66,27 +67,13 @@ public class Waypoint {
 
     @Override
     public boolean equals(Object obj) {
-        if (this == obj) {
+        if (this == obj)
             return true;
-        }
-        if (obj == null || getClass() != obj.getClass()) {
+        if (obj == null || getClass() != obj.getClass())
             return false;
-        }
         Waypoint other = (Waypoint) obj;
-        if (location == null) {
-            if (other.location != null) {
-                return false;
-            }
-        } else if (!location.equals(other.location)) {
+        if (!Objects.equals(location, other.location) || !Objects.equals(triggers, other.triggers))
             return false;
-        }
-        if (triggers == null) {
-            if (other.triggers != null) {
-                return false;
-            }
-        } else if (!triggers.equals(other.triggers)) {
-            return false;
-        }
         return true;
     }
 
@@ -100,9 +87,9 @@ public class Waypoint {
 
     @Override
     public int hashCode() {
-        final int prime = 31;
-        int result = prime + ((location == null) ? 0 : location.hashCode());
-        return prime * result + ((triggers == null) ? 0 : triggers.hashCode());
+        int prime = 31;
+        int result = prime + (location == null ? 0 : location.hashCode());
+        return prime * result + (triggers == null ? 0 : triggers.hashCode());
     }
 
     /**
@@ -114,17 +101,19 @@ public class Waypoint {
         runTriggers(npc, 0);
     }
 
-    private void runTriggers(final NPC npc, int start) {
+    private void runTriggers(NPC npc, int start) {
         List<WaypointTrigger> triggers = Lists.newArrayList(this.triggers);
         for (int i = start; i < triggers.size(); i++) {
             WaypointTrigger trigger = triggers.get(i);
             trigger.onWaypointReached(npc, location.clone());
-            if (!(trigger instanceof DelayTrigger))
+            if (!(trigger instanceof DelayTrigger)) {
                 continue;
+            }
             int delay = ((DelayTrigger) trigger).getDelay();
-            if (delay <= 0)
+            if (delay <= 0) {
                 continue;
-            final int newStart = i + 1;
+            }
+            int newStart = i + 1;
             Bukkit.getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(), () -> runTriggers(npc, newStart),
                     delay);
             break;
diff --git a/main/src/main/java/net/citizensnpcs/trait/waypoint/Waypoints.java b/main/src/main/java/net/citizensnpcs/trait/waypoint/Waypoints.java
index 13289c429..ab537fa23 100644
--- a/main/src/main/java/net/citizensnpcs/trait/waypoint/Waypoints.java
+++ b/main/src/main/java/net/citizensnpcs/trait/waypoint/Waypoints.java
@@ -133,7 +133,7 @@ public class Waypoints extends Trait {
         PROVIDERS.put(name, clazz);
     }
 
-    private static final Map<String, Class<? extends WaypointProvider>> PROVIDERS = Maps.newHashMap();
+    private static Map<String, Class<? extends WaypointProvider>> PROVIDERS = Maps.newHashMap();
 
     static {
         PROVIDERS.put("linear", LinearWaypointProvider.class);
diff --git a/main/src/main/java/net/citizensnpcs/trait/waypoint/triggers/AnimationTrigger.java b/main/src/main/java/net/citizensnpcs/trait/waypoint/triggers/AnimationTrigger.java
index 06ae2427f..674ddb09f 100644
--- a/main/src/main/java/net/citizensnpcs/trait/waypoint/triggers/AnimationTrigger.java
+++ b/main/src/main/java/net/citizensnpcs/trait/waypoint/triggers/AnimationTrigger.java
@@ -42,7 +42,6 @@ public class AnimationTrigger implements WaypointTrigger {
         if (at != null) {
             npc.teleport(at, TeleportCause.PLUGIN);
         }
-
         Player player = (Player) npc.getEntity();
         for (PlayerAnimation animation : animations) {
             animation.play(player);
diff --git a/main/src/main/java/net/citizensnpcs/trait/waypoint/triggers/AnimationTriggerPrompt.java b/main/src/main/java/net/citizensnpcs/trait/waypoint/triggers/AnimationTriggerPrompt.java
index 2ea3b8373..b7a66f196 100644
--- a/main/src/main/java/net/citizensnpcs/trait/waypoint/triggers/AnimationTriggerPrompt.java
+++ b/main/src/main/java/net/citizensnpcs/trait/waypoint/triggers/AnimationTriggerPrompt.java
@@ -25,9 +25,8 @@ public class AnimationTriggerPrompt extends StringPrompt implements WaypointTrig
 
     @Override
     public Prompt acceptInput(ConversationContext context, String input) {
-        if (input.equalsIgnoreCase("back")) {
+        if (input.equalsIgnoreCase("back"))
             return (Prompt) context.getSessionData("previous");
-        }
         if (input.startsWith("at ")) {
             try {
                 at = CommandContext.parseLocation(
@@ -40,18 +39,15 @@ public class AnimationTriggerPrompt extends StringPrompt implements WaypointTrig
             }
             return this;
         }
-
         if (input.equalsIgnoreCase("finish")) {
             context.setSessionData(WaypointTriggerPrompt.CREATED_TRIGGER_KEY, new AnimationTrigger(animations, at));
             return (Prompt) context.getSessionData(WaypointTriggerPrompt.RETURN_PROMPT_KEY);
         }
-
         PlayerAnimation animation = Util.matchEnum(PlayerAnimation.values(), input);
         if (animation == null) {
             Messaging.sendErrorTr((CommandSender) context.getForWhom(), Messages.INVALID_ANIMATION, input,
                     getValidAnimations());
         }
-
         animations.add(animation);
         Messaging.sendTr((CommandSender) context.getForWhom(), Messages.ANIMATION_ADDED, input);
         return this;
diff --git a/main/src/main/java/net/citizensnpcs/trait/waypoint/triggers/CommandTriggerPrompt.java b/main/src/main/java/net/citizensnpcs/trait/waypoint/triggers/CommandTriggerPrompt.java
index 7800df58e..4d551f937 100644
--- a/main/src/main/java/net/citizensnpcs/trait/waypoint/triggers/CommandTriggerPrompt.java
+++ b/main/src/main/java/net/citizensnpcs/trait/waypoint/triggers/CommandTriggerPrompt.java
@@ -17,9 +17,8 @@ public class CommandTriggerPrompt extends StringPrompt implements WaypointTrigge
 
     @Override
     public Prompt acceptInput(ConversationContext context, String input) {
-        if (input.equalsIgnoreCase("back")) {
+        if (input.equalsIgnoreCase("back"))
             return (Prompt) context.getSessionData("previous");
-        }
         if (input.equalsIgnoreCase("finish")) {
             context.setSessionData(WaypointTriggerPrompt.CREATED_TRIGGER_KEY, new CommandTrigger(commands));
             return (Prompt) context.getSessionData(WaypointTriggerPrompt.RETURN_PROMPT_KEY);
diff --git a/main/src/main/java/net/citizensnpcs/trait/waypoint/triggers/DelayTrigger.java b/main/src/main/java/net/citizensnpcs/trait/waypoint/triggers/DelayTrigger.java
index 08195a3a2..5c0ac995d 100644
--- a/main/src/main/java/net/citizensnpcs/trait/waypoint/triggers/DelayTrigger.java
+++ b/main/src/main/java/net/citizensnpcs/trait/waypoint/triggers/DelayTrigger.java
@@ -20,6 +20,11 @@ public class DelayTrigger implements WaypointTrigger {
         this.delay = delay;
     }
 
+    private void delay(WaypointProvider provider) {
+        provider.setPaused(true);
+        Bukkit.getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(), () -> provider.setPaused(false), delay);
+    }
+
     @Override
     public String description() {
         return String.format("[[Delay]] for [[%d]] ticks", delay);
@@ -35,14 +40,4 @@ public class DelayTrigger implements WaypointTrigger {
             delay(npc.getOrAddTrait(Waypoints.class).getCurrentProvider());
         }
     }
-
-    private void delay(final WaypointProvider provider) {
-        provider.setPaused(true);
-        Bukkit.getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(), new Runnable() {
-            @Override
-            public void run() {
-                provider.setPaused(false);
-            }
-        }, delay);
-    }
 }
diff --git a/main/src/main/java/net/citizensnpcs/trait/waypoint/triggers/TeleportTriggerPrompt.java b/main/src/main/java/net/citizensnpcs/trait/waypoint/triggers/TeleportTriggerPrompt.java
index 0e6fd483c..539593581 100644
--- a/main/src/main/java/net/citizensnpcs/trait/waypoint/triggers/TeleportTriggerPrompt.java
+++ b/main/src/main/java/net/citizensnpcs/trait/waypoint/triggers/TeleportTriggerPrompt.java
@@ -59,6 +59,6 @@ public class TeleportTriggerPrompt extends RegexPrompt implements WaypointTrigge
         return "";
     }
 
-    private static final Pattern PATTERN = Pattern.compile("here|back|[\\p{L}]+?:[0-9]+?:[0-9]+?:[0-9]+?",
+    private static Pattern PATTERN = Pattern.compile("here|back|[\\p{L}]+?:[0-9]+?:[0-9]+?:[0-9]+?",
             Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
 }
diff --git a/main/src/main/java/net/citizensnpcs/trait/waypoint/triggers/TriggerEditPrompt.java b/main/src/main/java/net/citizensnpcs/trait/waypoint/triggers/TriggerEditPrompt.java
index 813eda702..9581d7ffc 100644
--- a/main/src/main/java/net/citizensnpcs/trait/waypoint/triggers/TriggerEditPrompt.java
+++ b/main/src/main/java/net/citizensnpcs/trait/waypoint/triggers/TriggerEditPrompt.java
@@ -68,7 +68,7 @@ public class TriggerEditPrompt extends StringPrompt {
     }
 
     public static Conversation start(Player player, WaypointEditor editor) {
-        final Conversation conversation = new ConversationFactory(CitizensAPI.getPlugin()).withLocalEcho(false)
+        Conversation conversation = new ConversationFactory(CitizensAPI.getPlugin()).withLocalEcho(false)
                 .addConversationAbandonedListener(event -> Messaging
                         .sendTr((CommandSender) event.getContext().getForWhom(), Messages.WAYPOINT_TRIGGER_EDITOR_EXIT))
                 .withEscapeSequence("exit").withEscapeSequence("triggers").withEscapeSequence("/npc path")
diff --git a/main/src/main/java/net/citizensnpcs/trait/waypoint/triggers/WaypointTriggerPrompt.java b/main/src/main/java/net/citizensnpcs/trait/waypoint/triggers/WaypointTriggerPrompt.java
index ba56ab2ec..879887b59 100644
--- a/main/src/main/java/net/citizensnpcs/trait/waypoint/triggers/WaypointTriggerPrompt.java
+++ b/main/src/main/java/net/citizensnpcs/trait/waypoint/triggers/WaypointTriggerPrompt.java
@@ -15,6 +15,6 @@ import org.bukkit.conversations.Prompt;
 public interface WaypointTriggerPrompt extends Prompt {
     public WaypointTrigger createFromShortInput(ConversationContext context, String input);
 
-    static final String CREATED_TRIGGER_KEY = "created-trigger";
-    static final String RETURN_PROMPT_KEY = "return-to";
+    static String CREATED_TRIGGER_KEY = "created-trigger";
+    static String RETURN_PROMPT_KEY = "return-to";
 }
diff --git a/main/src/main/java/net/citizensnpcs/trait/waypoint/triggers/WaypointTriggerRegistry.java b/main/src/main/java/net/citizensnpcs/trait/waypoint/triggers/WaypointTriggerRegistry.java
index 705dc7473..408022c9e 100644
--- a/main/src/main/java/net/citizensnpcs/trait/waypoint/triggers/WaypointTriggerRegistry.java
+++ b/main/src/main/java/net/citizensnpcs/trait/waypoint/triggers/WaypointTriggerRegistry.java
@@ -56,8 +56,8 @@ public class WaypointTriggerRegistry implements Persister<WaypointTrigger> {
         }
     }
 
-    private static final Map<String, Class<? extends Prompt>> TRIGGER_PROMPTS = Maps.newHashMap();
-    private static final Map<String, Class<? extends WaypointTrigger>> TRIGGERS = Maps.newHashMap();
+    private static Map<String, Class<? extends Prompt>> TRIGGER_PROMPTS = Maps.newHashMap();
+    private static Map<String, Class<? extends WaypointTrigger>> TRIGGERS = Maps.newHashMap();
 
     static {
         addTrigger("animation", AnimationTrigger.class, AnimationTriggerPrompt.class);
diff --git a/main/src/main/java/net/citizensnpcs/util/AbstractBlockBreaker.java b/main/src/main/java/net/citizensnpcs/util/AbstractBlockBreaker.java
index 88a662564..df30c85a2 100644
--- a/main/src/main/java/net/citizensnpcs/util/AbstractBlockBreaker.java
+++ b/main/src/main/java/net/citizensnpcs/util/AbstractBlockBreaker.java
@@ -104,15 +104,13 @@ public abstract class AbstractBlockBreaker extends BlockBreaker {
                 cancelNavigation();
             }
         }
-
         Util.faceLocation(entity, location);
         if (entity instanceof Player && currentTick % 5 == 0) {
             PlayerAnimation.ARM_SWING.play((Player) entity);
         }
-
-        if (entity.getWorld().getBlockAt(x, y, z).isEmpty()) {
+        if (entity.getWorld().getBlockAt(x, y, z).isEmpty())
             return BehaviorStatus.SUCCESS;
-        } else {
+        else {
             int tickDifference = currentTick - startDigTick;
             float damage = getDamage(tickDifference);
             if (damage >= 1F) {
@@ -125,7 +123,6 @@ public abstract class AbstractBlockBreaker extends BlockBreaker {
                 currentDamage = modifiedDamage;
             }
         }
-
         return BehaviorStatus.RUNNING;
     }
 
diff --git a/main/src/main/java/net/citizensnpcs/util/Anchor.java b/main/src/main/java/net/citizensnpcs/util/Anchor.java
index 6b9a86ed6..7a438f928 100644
--- a/main/src/main/java/net/citizensnpcs/util/Anchor.java
+++ b/main/src/main/java/net/citizensnpcs/util/Anchor.java
@@ -78,8 +78,8 @@ public class Anchor {
     public boolean load() {
         try {
             final String[] parts = getUnloadedValue();
-            this.location = new Location(Bukkit.getWorld(parts[0]), Double.valueOf(parts[1]), Double.valueOf(parts[2]),
-                    Double.valueOf(parts[3]));
+            this.location = new Location(Bukkit.getWorld(parts[0]), Double.parseDouble(parts[1]),
+                    Double.parseDouble(parts[2]), Double.parseDouble(parts[3]));
         } catch (final Exception e) {
             // Still not able to be loaded
         }
diff --git a/main/src/main/java/net/citizensnpcs/util/ChunkCoord.java b/main/src/main/java/net/citizensnpcs/util/ChunkCoord.java
index a8a134cfb..e9279530c 100644
--- a/main/src/main/java/net/citizensnpcs/util/ChunkCoord.java
+++ b/main/src/main/java/net/citizensnpcs/util/ChunkCoord.java
@@ -1,5 +1,6 @@
 package net.citizensnpcs.util;
 
+import java.util.Objects;
 import java.util.UUID;
 
 import org.bukkit.Bukkit;
@@ -28,19 +29,16 @@ public class ChunkCoord {
 
     @Override
     public boolean equals(Object obj) {
-        if (this == obj) {
+        if (this == obj)
             return true;
-        }
-        if (obj == null || getClass() != obj.getClass()) {
+
+        if (obj == null || getClass() != obj.getClass())
             return false;
-        }
+
         ChunkCoord other = (ChunkCoord) obj;
-        if (worldUUID == null) {
-            if (other.worldUUID != null) {
-                return false;
-            }
-        } else if (!worldUUID.equals(other.worldUUID)) {
+        if (!Objects.equals(worldUUID, other.worldUUID)) {
             return false;
+
         }
         return x == other.x && z == other.z;
     }
@@ -53,7 +51,7 @@ public class ChunkCoord {
     @Override
     public int hashCode() {
         final int prime = 31;
-        return prime * (prime * (prime + ((worldUUID == null) ? 0 : worldUUID.hashCode())) + x) + z;
+        return prime * (prime * (prime + (worldUUID == null ? 0 : worldUUID.hashCode())) + x) + z;
     }
 
     public void setForceLoaded(boolean b) {
diff --git a/main/src/main/java/net/citizensnpcs/util/EntityPacketTracker.java b/main/src/main/java/net/citizensnpcs/util/EntityPacketTracker.java
index 4706e6eda..4c0689fc4 100644
--- a/main/src/main/java/net/citizensnpcs/util/EntityPacketTracker.java
+++ b/main/src/main/java/net/citizensnpcs/util/EntityPacketTracker.java
@@ -1,6 +1,7 @@
 package net.citizensnpcs.util;
 
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 import java.util.UUID;
 import java.util.function.Consumer;
@@ -64,26 +65,23 @@ public interface EntityPacketTracker extends Runnable {
 
             @Override
             public boolean equals(Object obj) {
-                if (this == obj) {
+                if (this == obj)
                     return true;
-                }
-                if (obj == null || getClass() != obj.getClass()) {
+
+                if (obj == null || getClass() != obj.getClass())
                     return false;
-                }
+
                 PlayerConnection other = (PlayerConnection) obj;
-                if (uuid == null) {
-                    if (other.uuid != null) {
-                        return false;
-                    }
-                } else if (!uuid.equals(other.uuid)) {
+                if (!Objects.equals(uuid, other.uuid)) {
                     return false;
+
                 }
                 return true;
             }
 
             @Override
             public int hashCode() {
-                return 31 + ((uuid == null) ? 0 : uuid.hashCode());
+                return 31 + (uuid == null ? 0 : uuid.hashCode());
             }
         }
     }
diff --git a/main/src/main/java/net/citizensnpcs/util/Messages.java b/main/src/main/java/net/citizensnpcs/util/Messages.java
index 22e3bab46..69f6c14af 100644
--- a/main/src/main/java/net/citizensnpcs/util/Messages.java
+++ b/main/src/main/java/net/citizensnpcs/util/Messages.java
@@ -160,6 +160,7 @@ public class Messages {
     public static final String HOLOGRAM_MARGIN_SET = "citizens.commands.npc.hologram.margin-set";
     public static final String HOLOGRAM_TEXT_MISSING = "citizens.commands.npc.hologram.text-missing";
     public static final String HOLOGRAM_TEXT_REMOVED = "citizens.commands.npc.hologram.text-removed";
+    public static final String HOLOGRAM_VIEW_RANGE_SET = "citizens.commands.npc.hologram.view-range-set";
     public static final String HOME_TRAIT_DELAY_SET = "citizens.commands.npc.home.delay-set";
     public static final String HOME_TRAIT_DISTANCE_SET = "citizens.commands.npc.home.distance-set";
     public static final String HOME_TRAIT_LOCATION_SET = "citizens.commands.npc.home.home-set";
@@ -331,6 +332,7 @@ public class Messages {
     public static final String PIGLIN_DANCING_UNSET = "citizens.commands.npc.piglin.dancing-unset";
     public static final String PLAYER_NOT_FOUND_FOR_SPAWN = "citizens.commands.npc.create.no-player-for-spawn";
     public static final String PLAYERFILTER_ALLOWLIST_SET = "citizens.commands.npc.playerfilter.allowlist-set";
+    public static final String PLAYERFILTER_APPLYRANGE_SET = "citizens.commands.npc.playerfilter.applyrange-set";
     public static final String PLAYERFILTER_CLEARED = "citizens.commands.npc.playerfilter.cleared";
     public static final String PLAYERFILTER_DENYLIST_SET = "citizens.commands.npc.playerfilter.denylist-set";
     public static final String PLAYERFILTER_EMPTY_SET = "citizens.commands.npc.playerfilter.emptied";
diff --git a/main/src/main/java/net/citizensnpcs/util/MojangSkinGenerator.java b/main/src/main/java/net/citizensnpcs/util/MojangSkinGenerator.java
index 680b1cf40..965eaae8b 100644
--- a/main/src/main/java/net/citizensnpcs/util/MojangSkinGenerator.java
+++ b/main/src/main/java/net/citizensnpcs/util/MojangSkinGenerator.java
@@ -53,7 +53,6 @@ public class MojangSkinGenerator {
                 if (Messaging.isDebugging()) {
                     Messaging.debug(str);
                 }
-
                 if (con.getResponseCode() != 200)
                     return null;
 
@@ -108,7 +107,6 @@ public class MojangSkinGenerator {
                 if (Messaging.isDebugging()) {
                     Messaging.debug(str);
                 }
-
                 if (con.getResponseCode() != 200)
                     return null;
 
diff --git a/main/src/main/java/net/citizensnpcs/util/NMS.java b/main/src/main/java/net/citizensnpcs/util/NMS.java
index e9db3c73a..1d9b6fe6d 100644
--- a/main/src/main/java/net/citizensnpcs/util/NMS.java
+++ b/main/src/main/java/net/citizensnpcs/util/NMS.java
@@ -136,7 +136,6 @@ public class NMS {
         if (!PAPER_KNOCKBACK_EVENT_EXISTS) {
             event.getKnockbackVector().multiply(new Vector(-1, 0, -1));
         }
-
         if (!event.isCancelled()) {
             cb.accept(event);
         }
@@ -180,7 +179,6 @@ public class NMS {
                         "findProfilesByNames", false, String[].class, ProfileLookupCallback.class);
             }
         }
-
         try {
             FIND_PROFILES_BY_NAMES.invoke(BRIDGE.getGameProfileRepository(), names, cb);
         } catch (Throwable e) {
@@ -201,9 +199,9 @@ public class NMS {
     }
 
     public static BoundingBox getCollisionBox(Block block) {
-        if (block.getType() == Material.AIR) {
+        if (block.getType() == Material.AIR)
             return BoundingBox.EMPTY;
-        }
+
         return BRIDGE.getCollisionBox(block).add(block.getX(), block.getY(), block.getZ());
     }
 
@@ -244,8 +242,9 @@ public class NMS {
     private static List<Field> getFieldsMatchingType(Class<?> clazz, Class<?> type, boolean allowStatic) {
         List<Field> found = Lists.newArrayList();
         for (Field field : clazz.getDeclaredFields()) {
-            if (allowStatic ^ Modifier.isStatic(field.getModifiers()))
+            if (allowStatic ^ Modifier.isStatic(field.getModifiers())) {
                 continue;
+            }
             if (field.getType() == type) {
                 found.add(field);
                 field.setAccessible(true);
@@ -385,14 +384,16 @@ public class NMS {
         try {
             Method first = null;
             for (Method method : clazz.getDeclaredMethods()) {
-                if (returnType != null && !returnType.equals(method.getReturnType()))
+                if (returnType != null && !returnType.equals(method.getReturnType())) {
                     continue;
+                }
                 Class<?>[] paramTypes = method.getParameterTypes();
                 if (paramTypes.length == params.length) {
                     first = method;
                     for (int i = 0; i < paramTypes.length; i++) {
                         if (paramTypes[i] != params[i]) {
                             first = null;
+                            break;
                         }
                     }
                     if (first != null) {
@@ -472,9 +473,8 @@ public class NMS {
     public static float getJumpPower(NPC npc, float original) {
         if (npc == null)
             return original;
-        if (npc.data().has(NPC.Metadata.JUMP_POWER_SUPPLIER)) {
+        if (npc.data().has(NPC.Metadata.JUMP_POWER_SUPPLIER))
             return npc.data().<Function<NPC, Float>> get(NPC.Metadata.JUMP_POWER_SUPPLIER).apply(npc);
-        }
 
         return original;
     }
@@ -816,9 +816,9 @@ public class NMS {
     }
 
     public static void setPeekShulker(org.bukkit.entity.Entity entity, int peek) {
-        if (!entity.getType().name().equals("SHULKER")) {
+        if (!entity.getType().name().equals("SHULKER"))
             throw new IllegalArgumentException("entity must be a shulker");
-        }
+
         BRIDGE.setPeekShulker(entity, peek);
     }
 
diff --git a/main/src/main/java/net/citizensnpcs/util/NMSBridge.java b/main/src/main/java/net/citizensnpcs/util/NMSBridge.java
index 537c47e98..59b679deb 100644
--- a/main/src/main/java/net/citizensnpcs/util/NMSBridge.java
+++ b/main/src/main/java/net/citizensnpcs/util/NMSBridge.java
@@ -60,7 +60,7 @@ public interface NMSBridge {
 
     public default Iterable<Object> createBundlePacket(List<Object> packets) {
         return packets;
-    };
+    }
 
     public EntityPacketTracker createPacketTracker(Entity entity, PacketAggregator agg);
 
@@ -82,7 +82,7 @@ public interface NMSBridge {
 
     public float getHeadYaw(Entity entity);
 
-    public double getHeight(Entity entity);;
+    public double getHeight(Entity entity);
 
     public float getHorizontalMovement(Entity entity);
 
@@ -148,7 +148,7 @@ public interface NMSBridge {
 
     public void playAnimation(PlayerAnimation animation, Player player, Iterable<Player> to);
 
-    public Runnable playerTicker(Player entity);;
+    public Runnable playerTicker(Player entity);
 
     public void registerEntityClass(Class<?> clazz);
 
@@ -166,18 +166,18 @@ public interface NMSBridge {
 
     public boolean sendTabListAdd(Player recipient, Player listPlayer);
 
-    public void sendTabListRemove(Player recipient, Collection<? extends SkinnableEntity> skinnableNPCs);;
+    public void sendTabListRemove(Player recipient, Collection<? extends SkinnableEntity> skinnableNPCs);
 
-    public void sendTabListRemove(Player recipient, Player listPlayer);;
+    public void sendTabListRemove(Player recipient, Player listPlayer);
 
-    public void sendTeamPacket(Player recipient, Team team, int mode);;
+    public void sendTeamPacket(Player recipient, Team team, int mode);
 
     default public void setAggressive(Entity entity, boolean aggro) {
     }
 
     public default void setAllayDancing(Entity entity, boolean dancing) {
         throw new UnsupportedOperationException();
-    };
+    }
 
     public void setBodyYaw(Entity entity, float yaw);
 
diff --git a/main/src/main/java/net/citizensnpcs/util/PlayerAnimation.java b/main/src/main/java/net/citizensnpcs/util/PlayerAnimation.java
index cbd01655d..dec185b6c 100644
--- a/main/src/main/java/net/citizensnpcs/util/PlayerAnimation.java
+++ b/main/src/main/java/net/citizensnpcs/util/PlayerAnimation.java
@@ -69,13 +69,11 @@ public enum PlayerAnimation {
                 ((NPCHolder) player).getNPC().getOrAddTrait(SitTrait.class).setSitting(player.getLocation());
                 return;
             }
-
             player.setMetadata("citizens.sitting", new FixedMetadataValue(CitizensAPI.getPlugin(), true));
             NPCRegistry registry = CitizensAPI.getNamedNPCRegistry("PlayerAnimationImpl");
             if (registry == null) {
                 registry = CitizensAPI.createNamedNPCRegistry("PlayerAnimationImpl", new MemoryNPCDataStore());
             }
-
             final NPC holder = registry.createNPC(EntityType.ARMOR_STAND, "");
             holder.getOrAddTrait(ArmorStandTrait.class).setAsPointEntity();
             holder.spawn(player.getLocation());
@@ -127,7 +125,6 @@ public enum PlayerAnimation {
                 Bukkit.getScheduler().cancelTask(player.getMetadata("citizens-using-item-id").get(0).asInt());
                 player.removeMetadata("citizens-using-item-id", CitizensAPI.getPlugin());
             }
-
             if (this == STOP_USE_ITEM)
                 return;
 
@@ -143,7 +140,6 @@ public enum PlayerAnimation {
                             cancel();
                             return;
                         }
-
                         NMS.playAnimation(PlayerAnimation.STOP_USE_ITEM, player, to);
                         NMS.playAnimation(PlayerAnimation.this, player, to);
                         if (!player.hasMetadata("citizens-using-item-id")) {
@@ -154,10 +150,8 @@ public enum PlayerAnimation {
                 }.runTaskTimer(CitizensAPI.getPlugin(), Math.max(0, remainingTicks + 1),
                         Math.max(1, remainingTicks + 1));
             }
-
             return;
         }
-
         NMS.playAnimation(this, player, to);
     }
 
diff --git a/main/src/main/java/net/citizensnpcs/util/Util.java b/main/src/main/java/net/citizensnpcs/util/Util.java
index a7382016b..475f1af4e 100644
--- a/main/src/main/java/net/citizensnpcs/util/Util.java
+++ b/main/src/main/java/net/citizensnpcs/util/Util.java
@@ -81,22 +81,20 @@ public class Util {
                 e.printStackTrace();
             }
         }
-
         try {
             return Bukkit.getScheduler().callSyncMethod(CitizensAPI.getPlugin(), callable).get();
         } catch (Exception e) {
             e.printStackTrace();
         }
-
         return null;
     }
 
     public static Vector callPushEvent(NPC npc, double x, double y, double z) {
         boolean allowed = npc == null || !npc.isProtected()
-                || (npc.data().has(NPC.Metadata.COLLIDABLE) && npc.data().<Boolean> get(NPC.Metadata.COLLIDABLE));
-        if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0) {
+                || npc.data().has(NPC.Metadata.COLLIDABLE) && npc.data().<Boolean> get(NPC.Metadata.COLLIDABLE);
+        if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0)
             return allowed ? new Vector(x, y, z) : null;
-        }
+
         // when another entity collides, this method is called to push the NPC so we prevent it from
         // doing anything if the event is cancelled.
         Vector vector = new Vector(x, y, z);
@@ -193,7 +191,7 @@ public class Util {
         Location center = new Location(bloc.getWorld(), bloc.getBlockX() + 0.5, bloc.getBlockY(),
                 bloc.getBlockZ() + 0.5);
         BoundingBox bb = NMS.getCollisionBox(block);
-        if (bb != null && (bb.maxY - bb.minY) < 0.6D) {
+        if (bb != null && bb.maxY - bb.minY < 0.6D) {
             center.setY(center.getY() + (bb.maxY - bb.minY));
         }
         return center;
@@ -209,10 +207,10 @@ public class Util {
         double tX = x + motX;
         double tZ = z + motZ;
         if (z > tZ)
-            return (float) (-Math.toDegrees(Math.atan((x - tX) / (z - tZ))));
-        if (z < tZ) {
-            return (float) (-Math.toDegrees(Math.atan((x - tX) / (z - tZ)))) + 180.0F;
-        }
+            return (float) -Math.toDegrees(Math.atan((x - tX) / (z - tZ)));
+        if (z < tZ)
+            return (float) -Math.toDegrees(Math.atan((x - tX) / (z - tZ))) + 180.0F;
+
         return location.getYaw();
     }
 
@@ -249,9 +247,9 @@ public class Util {
     public static boolean inBlock(Entity entity) {
         // TODO: bounding box aware?
         Location loc = entity.getLocation();
-        if (!Util.isLoaded(loc)) {
+        if (!Util.isLoaded(loc))
             return false;
-        }
+
         Block in = loc.getBlock();
         Block above = in.getRelative(BlockFace.UP);
         return in.getType().isSolid() && above.getType().isSolid() && NMS.isSolid(in) && NMS.isSolid(above);
@@ -314,9 +312,7 @@ public class Util {
     }
 
     public static boolean locationWithinRange(Location current, Location target, double range) {
-        if (current == null || target == null)
-            return false;
-        if (current.getWorld() != target.getWorld())
+        if (current == null || target == null || (current.getWorld() != target.getWorld()))
             return false;
         return current.distance(target) <= range;
     }
@@ -325,15 +321,15 @@ public class Util {
         toMatch = toMatch.toLowerCase().replace('-', '_').replace(' ', '_');
         for (T check : values) {
             if (toMatch.equals(check.name().toLowerCase())
-                    || (toMatch.equals("item") && check == EntityType.DROPPED_ITEM)) {
+                    || toMatch.equals("item") && check == EntityType.DROPPED_ITEM)
                 return check; // check for an exact match first
-            }
+
         }
         for (T check : values) {
             String name = check.name().toLowerCase();
-            if (name.replace("_", "").equals(toMatch) || name.startsWith(toMatch)) {
+            if (name.replace("_", "").equals(toMatch) || name.startsWith(toMatch))
                 return check;
-            }
+
         }
         return null;
     }
@@ -352,9 +348,9 @@ public class Util {
                     matchMaterial = Material.BOOK;
                 }
             }
-            if (matchMaterial == player.getInventory().getItemInHand().getType()) {
+            if (matchMaterial == player.getInventory().getItemInHand().getType())
                 return true;
-            }
+
         }
         return false;
     }
@@ -434,12 +430,10 @@ public class Util {
             Bukkit.getServer().dispatchCommand(Bukkit.getConsoleSender(), interpolatedCommand);
             return;
         }
-
         boolean wasOp = clicker.isOp();
         if (op) {
             clicker.setOp(true);
         }
-
         try {
             if (bungeeServer != null) {
                 ByteArrayDataOutput out = ByteStreams.newDataOutput();
@@ -453,7 +447,6 @@ public class Util {
         } catch (Throwable t) {
             t.printStackTrace();
         }
-
         if (op) {
             clicker.setOp(wasOp);
         }
@@ -511,44 +504,46 @@ public class Util {
 
         else { // Multiple recipients
             String text = Setting.CHAT_FORMAT_TO_TARGET.asString().replace("<text>", context.getMessage());
-            List<String> targetNames = new ArrayList<String>();
+            List<String> targetNames = new ArrayList<>();
             // Talk to each recipient
             for (Talkable talkable : context) {
                 talkable.talkTo(context, text);
                 targetNames.add(talkable.getName());
             }
-
             if (!Setting.CHAT_BYSTANDERS_HEAR_TARGETED_CHAT.asBoolean())
                 return;
             String targets = "";
             int max = Setting.CHAT_MAX_NUMBER_OF_TARGETS.asInt();
             String[] format = Setting.CHAT_MULTIPLE_TARGETS_FORMAT.asString().split("\\|");
-            if (format.length != 4)
+            if (format.length != 4) {
                 Messaging.severe("npc.chat.options.multiple-targets-format invalid!");
+            }
             if (max == 1) {
                 targets = format[0].replace("<target>", targetNames.get(0)) + format[3];
             } else if (max == 2 || targetNames.size() == 2) {
                 if (targetNames.size() == 2) {
                     targets = format[0].replace("<target>", targetNames.get(0))
                             + format[2].replace("<target>", targetNames.get(1));
-                } else
+                } else {
                     targets = format[0].replace("<target>", targetNames.get(0))
                             + format[1].replace("<target>", targetNames.get(1)) + format[3];
+                }
             } else if (max >= 3) {
                 targets = format[0].replace("<target>", targetNames.get(0));
 
                 int x = 1;
                 for (x = 1; x < max - 1; x++) {
-                    if (targetNames.size() - 1 == x)
+                    if (targetNames.size() - 1 == x) {
                         break;
+                    }
                     targets = targets + format[1].replace("<npc>", targetNames.get(x));
                 }
                 if (targetNames.size() == max) {
                     targets = targets + format[2].replace("<npc>", targetNames.get(x));
-                } else
+                } else {
                     targets = targets + format[3];
+                }
             }
-
             String bystanderText = Setting.CHAT_FORMAT_WITH_TARGETS_TO_BYSTANDERS.asString()
                     .replace("<targets>", targets).replace("<text>", context.getMessage());
             talkToBystanders(npc, bystanderText, context);
@@ -572,7 +567,6 @@ public class Util {
                     }
                 }
             }
-
             if (shouldTalk) {
                 new TalkableEntity(bystander).talkNear(context, text);
             }
diff --git a/main/src/main/java/net/citizensnpcs/util/XORShiftRNG.java b/main/src/main/java/net/citizensnpcs/util/XORShiftRNG.java
index b0a02b6ff..932943eec 100644
--- a/main/src/main/java/net/citizensnpcs/util/XORShiftRNG.java
+++ b/main/src/main/java/net/citizensnpcs/util/XORShiftRNG.java
@@ -70,14 +70,14 @@ public class XORShiftRNG extends Random {
     protected int next(int bits) {
         try {
             lock.lock();
-            int t = (state1 ^ (state1 >> 7));
+            int t = state1 ^ state1 >> 7;
             state1 = state2;
             state2 = state3;
             state3 = state4;
             state4 = state5;
-            state5 = (state5 ^ (state5 << 6)) ^ (t ^ (t << 13));
+            state5 = state5 ^ state5 << 6 ^ t ^ t << 13;
             int value = (state2 + state2 + 1) * state5;
-            return value >>> (32 - bits);
+            return value >>> 32 - bits;
         } finally {
             lock.unlock();
         }
@@ -94,8 +94,8 @@ public class XORShiftRNG extends Random {
      * @return The 32-bit integer represented by the four bytes.
      */
     public static int convertBytesToInt(byte[] bytes, int offset) {
-        return (BITWISE_BYTE_TO_INT & bytes[offset + 3]) | ((BITWISE_BYTE_TO_INT & bytes[offset + 2]) << 8)
-                | ((BITWISE_BYTE_TO_INT & bytes[offset + 1]) << 16) | ((BITWISE_BYTE_TO_INT & bytes[offset]) << 24);
+        return BITWISE_BYTE_TO_INT & bytes[offset + 3] | (BITWISE_BYTE_TO_INT & bytes[offset + 2]) << 8
+                | (BITWISE_BYTE_TO_INT & bytes[offset + 1]) << 16 | (BITWISE_BYTE_TO_INT & bytes[offset]) << 24;
     }
 
     /**
@@ -108,9 +108,9 @@ public class XORShiftRNG extends Random {
      * @since 1.1
      */
     public static int[] convertBytesToInts(byte[] bytes) {
-        if (bytes.length % 4 != 0) {
+        if (bytes.length % 4 != 0)
             throw new IllegalArgumentException("Number of input bytes must be a multiple of 4.");
-        }
+
         int[] ints = new int[bytes.length / 4];
         for (int i = 0; i < ints.length; i++) {
             ints[i] = convertBytesToInt(bytes, i * 4);
diff --git a/main/src/main/resources/en.json b/main/src/main/resources/en.json
index 311e258b1..2e5065275 100644
--- a/main/src/main/resources/en.json
+++ b/main/src/main/resources/en.json
@@ -130,6 +130,7 @@
   "citizens.commands.npc.hologram.text-describe-header" : "[[{0}]]''s hologram text (in bottom-up order):",
   "citizens.commands.npc.hologram.text-missing" : "Missing text to add.",
   "citizens.commands.npc.hologram.text-removed" : "Removed hologram text.",
+  "citizens.commands.npc.hologram.view-range-set" : "[[{0}]]''s hologram view range set to [[{1}]] blocks.",
   "citizens.commands.npc.hologram.text-set" : "Set hologram text line [[{0}]] to [[{1}]].",
   "citizens.commands.npc.home.delay-set" : "Delay before returning home set to [[{0}]] ticks.",
   "citizens.commands.npc.home.distance-set" : "Distance before returning home set to [[{0}]] blocks.",
@@ -243,6 +244,7 @@
   "citizens.commands.npc.playerfilter.cleared" : "[[{0}]]''s filter cleared.",
   "citizens.commands.npc.playerfilter.denylist-set" : "[[{0}]] filter mode set to denylist.  ",
   "citizens.commands.npc.playerfilter.emptied" : "[[{0}]]''s filter was emptied.",
+  "citizens.commands.npc.playerfilter.applyrange-set": "[[{0}]]''s filter will now apply within [[{1}]] blocks.",
   "citizens.commands.npc.playerfilter.group-added" : "[[{0}]] added to [[{1}]]''s filter groups.",
   "citizens.commands.npc.playerfilter.group-removed" : "[[{0}]] removed from [[{1}]]''s filter players.  ",
   "citizens.commands.npc.playerfilter.removed" : "[[{0}]] removed from [[{1}]]''s filter players.  ",
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ArmorStandController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ArmorStandController.java
index 8a1562d0b..10f5e2c6c 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ArmorStandController.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ArmorStandController.java
@@ -84,7 +84,6 @@ public class ArmorStandController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -98,7 +97,6 @@ public class ArmorStandController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -106,7 +104,6 @@ public class ArmorStandController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new ArmorStandNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -121,7 +118,6 @@ public class ArmorStandController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -131,7 +127,6 @@ public class ArmorStandController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
     }
 }
\ No newline at end of file
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/BatController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/BatController.java
index 6771cda4d..4e081eeb4 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/BatController.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/BatController.java
@@ -58,7 +58,6 @@ public class BatController extends MobEntityController {
             if (npc != null) {
                 setAsleep(false);
             }
-
         }
 
         @Override
@@ -100,7 +99,6 @@ public class BatController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -114,7 +112,6 @@ public class BatController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -127,7 +124,6 @@ public class BatController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new BatNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -146,7 +142,6 @@ public class BatController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -157,7 +152,6 @@ public class BatController extends MobEntityController {
                 NMSImpl.updateAI(this);
                 npc.update();
             }
-
         }
     }
 }
\ No newline at end of file
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/BlazeController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/BlazeController.java
index 1180cb975..4feb9cc01 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/BlazeController.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/BlazeController.java
@@ -96,7 +96,6 @@ public class BlazeController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -110,7 +109,6 @@ public class BlazeController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -123,7 +121,6 @@ public class BlazeController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new BlazeNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -142,7 +139,6 @@ public class BlazeController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -150,7 +146,6 @@ public class BlazeController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
     }
 }
\ No newline at end of file
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CaveSpiderController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CaveSpiderController.java
index bea90a504..a6b5aa3b1 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CaveSpiderController.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CaveSpiderController.java
@@ -69,7 +69,6 @@ public class CaveSpiderController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -106,7 +105,6 @@ public class CaveSpiderController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -119,7 +117,6 @@ public class CaveSpiderController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -128,7 +125,6 @@ public class CaveSpiderController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -138,7 +134,6 @@ public class CaveSpiderController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -151,7 +146,6 @@ public class CaveSpiderController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new CaveSpiderNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -170,7 +164,6 @@ public class CaveSpiderController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -179,7 +172,6 @@ public class CaveSpiderController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -197,7 +189,6 @@ public class CaveSpiderController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
     }
 }
\ No newline at end of file
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ChickenController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ChickenController.java
index 6cbd0c03b..455009483 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ChickenController.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ChickenController.java
@@ -70,7 +70,6 @@ public class ChickenController extends MobEntityController {
                 super.a(flag);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, flag, super::a);
         }
 
@@ -79,7 +78,6 @@ public class ChickenController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -116,7 +114,6 @@ public class ChickenController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -129,7 +126,6 @@ public class ChickenController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -138,7 +134,6 @@ public class ChickenController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -148,7 +143,6 @@ public class ChickenController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -161,7 +155,6 @@ public class ChickenController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new ChickenNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -180,7 +173,6 @@ public class ChickenController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -189,7 +181,6 @@ public class ChickenController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -205,7 +196,6 @@ public class ChickenController extends MobEntityController {
             if (npc != null) {
                 this.bD = 100; // egg timer
             }
-
             super.n();
         }
     }
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CowController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CowController.java
index 064efaf46..572d4d4f3 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CowController.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CowController.java
@@ -74,7 +74,6 @@ public class CowController extends MobEntityController {
                 super.a(flag);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, flag, super::a);
         }
 
@@ -83,7 +82,6 @@ public class CowController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -130,7 +128,6 @@ public class CowController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -143,7 +140,6 @@ public class CowController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -152,7 +148,6 @@ public class CowController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -162,7 +157,6 @@ public class CowController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -175,7 +169,6 @@ public class CowController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new CowNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -194,7 +187,6 @@ public class CowController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -203,7 +195,6 @@ public class CowController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CreeperController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CreeperController.java
index 1f910363e..b3c229223 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CreeperController.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CreeperController.java
@@ -75,7 +75,6 @@ public class CreeperController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -117,7 +116,6 @@ public class CreeperController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -130,7 +128,6 @@ public class CreeperController extends MobEntityController {
             if (npc == null || !npc.isProtected()) {
                 super.dh();
             }
-
         }
 
         @Override
@@ -138,7 +135,6 @@ public class CreeperController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -147,7 +143,6 @@ public class CreeperController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -157,7 +152,6 @@ public class CreeperController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -170,7 +164,6 @@ public class CreeperController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new CreeperNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -189,7 +182,6 @@ public class CreeperController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -198,7 +190,6 @@ public class CreeperController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -214,7 +205,6 @@ public class CreeperController extends MobEntityController {
             if (npc == null || allowPowered) {
                 super.onLightningStrike(entitylightning);
             }
-
         }
 
         public void setAllowPowered(boolean allowPowered) {
@@ -228,7 +218,6 @@ public class CreeperController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
     }
 }
\ No newline at end of file
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EnderDragonController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EnderDragonController.java
index 57d3977e4..9fe36ceca 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EnderDragonController.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EnderDragonController.java
@@ -102,7 +102,6 @@ public class EnderDragonController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -122,7 +121,6 @@ public class EnderDragonController extends MobEntityController {
                 motY = old.y;
                 motZ = old.z;
             }
-
             return res;
         }
 
@@ -132,7 +130,6 @@ public class EnderDragonController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -145,7 +142,6 @@ public class EnderDragonController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new EnderDragonNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -164,7 +160,6 @@ public class EnderDragonController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -172,25 +167,20 @@ public class EnderDragonController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
             if (npc != null) {
                 if (getDragonControllerManager().a().getControllerPhase() == DragonControllerPhase.j) {
                     setHealth(0F);
                     return;
                 }
-
                 if (this.c < 0) {
                     for (int i = 0; i < this.b.length; ++i) {
                         this.b[i][0] = this.yaw;
                         this.b[i][1] = this.locY;
                     }
-
                 }
-
                 if (++this.c == this.b.length) {
                     this.c = 0;
                 }
-
                 this.b[this.c][0] = this.yaw;
                 this.b[this.c][1] = this.locY;
 
@@ -203,11 +193,9 @@ public class EnderDragonController extends MobEntityController {
                     children[j].lastY = vec3.y;
                     children[j].lastZ = vec3.z;
                 }
-
                 if (getBukkitEntity().getPassenger() != null) {
                     yaw = getBukkitEntity().getPassenger().getLocation().getYaw() - 180;
                 }
-
                 if (motX != 0 || motY != 0 || motZ != 0) {
                     motX *= 0.98;
                     motY *= 0.98;
@@ -215,10 +203,8 @@ public class EnderDragonController extends MobEntityController {
                     if (getBukkitEntity().getPassenger() == null) {
                         yaw = Util.getDragonYaw(getBukkitEntity(), motX, motZ);
                     }
-
                     setPosition(locX + motX, locY + motY, locZ + motZ);
                 }
-
                 if (npc.hasTrait(EnderDragonTrait.class) && npc.getOrAddTrait(EnderDragonTrait.class).isDestroyWalls()
                         && NMSImpl.ENDERDRAGON_CHECK_WALLS != null) {
                     for (int i = 0; i < 3; i++) {
@@ -228,11 +214,8 @@ public class EnderDragonController extends MobEntityController {
                         } catch (Throwable e) {
                             e.printStackTrace();
                         }
-
                     }
-
                 }
-
                 if (npc.data().get(NPC.Metadata.COLLIDABLE, false)) {
                     try {
                         KNOCKBACK.invoke(this, this.world.getEntities(this,
@@ -244,13 +227,10 @@ public class EnderDragonController extends MobEntityController {
                     } catch (Throwable t) {
                         t.printStackTrace();
                     }
-
                 }
-
             } else {
                 super.n();
             }
-
         }
 
         private static final MethodHandle HURT = NMS.getMethodHandle(EntityEnderDragon.class, "b", true,
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EndermanController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EndermanController.java
index eaa697728..9d2b05c0a 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EndermanController.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EndermanController.java
@@ -69,7 +69,6 @@ public class EndermanController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -106,7 +105,6 @@ public class EndermanController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -119,7 +117,6 @@ public class EndermanController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -128,7 +125,6 @@ public class EndermanController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -138,7 +134,6 @@ public class EndermanController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -151,7 +146,6 @@ public class EndermanController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new EndermanNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -177,7 +171,6 @@ public class EndermanController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -186,7 +179,6 @@ public class EndermanController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -204,7 +196,6 @@ public class EndermanController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
     }
 }
\ No newline at end of file
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EndermiteController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EndermiteController.java
index ddf77c755..d025a8b45 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EndermiteController.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EndermiteController.java
@@ -69,7 +69,6 @@ public class EndermiteController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -106,7 +105,6 @@ public class EndermiteController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -119,7 +117,6 @@ public class EndermiteController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -128,7 +125,6 @@ public class EndermiteController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -138,7 +134,6 @@ public class EndermiteController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -151,7 +146,6 @@ public class EndermiteController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new EndermiteNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -170,7 +164,6 @@ public class EndermiteController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -179,7 +172,6 @@ public class EndermiteController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -197,7 +189,6 @@ public class EndermiteController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
     }
 }
\ No newline at end of file
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EntityHumanNPC.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EntityHumanNPC.java
index 1692011bb..fac2db52f 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EntityHumanNPC.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EntityHumanNPC.java
@@ -84,7 +84,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         } else {
             skinTracker = null;
         }
-
     }
 
     @Override
@@ -92,7 +91,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         if (npc == null || !npc.isFlyable()) {
             super.a(d0, flag, block, blockposition);
         }
-
     }
 
     @Override
@@ -128,7 +126,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         if (npc != null) {
             Util.callCollisionEvent(npc, entity.getBukkitEntity());
         }
-
     }
 
     @Override
@@ -141,7 +138,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
             velocityChanged = false;
             Bukkit.getScheduler().runTask(CitizensAPI.getPlugin(), () -> EntityHumanNPC.this.velocityChanged = true);
         }
-
         return damaged;
     }
 
@@ -167,7 +163,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         if (npc == null || !npc.isFlyable()) {
             super.e(f, f1);
         }
-
     }
 
     @Override
@@ -176,7 +171,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         if (vector != null) {
             super.g(vector.getX(), vector.getY(), vector.getZ());
         }
-
     }
 
     @Override
@@ -186,7 +180,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         } else {
             NMSImpl.flyingMoveLogic(this, f, f1);
         }
-
     }
 
     @Override
@@ -194,7 +187,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         if (npc != null && bukkitEntity == null) {
             bukkitEntity = new PlayerNPC(this);
         }
-
         return super.getBukkitEntity();
     }
 
@@ -221,7 +213,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         if (skinName == null) {
             skinName = npc.getName();
         }
-
         return skinName.toLowerCase();
     }
 
@@ -245,12 +236,10 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         } catch (IOException e) {
             // swallow
         }
-
         AttributeInstance range = getAttributeInstance(GenericAttributes.FOLLOW_RANGE);
         if (range == null) {
             range = getAttributeMap().b(GenericAttributes.FOLLOW_RANGE);
         }
-
         range.setValue(Setting.DEFAULT_PATHFINDING_RANGE.asDouble());
         controllerJump = new PlayerControllerJump(this);
         controllerMove = new PlayerControllerMove(this);
@@ -276,7 +265,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
             super.k_();
             return;
         }
-
         super.U();
         boolean navigating = npc.getNavigator().isNavigating() || controllerMove.a();
         if (!navigating && getBukkitEntity() != null
@@ -285,19 +273,15 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
                 && (!npc.isProtected() || SpigotUtil.checkYSafe(locY, getBukkitEntity().getWorld()))) {
             moveWithFallDamage(0, 0);
         }
-
         if (Math.abs(motX) < EPSILON && Math.abs(motY) < EPSILON && Math.abs(motZ) < EPSILON) {
             motX = motY = motZ = 0;
         }
-
         if (navigating) {
             if (!NMSImpl.isNavigationFinished(navigation)) {
                 NMSImpl.updateNavigation(navigation);
             }
-
             moveOnCurrentHeading();
         }
-
         updateAI();
         cs();
         if (npc.data().get(NPC.Metadata.PICKUP_ITEMS, false)) {
@@ -307,16 +291,12 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
             } else {
                 axisalignedbb = this.getBoundingBox().grow(1.0, 0.5, 1.0);
             }
-
             for (Entity entity : this.world.getEntities(this, axisalignedbb)) {
                 if (!entity.dead) {
                     entity.d(this);
                 }
-
             }
-
         }
-
     }
 
     @Override
@@ -344,11 +324,9 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
                 cl();
                 jumpTicks = 10;
             }
-
         } else {
             jumpTicks = 0;
         }
-
         bf *= 0.98F;
         bg *= 0.98F;
         bh *= 0.9F;
@@ -357,7 +335,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         if (jumpTicks > 0) {
             jumpTicks--;
         }
-
     }
 
     private void moveWithFallDamage(float mx, float my) {
@@ -366,7 +343,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         if (!npc.isProtected()) {
             a(this.locY - y, onGround);
         }
-
     }
 
     public void setMoveDestination(double x, double y, double z, double speed) {
@@ -422,16 +398,12 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
                 if (cache != null) {
                     this.getAttributeMap().a(cache.a(slot));
                 }
-
                 if (equipment != null) {
                     this.getAttributeMap().b(equipment.a(slot));
                 }
-
             }
-
             equipmentCache.put(slot, equipment);
         }
-
         if (!itemChanged)
             return;
         Location current = getBukkitEntity().getLocation(packetLocationCache);
@@ -440,7 +412,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         for (EnumItemSlot slot : EnumItemSlot.values()) {
             packets[i++] = new PacketPlayOutEntityEquipment(getId(), slot, getEquipment(slot));
         }
-
         NMSImpl.sendPacketsNearby(getBukkitEntity(), current, packets);
     }
 
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/GhastController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/GhastController.java
index ed976c936..44929f364 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/GhastController.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/GhastController.java
@@ -82,7 +82,6 @@ public class GhastController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -101,7 +100,6 @@ public class GhastController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -114,7 +112,6 @@ public class GhastController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new GhastNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -133,7 +130,6 @@ public class GhastController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -141,7 +137,6 @@ public class GhastController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
             super.M();
         }
     }
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/GiantController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/GiantController.java
index e318ae959..c73296309 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/GiantController.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/GiantController.java
@@ -55,7 +55,6 @@ public class GiantController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -92,7 +91,6 @@ public class GiantController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -105,7 +103,6 @@ public class GiantController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -114,7 +111,6 @@ public class GiantController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -124,7 +120,6 @@ public class GiantController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -137,7 +132,6 @@ public class GiantController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new GiantNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -156,7 +150,6 @@ public class GiantController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -165,7 +158,6 @@ public class GiantController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -183,7 +175,6 @@ public class GiantController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
     }
 
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/GuardianController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/GuardianController.java
index 0451e4f32..5857cc73b 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/GuardianController.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/GuardianController.java
@@ -55,7 +55,6 @@ public class GuardianController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -92,7 +91,6 @@ public class GuardianController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -105,7 +103,6 @@ public class GuardianController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -114,7 +111,6 @@ public class GuardianController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -124,7 +120,6 @@ public class GuardianController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -137,7 +132,6 @@ public class GuardianController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new GuardianNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -156,7 +150,6 @@ public class GuardianController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -166,7 +159,6 @@ public class GuardianController extends MobEntityController {
             } else {
                 npc.update();
             }
-
         }
 
         @Override
@@ -186,7 +178,6 @@ public class GuardianController extends MobEntityController {
                 this.setPosition(locX - 0.01, locY, locZ - 0.01);
                 this.setPosition(locX + 0.01, locY, locZ + 0.01);
             }
-
         }
 
         @Override
@@ -196,7 +187,6 @@ public class GuardianController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
     }
 
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/HorseController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/HorseController.java
index 38601f66c..f39798283 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/HorseController.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/HorseController.java
@@ -62,7 +62,6 @@ public class HorseController extends MobEntityController {
                 ((Horse) getBukkitEntity()).setDomestication(((Horse) getBukkitEntity()).getMaxDomestication());
                 baseMovementSpeed = this.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED).getValue();
             }
-
         }
 
         @Override
@@ -76,7 +75,6 @@ public class HorseController extends MobEntityController {
                 super.a(flag);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, flag, super::a);
         }
 
@@ -85,7 +83,6 @@ public class HorseController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -122,7 +119,6 @@ public class HorseController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -143,7 +139,6 @@ public class HorseController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -152,7 +147,6 @@ public class HorseController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -162,7 +156,6 @@ public class HorseController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -175,7 +168,6 @@ public class HorseController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new HorseNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -194,7 +186,6 @@ public class HorseController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -208,20 +199,16 @@ public class HorseController extends MobEntityController {
                 } else {
                     riding = false;
                 }
-
                 if (riding) {
                     try {
                         C.invoke(this, 4, true);
                     } catch (Throwable e) {
                         e.printStackTrace();
                     }
-
                 }
-
                 NMS.setStepHeight(getBukkitEntity(), 1);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/HumanController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/HumanController.java
index 77cf7dbfc..5198b91bd 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/HumanController.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/HumanController.java
@@ -35,11 +35,9 @@ public class HumanController extends AbstractEntityController {
         if (npc.requiresNameHologram()) {
             name = teamName;
         }
-
         if (Setting.USE_SCOREBOARD_TEAMS.asBoolean()) {
             npc.getOrAddTrait(ScoreboardTrait.class).createTeam(name);
         }
-
         final GameProfile profile = new GameProfile(uuid, name);
         final EntityHumanNPC handle = new EntityHumanNPC(nmsWorld.getServer().getServer(), nmsWorld, profile,
                 new PlayerInteractManager(nmsWorld), npc);
@@ -47,7 +45,6 @@ public class HumanController extends AbstractEntityController {
         if (skin != null) {
             skin.apply(handle);
         }
-
         Bukkit.getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(), () -> {
             if (getBukkitEntity() == null || !getBukkitEntity().isValid()
                     || getBukkitEntity() != handle.getBukkitEntity())
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/IronGolemController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/IronGolemController.java
index cd43db09e..5020c88f6 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/IronGolemController.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/IronGolemController.java
@@ -55,7 +55,6 @@ public class IronGolemController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -92,7 +91,6 @@ public class IronGolemController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -105,7 +103,6 @@ public class IronGolemController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -114,7 +111,6 @@ public class IronGolemController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -124,7 +120,6 @@ public class IronGolemController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -137,7 +132,6 @@ public class IronGolemController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new IronGolemNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -156,7 +150,6 @@ public class IronGolemController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -165,7 +158,6 @@ public class IronGolemController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -183,7 +175,6 @@ public class IronGolemController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
     }
 
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/MagmaCubeController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/MagmaCubeController.java
index 40f8e8e16..1f45ac4dc 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/MagmaCubeController.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/MagmaCubeController.java
@@ -49,7 +49,6 @@ public class MagmaCubeController extends MobEntityController {
                 setSize(3);
                 this.moveController = new PlayerControllerMove(this);
             }
-
         }
 
         @Override
@@ -62,7 +61,6 @@ public class MagmaCubeController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -99,7 +97,6 @@ public class MagmaCubeController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -107,7 +104,6 @@ public class MagmaCubeController extends MobEntityController {
             if (npc == null) {
                 super.d(human);
             }
-
         }
 
         @Override
@@ -120,7 +116,6 @@ public class MagmaCubeController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -129,7 +124,6 @@ public class MagmaCubeController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -139,7 +133,6 @@ public class MagmaCubeController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -152,7 +145,6 @@ public class MagmaCubeController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new MagmaCubeNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -171,7 +163,6 @@ public class MagmaCubeController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -180,7 +171,6 @@ public class MagmaCubeController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -198,7 +188,6 @@ public class MagmaCubeController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
     }
 
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/MobEntityController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/MobEntityController.java
index aef19a390..384efa321 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/MobEntityController.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/MobEntityController.java
@@ -34,7 +34,6 @@ public abstract class MobEntityController extends AbstractEntityController {
         if (entity instanceof EntityInsentient) {
             NMSImpl.clearGoals(((EntityInsentient) entity).goalSelector, ((EntityInsentient) entity).targetSelector);
         }
-
         entity.setPositionRotation(at.getX(), at.getY(), at.getZ(), at.getYaw(), at.getPitch());
         if (npc != null) {
             // entity.onGround isn't updated right away - we approximate here so
@@ -43,19 +42,15 @@ public abstract class MobEntityController extends AbstractEntityController {
             if (beneath.isSolid()) {
                 entity.onGround = true;
             }
-
             try {
                 UUID_FIELD.invoke(entity, npc.getUniqueId());
             } catch (Throwable e) {
                 e.printStackTrace();
             }
-
             if (Setting.USE_SCOREBOARD_TEAMS.asBoolean()) {
                 npc.getOrAddTrait(ScoreboardTrait.class).createTeam(npc.getUniqueId().toString());
             }
-
         }
-
         return entity.getBukkitEntity();
     }
 
@@ -66,7 +61,6 @@ public abstract class MobEntityController extends AbstractEntityController {
             ex.printStackTrace();
             return null;
         }
-
     }
 
     private static Constructor<?> getConstructor(Class<?> clazz) {
@@ -79,7 +73,6 @@ public abstract class MobEntityController extends AbstractEntityController {
         } catch (Exception ex) {
             throw new IllegalStateException("unable to find an entity constructor");
         }
-
     }
 
     private static final Map<Class<?>, Constructor<?>> CONSTRUCTOR_CACHE = new WeakHashMap<>();
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/MushroomCowController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/MushroomCowController.java
index 5d00578c7..fafa71228 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/MushroomCowController.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/MushroomCowController.java
@@ -59,7 +59,6 @@ public class MushroomCowController extends MobEntityController {
                 super.a(flag);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, flag, super::a);
         }
 
@@ -68,7 +67,6 @@ public class MushroomCowController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -112,7 +110,6 @@ public class MushroomCowController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -125,7 +122,6 @@ public class MushroomCowController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -134,7 +130,6 @@ public class MushroomCowController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -144,7 +139,6 @@ public class MushroomCowController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -157,7 +151,6 @@ public class MushroomCowController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new MushroomCowNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -176,7 +169,6 @@ public class MushroomCowController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -185,7 +177,6 @@ public class MushroomCowController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/OcelotController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/OcelotController.java
index 08cba3a38..ae14c31a9 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/OcelotController.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/OcelotController.java
@@ -56,7 +56,6 @@ public class OcelotController extends MobEntityController {
                 super.a(flag);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, flag, super::a);
         }
 
@@ -65,7 +64,6 @@ public class OcelotController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -102,7 +100,6 @@ public class OcelotController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -115,7 +112,6 @@ public class OcelotController extends MobEntityController {
             if (npc == null) {
                 super.df();
             }
-
         }
 
         @Override
@@ -123,7 +119,6 @@ public class OcelotController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -132,7 +127,6 @@ public class OcelotController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -142,7 +136,6 @@ public class OcelotController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -155,7 +148,6 @@ public class OcelotController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new OcelotNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -174,7 +166,6 @@ public class OcelotController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -183,7 +174,6 @@ public class OcelotController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/PigController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/PigController.java
index e29f0953e..952a8ac8a 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/PigController.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/PigController.java
@@ -57,7 +57,6 @@ public class PigController extends MobEntityController {
                 super.a(flag);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, flag, super::a);
         }
 
@@ -66,7 +65,6 @@ public class PigController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -103,7 +101,6 @@ public class PigController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -123,7 +120,6 @@ public class PigController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -132,7 +128,6 @@ public class PigController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -142,7 +137,6 @@ public class PigController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -155,7 +149,6 @@ public class PigController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new PigNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -174,7 +167,6 @@ public class PigController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -183,7 +175,6 @@ public class PigController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -199,7 +190,6 @@ public class PigController extends MobEntityController {
             if (npc == null) {
                 super.onLightningStrike(entitylightning);
             }
-
         }
     }
 
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/PigZombieController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/PigZombieController.java
index bb0129e28..9e026583a 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/PigZombieController.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/PigZombieController.java
@@ -55,7 +55,6 @@ public class PigZombieController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -92,7 +91,6 @@ public class PigZombieController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -105,7 +103,6 @@ public class PigZombieController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -114,7 +111,6 @@ public class PigZombieController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -124,7 +120,6 @@ public class PigZombieController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -137,7 +132,6 @@ public class PigZombieController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new PigZombieNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -156,7 +150,6 @@ public class PigZombieController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -165,7 +158,6 @@ public class PigZombieController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/PolarBearController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/PolarBearController.java
index 9758d8f87..42b99c018 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/PolarBearController.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/PolarBearController.java
@@ -54,7 +54,6 @@ public class PolarBearController extends MobEntityController {
                 super.a(flag);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, flag, super::a);
         }
 
@@ -92,7 +91,6 @@ public class PolarBearController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -106,7 +104,6 @@ public class PolarBearController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -119,7 +116,6 @@ public class PolarBearController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new PolarBearNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -138,7 +134,6 @@ public class PolarBearController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -148,7 +143,6 @@ public class PolarBearController extends MobEntityController {
                 NMSImpl.updateAI(this);
                 npc.update();
             }
-
         }
     }
 
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/RabbitController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/RabbitController.java
index 40c451591..e4dd580de 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/RabbitController.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/RabbitController.java
@@ -57,7 +57,6 @@ public class RabbitController extends MobEntityController {
                 super.a(flag);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, flag, super::a);
         }
 
@@ -66,7 +65,6 @@ public class RabbitController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -103,7 +101,6 @@ public class RabbitController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -116,7 +113,6 @@ public class RabbitController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -125,7 +121,6 @@ public class RabbitController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -135,7 +130,6 @@ public class RabbitController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -148,7 +142,6 @@ public class RabbitController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new RabbitNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -172,7 +165,6 @@ public class RabbitController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -184,7 +176,6 @@ public class RabbitController extends MobEntityController {
             } else {
                 super.M();
             }
-
         }
 
         @Override
@@ -203,7 +194,6 @@ public class RabbitController extends MobEntityController {
                 this.datawatcher.set(NMSImpl.getRabbitTypeField(), i);
                 return;
             }
-
             super.setRabbitType(i);
         }
     }
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SheepController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SheepController.java
index 7f60631a6..91f8c8043 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SheepController.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SheepController.java
@@ -56,7 +56,6 @@ public class SheepController extends MobEntityController {
                 super.a(flag);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, flag, super::a);
         }
 
@@ -65,7 +64,6 @@ public class SheepController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -102,7 +100,6 @@ public class SheepController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -115,7 +112,6 @@ public class SheepController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -124,7 +120,6 @@ public class SheepController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -134,7 +129,6 @@ public class SheepController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -147,7 +141,6 @@ public class SheepController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SheepNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -166,7 +159,6 @@ public class SheepController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -175,7 +167,6 @@ public class SheepController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ShulkerController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ShulkerController.java
index c39ea3e1b..75995cd38 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ShulkerController.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ShulkerController.java
@@ -56,7 +56,6 @@ public class ShulkerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -93,7 +92,6 @@ public class ShulkerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -106,7 +104,6 @@ public class ShulkerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -115,7 +112,6 @@ public class ShulkerController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -125,7 +121,6 @@ public class ShulkerController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -138,7 +133,6 @@ public class ShulkerController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new ShulkerNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -157,7 +151,6 @@ public class ShulkerController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -167,7 +160,6 @@ public class ShulkerController extends MobEntityController {
             } else {
                 super.m();
             }
-
         }
 
         @Override
@@ -183,7 +175,6 @@ public class ShulkerController extends MobEntityController {
             if (npc == null) {
                 super.n();
             }
-
         }
 
         @Override
@@ -198,7 +189,6 @@ public class ShulkerController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
     }
 
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SilverfishController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SilverfishController.java
index 662ec7370..84ec74041 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SilverfishController.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SilverfishController.java
@@ -55,7 +55,6 @@ public class SilverfishController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -92,7 +91,6 @@ public class SilverfishController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -105,7 +103,6 @@ public class SilverfishController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -114,7 +111,6 @@ public class SilverfishController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -124,7 +120,6 @@ public class SilverfishController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -137,7 +132,6 @@ public class SilverfishController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SilverfishNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -156,7 +150,6 @@ public class SilverfishController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -165,7 +158,6 @@ public class SilverfishController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -183,7 +175,6 @@ public class SilverfishController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
     }
 
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SkeletonController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SkeletonController.java
index 94c03222e..f538be6a0 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SkeletonController.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SkeletonController.java
@@ -55,7 +55,6 @@ public class SkeletonController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -92,7 +91,6 @@ public class SkeletonController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -105,7 +103,6 @@ public class SkeletonController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -114,7 +111,6 @@ public class SkeletonController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -124,7 +120,6 @@ public class SkeletonController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -137,7 +132,6 @@ public class SkeletonController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SkeletonNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -156,7 +150,6 @@ public class SkeletonController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -165,7 +158,6 @@ public class SkeletonController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -183,7 +175,6 @@ public class SkeletonController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
     }
 
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SlimeController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SlimeController.java
index 61b3c6b87..5e1b31664 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SlimeController.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SlimeController.java
@@ -49,7 +49,6 @@ public class SlimeController extends MobEntityController {
                 setSize(3);
                 this.moveController = new PlayerControllerMove(this);
             }
-
         }
 
         @Override
@@ -62,7 +61,6 @@ public class SlimeController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -99,7 +97,6 @@ public class SlimeController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -107,7 +104,6 @@ public class SlimeController extends MobEntityController {
             if (npc == null) {
                 super.d(human);
             }
-
         }
 
         @Override
@@ -120,7 +116,6 @@ public class SlimeController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -129,7 +124,6 @@ public class SlimeController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -139,7 +133,6 @@ public class SlimeController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -152,7 +145,6 @@ public class SlimeController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SlimeNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -171,7 +163,6 @@ public class SlimeController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -180,7 +171,6 @@ public class SlimeController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -198,7 +188,6 @@ public class SlimeController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
     }
 
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SnowmanController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SnowmanController.java
index 28a27dc19..596ffae54 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SnowmanController.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SnowmanController.java
@@ -55,7 +55,6 @@ public class SnowmanController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -92,7 +91,6 @@ public class SnowmanController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -105,7 +103,6 @@ public class SnowmanController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -114,7 +111,6 @@ public class SnowmanController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -124,7 +120,6 @@ public class SnowmanController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -137,7 +132,6 @@ public class SnowmanController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SnowmanNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -156,7 +150,6 @@ public class SnowmanController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -165,7 +158,6 @@ public class SnowmanController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -183,7 +175,6 @@ public class SnowmanController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
     }
 
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SpiderController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SpiderController.java
index 43d3a0bd9..3938218aa 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SpiderController.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SpiderController.java
@@ -55,7 +55,6 @@ public class SpiderController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -92,7 +91,6 @@ public class SpiderController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -105,7 +103,6 @@ public class SpiderController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -114,7 +111,6 @@ public class SpiderController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -124,7 +120,6 @@ public class SpiderController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -137,7 +132,6 @@ public class SpiderController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SpiderNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -156,7 +150,6 @@ public class SpiderController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -165,7 +158,6 @@ public class SpiderController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -183,7 +175,6 @@ public class SpiderController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
     }
 
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SquidController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SquidController.java
index c91f7604f..b51c442e5 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SquidController.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SquidController.java
@@ -55,7 +55,6 @@ public class SquidController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -92,7 +91,6 @@ public class SquidController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -105,7 +103,6 @@ public class SquidController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -114,7 +111,6 @@ public class SquidController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -124,7 +120,6 @@ public class SquidController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -137,7 +132,6 @@ public class SquidController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SquidNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -156,7 +150,6 @@ public class SquidController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -173,7 +166,6 @@ public class SquidController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -183,7 +175,6 @@ public class SquidController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
     }
 
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/VillagerController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/VillagerController.java
index 50728f30d..dce2bb826 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/VillagerController.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/VillagerController.java
@@ -62,7 +62,6 @@ public class VillagerController extends MobEntityController {
                 super.a(flag);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, flag, super::a);
         }
 
@@ -71,7 +70,6 @@ public class VillagerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -85,7 +83,6 @@ public class VillagerController extends MobEntityController {
             if (npc != null && npc.data().get(NPC.Metadata.VILLAGER_BLOCK_TRADES, true)) {
                 blockingATrade = true;
             }
-
             return super.a(entityhuman, enumhand, itemstack);
         }
 
@@ -117,7 +114,6 @@ public class VillagerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -131,7 +127,6 @@ public class VillagerController extends MobEntityController {
                 blockingATrade = false;
                 return true;
             }
-
             return super.dh();
         }
 
@@ -140,7 +135,6 @@ public class VillagerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -149,7 +143,6 @@ public class VillagerController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -159,7 +152,6 @@ public class VillagerController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -172,7 +164,6 @@ public class VillagerController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new VillagerNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -191,7 +182,6 @@ public class VillagerController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -200,7 +190,6 @@ public class VillagerController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -216,7 +205,6 @@ public class VillagerController extends MobEntityController {
             if (npc == null) {
                 super.onLightningStrike(entitylightning);
             }
-
         }
     }
 
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/WitchController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/WitchController.java
index ad9fff596..620067968 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/WitchController.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/WitchController.java
@@ -55,7 +55,6 @@ public class WitchController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -92,7 +91,6 @@ public class WitchController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -105,7 +103,6 @@ public class WitchController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -114,7 +111,6 @@ public class WitchController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -124,7 +120,6 @@ public class WitchController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -137,7 +132,6 @@ public class WitchController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new WitchNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -156,7 +150,6 @@ public class WitchController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -165,7 +158,6 @@ public class WitchController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -183,7 +175,6 @@ public class WitchController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
     }
 
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/WitherController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/WitherController.java
index 373d7f4a2..efb7a96e3 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/WitherController.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/WitherController.java
@@ -82,7 +82,6 @@ public class WitherController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -102,7 +101,6 @@ public class WitherController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -115,7 +113,6 @@ public class WitherController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new WitherNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -134,7 +131,6 @@ public class WitherController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -148,7 +144,6 @@ public class WitherController extends MobEntityController {
                 super.M();
                 return;
             }
-
             npc.update();
         }
     }
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/WolfController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/WolfController.java
index 0a57b9982..1d3d4a88c 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/WolfController.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/WolfController.java
@@ -58,7 +58,6 @@ public class WolfController extends MobEntityController {
                 super.a(flag);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, flag, super::a);
         }
 
@@ -67,7 +66,6 @@ public class WolfController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -104,7 +102,6 @@ public class WolfController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -117,7 +114,6 @@ public class WolfController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -126,7 +122,6 @@ public class WolfController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -136,7 +131,6 @@ public class WolfController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -149,7 +143,6 @@ public class WolfController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new WolfNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -168,7 +161,6 @@ public class WolfController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -177,7 +169,6 @@ public class WolfController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ZombieController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ZombieController.java
index 85fa1f072..0c05431c5 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ZombieController.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ZombieController.java
@@ -55,7 +55,6 @@ public class ZombieController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -92,7 +91,6 @@ public class ZombieController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -105,7 +103,6 @@ public class ZombieController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -114,7 +111,6 @@ public class ZombieController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -124,7 +120,6 @@ public class ZombieController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -137,7 +132,6 @@ public class ZombieController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new ZombieNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -156,7 +150,6 @@ public class ZombieController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -165,7 +158,6 @@ public class ZombieController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/AreaEffectCloudController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/AreaEffectCloudController.java
index 2ac99c36f..1eb95408a 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/AreaEffectCloudController.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/AreaEffectCloudController.java
@@ -67,7 +67,6 @@ public class AreaEffectCloudController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -81,7 +80,6 @@ public class AreaEffectCloudController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -89,7 +87,6 @@ public class AreaEffectCloudController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new AreaEffectCloudNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -105,7 +102,6 @@ public class AreaEffectCloudController extends MobEntityController {
             } else {
                 super.m();
             }
-
         }
     }
 }
\ No newline at end of file
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/BoatController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/BoatController.java
index 6c2a87901..60bdc6562 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/BoatController.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/BoatController.java
@@ -68,7 +68,6 @@ public class BoatController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -82,7 +81,6 @@ public class BoatController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -90,7 +88,6 @@ public class BoatController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new BoatNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -106,7 +103,6 @@ public class BoatController extends MobEntityController {
             } else {
                 super.m();
             }
-
         }
 
         @Override
@@ -116,7 +112,6 @@ public class BoatController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
     }
 }
\ No newline at end of file
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/DragonFireballController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/DragonFireballController.java
index fc3a2985d..2699ff828 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/DragonFireballController.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/DragonFireballController.java
@@ -68,7 +68,6 @@ public class DragonFireballController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -82,7 +81,6 @@ public class DragonFireballController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -90,7 +88,6 @@ public class DragonFireballController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new DragonFireballNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -106,11 +103,9 @@ public class DragonFireballController extends MobEntityController {
                 if (!npc.isProtected()) {
                     super.m();
                 }
-
             } else {
                 super.m();
             }
-
         }
 
         @Override
@@ -120,7 +115,6 @@ public class DragonFireballController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
     }
 }
\ No newline at end of file
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/EggController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/EggController.java
index 70ce932b6..f51d27749 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/EggController.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/EggController.java
@@ -83,7 +83,6 @@ public class EggController extends AbstractEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -97,7 +96,6 @@ public class EggController extends AbstractEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -105,7 +103,6 @@ public class EggController extends AbstractEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new EggNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -121,11 +118,9 @@ public class EggController extends AbstractEntityController {
                 if (!npc.isProtected()) {
                     super.m();
                 }
-
             } else {
                 super.m();
             }
-
         }
     }
 }
\ No newline at end of file
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/EnderCrystalController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/EnderCrystalController.java
index 1e738752d..249a501f8 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/EnderCrystalController.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/EnderCrystalController.java
@@ -67,7 +67,6 @@ public class EnderCrystalController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -81,7 +80,6 @@ public class EnderCrystalController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -89,7 +87,6 @@ public class EnderCrystalController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new EnderCrystalNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -105,7 +102,6 @@ public class EnderCrystalController extends MobEntityController {
             } else {
                 super.m();
             }
-
         }
     }
 }
\ No newline at end of file
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/EnderPearlController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/EnderPearlController.java
index 5e5cf4726..58a3c031e 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/EnderPearlController.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/EnderPearlController.java
@@ -67,7 +67,6 @@ public class EnderPearlController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -81,7 +80,6 @@ public class EnderPearlController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -89,7 +87,6 @@ public class EnderPearlController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new EnderPearlNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -105,11 +102,9 @@ public class EnderPearlController extends MobEntityController {
                 if (!npc.isProtected()) {
                     super.m();
                 }
-
             } else {
                 super.m();
             }
-
         }
     }
 }
\ No newline at end of file
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/EnderSignalController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/EnderSignalController.java
index 7dd6d6aa4..fe721f5a3 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/EnderSignalController.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/EnderSignalController.java
@@ -67,7 +67,6 @@ public class EnderSignalController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -81,7 +80,6 @@ public class EnderSignalController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -89,7 +87,6 @@ public class EnderSignalController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new EnderSignalNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -105,7 +102,6 @@ public class EnderSignalController extends MobEntityController {
             } else {
                 super.m();
             }
-
         }
     }
 }
\ No newline at end of file
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/ExperienceOrbController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/ExperienceOrbController.java
index 2d83a85b8..f8b9ff3e0 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/ExperienceOrbController.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/ExperienceOrbController.java
@@ -53,7 +53,6 @@ public class ExperienceOrbController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -67,7 +66,6 @@ public class ExperienceOrbController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -75,7 +73,6 @@ public class ExperienceOrbController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new ExperienceOrbNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -91,7 +88,6 @@ public class ExperienceOrbController extends MobEntityController {
             } else {
                 super.m();
             }
-
         }
     }
 
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/FallingBlockController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/FallingBlockController.java
index ac9f1b13a..7aad0b3b4 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/FallingBlockController.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/FallingBlockController.java
@@ -75,7 +75,6 @@ public class FallingBlockController extends AbstractEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -89,7 +88,6 @@ public class FallingBlockController extends AbstractEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -97,7 +95,6 @@ public class FallingBlockController extends AbstractEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new FallingBlockNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -116,11 +113,9 @@ public class FallingBlockController extends AbstractEntityController {
                     motZ *= 0.98;
                     move(motX, motY, motZ);
                 }
-
             } else {
                 super.m();
             }
-
         }
 
         @Override
@@ -130,7 +125,6 @@ public class FallingBlockController extends AbstractEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
 
         private static final double EPSILON = 0.001;
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/FireworkController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/FireworkController.java
index edf56499d..e2e42447f 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/FireworkController.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/FireworkController.java
@@ -53,7 +53,6 @@ public class FireworkController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -67,7 +66,6 @@ public class FireworkController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -75,7 +73,6 @@ public class FireworkController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new FireworkNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -91,7 +88,6 @@ public class FireworkController extends MobEntityController {
             } else {
                 super.m();
             }
-
         }
     }
 
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/FishingHookController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/FishingHookController.java
index ec417b10a..965ac0b85 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/FishingHookController.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/FishingHookController.java
@@ -53,7 +53,6 @@ public class FishingHookController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -67,7 +66,6 @@ public class FishingHookController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -75,7 +73,6 @@ public class FishingHookController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new FishingHookNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -91,7 +88,6 @@ public class FishingHookController extends MobEntityController {
             } else {
                 super.m();
             }
-
         }
     }
 
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/ItemController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/ItemController.java
index 389aaee36..90a8b8eae 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/ItemController.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/ItemController.java
@@ -66,7 +66,6 @@ public class ItemController extends AbstractEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -74,7 +73,6 @@ public class ItemController extends AbstractEntityController {
             if (npc == null) {
                 super.d(entityhuman);
             }
-
         }
 
         @Override
@@ -88,7 +86,6 @@ public class ItemController extends AbstractEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -96,7 +93,6 @@ public class ItemController extends AbstractEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new ItemNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -112,7 +108,6 @@ public class ItemController extends AbstractEntityController {
             } else {
                 super.m();
             }
-
         }
     }
 
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/ItemFrameController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/ItemFrameController.java
index aee7f473c..4dc963184 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/ItemFrameController.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/ItemFrameController.java
@@ -66,7 +66,6 @@ public class ItemFrameController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -80,7 +79,6 @@ public class ItemFrameController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -88,7 +86,6 @@ public class ItemFrameController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new ItemFrameNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -104,7 +101,6 @@ public class ItemFrameController extends MobEntityController {
             } else {
                 super.m();
             }
-
         }
 
         @Override
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/LargeFireballController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/LargeFireballController.java
index 0c4c3ea3d..8f7029c11 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/LargeFireballController.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/LargeFireballController.java
@@ -54,7 +54,6 @@ public class LargeFireballController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -68,7 +67,6 @@ public class LargeFireballController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -76,7 +74,6 @@ public class LargeFireballController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new LargeFireballNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -92,11 +89,9 @@ public class LargeFireballController extends MobEntityController {
                 if (!npc.isProtected()) {
                     super.m();
                 }
-
             } else {
                 super.m();
             }
-
         }
 
         @Override
@@ -106,7 +101,6 @@ public class LargeFireballController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
     }
 
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/LeashController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/LeashController.java
index 060d116da..9683d22ea 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/LeashController.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/LeashController.java
@@ -53,7 +53,6 @@ public class LeashController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -67,7 +66,6 @@ public class LeashController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -75,7 +73,6 @@ public class LeashController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new LeashNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -91,7 +88,6 @@ public class LeashController extends MobEntityController {
             } else {
                 super.m();
             }
-
         }
 
         @Override
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartChestController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartChestController.java
index 783436f46..414a9d9c6 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartChestController.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartChestController.java
@@ -54,7 +54,6 @@ public class MinecartChestController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -68,7 +67,6 @@ public class MinecartChestController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -76,7 +74,6 @@ public class MinecartChestController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new MinecartChestNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -92,7 +89,6 @@ public class MinecartChestController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
     }
 
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartCommandController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartCommandController.java
index a6376d7d2..14b8a5205 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartCommandController.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartCommandController.java
@@ -54,7 +54,6 @@ public class MinecartCommandController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -68,7 +67,6 @@ public class MinecartCommandController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -76,7 +74,6 @@ public class MinecartCommandController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new MinecartCommandNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -92,7 +89,6 @@ public class MinecartCommandController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
     }
 
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartFurnaceController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartFurnaceController.java
index 757020fca..8cab7a1d8 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartFurnaceController.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartFurnaceController.java
@@ -54,7 +54,6 @@ public class MinecartFurnaceController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -68,7 +67,6 @@ public class MinecartFurnaceController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -76,7 +74,6 @@ public class MinecartFurnaceController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new MinecartFurnaceNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -92,7 +89,6 @@ public class MinecartFurnaceController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
     }
 
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartHopperController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartHopperController.java
index 047184918..348d838ef 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartHopperController.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartHopperController.java
@@ -50,7 +50,6 @@ public class MinecartHopperController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -64,7 +63,6 @@ public class MinecartHopperController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -79,7 +77,6 @@ public class MinecartHopperController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
     }
 }
\ No newline at end of file
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartRideableController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartRideableController.java
index 7cbf09f27..8a3b0e494 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartRideableController.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartRideableController.java
@@ -54,7 +54,6 @@ public class MinecartRideableController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -68,7 +67,6 @@ public class MinecartRideableController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -76,7 +74,6 @@ public class MinecartRideableController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new MinecartRideableNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -92,7 +89,6 @@ public class MinecartRideableController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
     }
 
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartSpawnerController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartSpawnerController.java
index 080175c1f..741b6916c 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartSpawnerController.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartSpawnerController.java
@@ -50,7 +50,6 @@ public class MinecartSpawnerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -64,7 +63,6 @@ public class MinecartSpawnerController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -79,7 +77,6 @@ public class MinecartSpawnerController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
     }
 }
\ No newline at end of file
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartTNTController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartTNTController.java
index 1b8983a6e..2c214d3e5 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartTNTController.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartTNTController.java
@@ -50,7 +50,6 @@ public class MinecartTNTController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -64,7 +63,6 @@ public class MinecartTNTController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -79,7 +77,6 @@ public class MinecartTNTController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
     }
 }
\ No newline at end of file
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/PaintingController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/PaintingController.java
index 73799167c..ab1900e76 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/PaintingController.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/PaintingController.java
@@ -53,7 +53,6 @@ public class PaintingController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -67,7 +66,6 @@ public class PaintingController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -75,7 +73,6 @@ public class PaintingController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new PaintingNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -91,7 +88,6 @@ public class PaintingController extends MobEntityController {
             } else {
                 super.m();
             }
-
         }
 
         @Override
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/ShulkerBulletController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/ShulkerBulletController.java
index 74bf6c611..03393ea22 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/ShulkerBulletController.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/ShulkerBulletController.java
@@ -53,7 +53,6 @@ public class ShulkerBulletController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -67,7 +66,6 @@ public class ShulkerBulletController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -75,7 +73,6 @@ public class ShulkerBulletController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new ShulkerBulletNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -91,7 +88,6 @@ public class ShulkerBulletController extends MobEntityController {
             } else {
                 super.m();
             }
-
         }
     }
 
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/SmallFireballController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/SmallFireballController.java
index 974f83ca4..1bde2cd5a 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/SmallFireballController.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/SmallFireballController.java
@@ -53,7 +53,6 @@ public class SmallFireballController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -67,7 +66,6 @@ public class SmallFireballController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -75,7 +73,6 @@ public class SmallFireballController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SmallFireballNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -91,11 +88,9 @@ public class SmallFireballController extends MobEntityController {
                 if (!npc.isProtected()) {
                     super.m();
                 }
-
             } else {
                 super.m();
             }
-
         }
     }
 
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/SnowballController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/SnowballController.java
index bf7d054c2..954e4f8b9 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/SnowballController.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/SnowballController.java
@@ -53,7 +53,6 @@ public class SnowballController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -67,7 +66,6 @@ public class SnowballController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -75,7 +73,6 @@ public class SnowballController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SnowballNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -91,7 +88,6 @@ public class SnowballController extends MobEntityController {
             } else {
                 super.m();
             }
-
         }
     }
 
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/SpectralArrowController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/SpectralArrowController.java
index b04bc137c..3aa70bb5f 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/SpectralArrowController.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/SpectralArrowController.java
@@ -53,7 +53,6 @@ public class SpectralArrowController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -67,7 +66,6 @@ public class SpectralArrowController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -75,7 +73,6 @@ public class SpectralArrowController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SpectralArrowNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -91,7 +88,6 @@ public class SpectralArrowController extends MobEntityController {
             } else {
                 super.m();
             }
-
         }
     }
 
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/TNTPrimedController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/TNTPrimedController.java
index 7821b645f..9f5398f2e 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/TNTPrimedController.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/TNTPrimedController.java
@@ -53,7 +53,6 @@ public class TNTPrimedController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -67,7 +66,6 @@ public class TNTPrimedController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -75,7 +73,6 @@ public class TNTPrimedController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new TNTPrimedNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -91,7 +88,6 @@ public class TNTPrimedController extends MobEntityController {
             } else {
                 super.m();
             }
-
         }
     }
 
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/ThrownExpBottleController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/ThrownExpBottleController.java
index 3df517ad5..262a2f7b3 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/ThrownExpBottleController.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/ThrownExpBottleController.java
@@ -53,7 +53,6 @@ public class ThrownExpBottleController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -67,7 +66,6 @@ public class ThrownExpBottleController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -75,7 +73,6 @@ public class ThrownExpBottleController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new ThrownExpBottleNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -91,11 +88,9 @@ public class ThrownExpBottleController extends MobEntityController {
                 if (!npc.isProtected()) {
                     super.m();
                 }
-
             } else {
                 super.m();
             }
-
         }
     }
 
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/ThrownPotionController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/ThrownPotionController.java
index 71cec42b8..4941ea95f 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/ThrownPotionController.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/ThrownPotionController.java
@@ -54,7 +54,6 @@ public class ThrownPotionController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -68,7 +67,6 @@ public class ThrownPotionController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -79,9 +77,7 @@ public class ThrownPotionController extends MobEntityController {
                 } else {
                     bukkitEntity = new SplashThrownPotionNPC(this);
                 }
-
             }
-
             return super.getBukkitEntity();
         }
 
@@ -97,7 +93,6 @@ public class ThrownPotionController extends MobEntityController {
             } else {
                 super.m();
             }
-
         }
     }
 
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/TippedArrowController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/TippedArrowController.java
index ae932d116..85c30034e 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/TippedArrowController.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/TippedArrowController.java
@@ -53,7 +53,6 @@ public class TippedArrowController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -67,7 +66,6 @@ public class TippedArrowController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -75,7 +73,6 @@ public class TippedArrowController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new TippedArrowNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -91,7 +88,6 @@ public class TippedArrowController extends MobEntityController {
             } else {
                 super.m();
             }
-
         }
     }
 
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/WitherSkullController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/WitherSkullController.java
index 0cf9516e5..3922f27ab 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/WitherSkullController.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/WitherSkullController.java
@@ -53,7 +53,6 @@ public class WitherSkullController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -67,7 +66,6 @@ public class WitherSkullController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -75,7 +73,6 @@ public class WitherSkullController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new WitherSkullNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -91,7 +88,6 @@ public class WitherSkullController extends MobEntityController {
             } else {
                 super.m();
             }
-
         }
     }
 
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/CitizensBlockBreaker.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/CitizensBlockBreaker.java
index 79bf6087a..a3dfcdbf7 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/CitizensBlockBreaker.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/CitizensBlockBreaker.java
@@ -47,7 +47,6 @@ public class CitizensBlockBreaker extends AbstractBlockBreaker {
             ItemStack current = getCurrentItem();
             return current != null ? current.b(block) : false;
         }
-
     }
 
     @Override
@@ -65,13 +64,10 @@ public class CitizensBlockBreaker extends AbstractBlockBreaker {
                 if (i > 0) {
                     f += i * i + 1;
                 }
-
             }
-
             if (handle.hasEffect(MobEffects.FASTER_DIG)) {
                 f *= 1.0F + (handle.getEffect(MobEffects.FASTER_DIG).getAmplifier() + 1) * 0.2F;
             }
-
             if (handle.hasEffect(MobEffects.SLOWER_DIG)) {
                 float f1 = 1.0F;
                 switch (handle.getEffect(MobEffects.SLOWER_DIG).getAmplifier()) {
@@ -88,20 +84,15 @@ public class CitizensBlockBreaker extends AbstractBlockBreaker {
                     default:
                         f1 = 8.1E-4F;
                 }
-
                 f *= f1;
             }
-
             if (handle.a(Material.WATER) && !EnchantmentManager.i(handle)) {
                 f /= 5.0F;
             }
-
         }
-
         if (!getHandle().onGround) {
             f /= 5.0F;
         }
-
         return f;
     }
 }
\ No newline at end of file
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/NMSImpl.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/NMSImpl.java
index bd551c08a..4d6043ab3 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/NMSImpl.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/NMSImpl.java
@@ -274,7 +274,6 @@ public class NMSImpl implements NMSBridge {
         } else if (!handle.world.players.contains(handle)) {
             handle.world.players.add(handle);
         }
-
     }
 
     @Override
@@ -287,7 +286,6 @@ public class NMSImpl implements NMSBridge {
             PlayerAnimation.ARM_SWING.play(humanHandle.getBukkitEntity());
             return;
         }
-
         AttributeInstance attackDamage = handle.getAttributeInstance(GenericAttributes.ATTACK_DAMAGE);
         float f = (float) (attackDamage == null ? 1 : attackDamage.getValue());
         int i = 0;
@@ -295,7 +293,6 @@ public class NMSImpl implements NMSBridge {
             f += EnchantmentManager.a(handle.getItemInMainHand(), target.getMonsterType());
             i += EnchantmentManager.a(handle);
         }
-
         boolean flag = target.damageEntity(DamageSource.mobAttack(handle), f);
         if (!flag)
             return;
@@ -305,12 +302,10 @@ public class NMSImpl implements NMSBridge {
             handle.motX *= 0.6D;
             handle.motZ *= 0.6D;
         }
-
         int fireAspectLevel = EnchantmentManager.getFireAspectEnchantmentLevel(handle);
         if (fireAspectLevel > 0) {
             target.setOnFire(fireAspectLevel * 4);
         }
-
     }
 
     @Override
@@ -322,11 +317,9 @@ public class NMSImpl implements NMSBridge {
             } catch (Throwable t) {
                 t.printStackTrace();
             }
-
         } else if (handle instanceof EntityHumanNPC) {
             ((EntityHumanNPC) handle).getControllerMove().f = false;
         }
-
     }
 
     @Override
@@ -360,19 +353,14 @@ public class NMSImpl implements NMSBridge {
                         if (!changed && !ItemStack.matches(old, curr)) {
                             changed = true;
                         }
-
                         equipment.put(slot, curr);
                     }
-
                     if (changed) {
                         for (EnumItemSlot slot : EnumItemSlot.values()) {
                             agg.send(new PacketPlayOutEntityEquipment(handle.getId(), slot, equipment.get(slot)));
                         }
-
                     }
-
                 }
-
                 tracker.track(Lists.newArrayList(tracker.trackedPlayers));
             }
 
@@ -392,9 +380,7 @@ public class NMSImpl implements NMSBridge {
                     if (callback != null) {
                         callback.accept(entity);
                     }
-
                 }
-
                 tracker.trackedPlayers.clear();
             }
         };
@@ -442,10 +428,8 @@ public class NMSImpl implements NMSBridge {
                 bserver = (BossBattleServer) ENDERDRAGON_BATTLE_BAR_FIELD
                         .get(ENDERDRAGON_BATTLE_FIELD.get(NMSImpl.getHandle(entity)));
             }
-
         } catch (Exception e) {
         }
-
         if (bserver == null)
             return null;
         BossBar ret = Bukkit.createBossBar("", BarColor.BLUE, BarStyle.SEGMENTED_10);
@@ -453,7 +437,6 @@ public class NMSImpl implements NMSBridge {
             CRAFT_BOSSBAR_HANDLE_FIELD.set(ret, bserver);
         } catch (Exception e) {
         }
-
         return ret;
     }
 
@@ -471,7 +454,6 @@ public class NMSImpl implements NMSBridge {
         if (aabb == null) {
             aabb = world.getType(pos).d(world, pos);
         }
-
         return new BoundingBox(aabb.a, aabb.b, aabb.c, aabb.d, aabb.e, aabb.f);
     }
 
@@ -571,15 +553,12 @@ public class NMSImpl implements NMSBridge {
             } catch (Exception e) {
                 return null;
             }
-
         }
-
         try {
             return (GameProfile) SKULL_PROFILE_FIELD.get(meta);
         } catch (Exception e) {
             return null;
         }
-
     }
 
     @Override
@@ -592,7 +571,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Exception e) {
             throw new CommandException(Messages.INVALID_SOUND);
         }
-
     }
 
     @Override
@@ -608,7 +586,6 @@ public class NMSImpl implements NMSBridge {
         EntityLiving handle = NMSImpl.getHandle((LivingEntity) npc.getEntity());
         if (handle == null) {
         }
-
         return DEFAULT_SPEED;
         // return (float)
         // handle.getAttributeInstance(GenericAttributes.d).getValue();
@@ -652,9 +629,7 @@ public class NMSImpl implements NMSBridge {
             } else {
                 ((EntityInsentient) raw).a(PathType.WATER, oldWater + 1F);
             }
-
         }
-
         navigation.q().b(params.hasExaminer(DoorExaminer.class));
         return new MCNavigator() {
             float lastSpeed;
@@ -678,9 +653,7 @@ public class NMSImpl implements NMSBridge {
                     } else {
                         ((EntityInsentient) raw).a(PathType.WATER, oldWater);
                     }
-
                 }
-
                 stopNavigation(navigation);
             }
 
@@ -692,16 +665,13 @@ public class NMSImpl implements NMSBridge {
                     if (handle instanceof EntityHorse) {
                         handle.width = Math.min(0.99f, oldWidth);
                     }
-
                     if (!function.apply(navigation)) {
                         reason = CancelReason.STUCK;
                     }
-
                     handle.width = oldWidth; // minecraft requires that an entity fit onto both blocks if width >= 1f,
                                              // but we'd prefer to make it just fit on 1 so hack around it a bit.
                     lastSpeed = params.speed();
                 }
-
                 navigation.a(params.speed());
                 return NMSImpl.isNavigationFinished(navigation);
             }
@@ -866,37 +836,30 @@ public class NMSImpl implements NMSBridge {
             if (zDiff < 0.0) {
                 yaw += Math.abs(180 - yaw) * 2;
             }
-
             if (handle instanceof EntityEnderDragon) {
                 yaw = Util.getDragonYaw(handle.getBukkitEntity(), xDiff, zDiff);
             } else {
                 yaw = yaw - 90;
             }
-
             if (headOnly) {
                 setHeadYaw(entity, (float) yaw);
             } else {
                 look(entity, (float) yaw, (float) pitch);
             }
-
             return;
         }
-
         if (handle instanceof EntityInsentient) {
             ((EntityInsentient) handle).getControllerLook().a(to.getX(), to.getY(), to.getZ(),
                     ((EntityInsentient) handle).cJ(), ((EntityInsentient) handle).N());
             while (((EntityInsentient) handle).aQ >= 180F) {
                 ((EntityInsentient) handle).aQ -= 360F;
             }
-
             while (((EntityInsentient) handle).aQ < -180F) {
                 ((EntityInsentient) handle).aQ += 360F;
             }
-
         } else if (handle instanceof EntityHumanNPC) {
             ((EntityHumanNPC) handle).getNPC().getOrAddTrait(RotationTrait.class).getPhysicalSession().rotateToFace(to);
         }
-
     }
 
     @Override
@@ -909,22 +872,18 @@ public class NMSImpl implements NMSBridge {
             } else {
                 look(from, to.getLocation(), false, true);
             }
-
         } else if (handle instanceof EntityInsentient) {
             ((EntityInsentient) handle).getControllerLook().a(target, ((EntityInsentient) handle).cJ(),
                     ((EntityInsentient) handle).N());
             while (((EntityLiving) handle).aQ >= 180F) {
                 ((EntityLiving) handle).aQ -= 360F;
             }
-
             while (((EntityLiving) handle).aQ < -180F) {
                 ((EntityLiving) handle).aQ += 360F;
             }
-
         } else if (handle instanceof EntityHumanNPC) {
             ((EntityHumanNPC) handle).getNPC().getOrAddTrait(RotationTrait.class).getPhysicalSession().rotateToFace(to);
         }
-
     }
 
     @Override
@@ -964,9 +923,7 @@ public class NMSImpl implements NMSBridge {
                         e.printStackTrace();
                         return super.getBukkitView();
                     }
-
                 }
-
                 return this.bukkitEntity;
             }
         };
@@ -1012,7 +969,6 @@ public class NMSImpl implements NMSBridge {
                 if (entity1.dead || !entity1.w(entity)) {
                     entity.stopRiding();
                 }
-
             } else {
                 if (!entity.dead) {
                     try {
@@ -1023,22 +979,17 @@ public class NMSImpl implements NMSBridge {
                         entity.appendEntityCrashDetails(crashreportsystemdetails);
                         throw new ReportedException(crashreport);
                     }
-
                 }
-
                 if (entity.dead) {
                     entity.world.removeEntity(entity);
                 } else if (!removeFromPlayerList) {
                     if (!entity.world.players.contains(entity)) {
                         entity.world.players.add(entity);
                     }
-
                 } else {
                     entity.world.players.remove(entity);
                 }
-
             }
-
         };
     }
 
@@ -1051,13 +1002,11 @@ public class NMSImpl implements NMSBridge {
             if (!ENTITY_CLASS_TO_INT.containsKey(search)) {
                 continue;
             }
-
             int code = ENTITY_CLASS_TO_INT.get(search);
             ENTITY_CLASS_TO_INT.put(clazz, code);
             ENTITY_CLASS_TO_NAME.put(clazz, ENTITY_CLASS_TO_NAME.get(search));
             return;
         }
-
         throw new IllegalArgumentException("unable to find valid entity superclass for class " + clazz.toString());
     }
 
@@ -1096,7 +1045,6 @@ public class NMSImpl implements NMSBridge {
             hook.hooked = null;
             hook.getBukkitEntity().remove();
         }
-
     }
 
     @Override
@@ -1118,13 +1066,10 @@ public class NMSImpl implements NMSBridge {
             } catch (IllegalAccessException e) {
                 e.printStackTrace();
             }
-
         }
-
         if (getHandle(entity) instanceof EntityHumanNPC) {
             ((EntityHumanNPC) getHandle(entity)).setTracked();
         }
-
     }
 
     @Override
@@ -1134,11 +1079,9 @@ public class NMSImpl implements NMSBridge {
         if (bodyYaw == null) {
             bodyYaw = handle.yaw;
         }
-
         if (pitch == null) {
             pitch = handle.pitch;
         }
-
         List<Packet<?>> toSend = Lists.newArrayList();
         if (position) {
             EntityTrackerEntry entry = ((WorldServer) handle.world).getTracker().trackedEntities.get(handle.getId());
@@ -1151,18 +1094,15 @@ public class NMSImpl implements NMSBridge {
                 e.printStackTrace();
                 return;
             }
-
             toSend.add(new PacketPlayOutRelEntityMoveLook(handle.getId(), (short) dx, (short) dy, (short) dz,
                     (byte) (bodyYaw * 256.0F / 360.0F), (byte) (pitch * 256.0F / 360.0F), handle.onGround));
         } else {
             toSend.add(new PacketPlayOutEntityLook(handle.getId(), (byte) (bodyYaw * 256.0F / 360.0F),
                     (byte) (pitch * 256.0F / 360.0F), handle.onGround));
         }
-
         if (headYaw != null) {
             toSend.add(new PacketPlayOutEntityHeadRotation(handle, (byte) (headYaw * 256.0F / 360.0F)));
         }
-
         sendPacketsNearby(null, from.getLocation(), toSend, 64);
     }
 
@@ -1186,7 +1126,6 @@ public class NMSImpl implements NMSBridge {
             entities[i] = (EntityPlayer) skinnable;
             i++;
         }
-
         NMSImpl.sendPacket(recipient,
                 new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.REMOVE_PLAYER, entities));
     }
@@ -1207,14 +1146,12 @@ public class NMSImpl implements NMSBridge {
         if (TEAM_FIELD == null) {
             TEAM_FIELD = NMS.getGetter(team.getClass(), "team");
         }
-
         try {
             ScoreboardTeam nmsTeam = (ScoreboardTeam) TEAM_FIELD.invoke(team);
             sendPacket(recipient, new PacketPlayOutScoreboardTeam(nmsTeam, mode));
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     @Override
@@ -1242,7 +1179,6 @@ public class NMSImpl implements NMSBridge {
         } else if (handle instanceof EntityHumanNPC) {
             ((EntityHumanNPC) handle).setMoveDestination(x, y, z, speed);
         }
-
     }
 
     @Override
@@ -1267,7 +1203,6 @@ public class NMSImpl implements NMSBridge {
         if (!(handle instanceof EntityHuman)) {
             handle.aO = yaw;
         }
-
         handle.aQ = yaw;
     }
 
@@ -1317,14 +1252,11 @@ public class NMSImpl implements NMSBridge {
             } catch (Exception e) {
                 return;
             }
-
         }
-
         try {
             SKULL_PROFILE_FIELD.set(meta, profile);
         } catch (Exception e) {
         }
-
     }
 
     @Override
@@ -1338,7 +1270,6 @@ public class NMSImpl implements NMSBridge {
         } else if (handle instanceof EntityHumanNPC) {
             ((EntityHumanNPC) handle).setShouldJump();
         }
-
     }
 
     @Override
@@ -1356,7 +1287,6 @@ public class NMSImpl implements NMSBridge {
         if (entity instanceof Player) {
             ((Player) entity).setSneaking(sneaking);
         }
-
     }
 
     @Override
@@ -1389,7 +1319,6 @@ public class NMSImpl implements NMSBridge {
         } catch (IllegalAccessException e) {
             e.printStackTrace();
         }
-
         return false;
     }
 
@@ -1427,7 +1356,6 @@ public class NMSImpl implements NMSBridge {
                     facingByte = (byte) 3;
                     break;
             }
-
             Location bedLoc = loc.clone().add(0, -loc.getY(), 0);
             PacketPlayOutBed bed = new PacketPlayOutBed(from,
                     new BlockPosition(bedLoc.getBlockX(), bedLoc.getBlockY(), bedLoc.getBlockZ()));
@@ -1446,7 +1374,6 @@ public class NMSImpl implements NMSBridge {
                 list.forEach(packet -> sendPacket(nearby, packet));
                 meta.set(nearby.getUniqueId(), entity.getUniqueId().toString(), System.currentTimeMillis());
             }
-
         } else {
             PacketPlayOutAnimation packet = new PacketPlayOutAnimation(from, 2);
             sendPacketNearby(entity, entity.getLocation(), packet, 64);
@@ -1454,11 +1381,8 @@ public class NMSImpl implements NMSBridge {
                 if (meta.remove(player.getUniqueId(), entity.getUniqueId().toString())) {
                     sendPacket(player, packet);
                 }
-
             }
-
         }
-
     }
 
     @Override
@@ -1474,7 +1398,6 @@ public class NMSImpl implements NMSBridge {
         if (RANDOM.nextFloat() <= 0.85F && (handle.ak() || handle.ao())) {
             handle.motY += power;
         }
-
     }
 
     @Override
@@ -1502,7 +1425,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Exception e) {
             Messaging.logTr(Messages.ERROR_UPDATING_NAVIGATION_WORLD, e.getMessage());
         }
-
     }
 
     @Override
@@ -1514,10 +1436,8 @@ public class NMSImpl implements NMSBridge {
             if (en instanceof EntityHumanNPC) {
                 ((EntityHumanNPC) en).updatePathfindingRange(pathfindingRange);
             }
-
             return;
         }
-
         if (PATHFINDING_RANGE == null)
             return;
         EntityInsentient handle = (EntityInsentient) en;
@@ -1530,7 +1450,6 @@ public class NMSImpl implements NMSBridge {
         } catch (IllegalAccessException e) {
             e.printStackTrace();
         }
-
     }
 
     private static class CitizensInventoryAnvil extends CraftInventoryAnvil implements ForwardingInventory {
@@ -1639,7 +1558,6 @@ public class NMSImpl implements NMSBridge {
             living.setPosition(living.locX - 0.01, living.locY, living.locZ - 0.01);
             living.setPosition(living.locX + 0.01, living.locY, living.locZ + 0.01);
         }
-
     }
 
     public static void clearGoals(PathfinderGoalSelector... goalSelectors) {
@@ -1652,9 +1570,7 @@ public class NMSImpl implements NMSBridge {
             } catch (Exception e) {
                 Messaging.logTr(Messages.ERROR_CLEARING_GOALS, e.getLocalizedMessage());
             }
-
         }
-
     }
 
     private static CompoundTag convertNBT(net.minecraft.server.v1_10_R1.NBTTagCompound tag) {
@@ -1664,7 +1580,6 @@ public class NMSImpl implements NMSBridge {
         for (String key : tag.c()) {
             tags.put(key, convertNBT(key, tag.get(key)));
         }
-
         return new CompoundTag("", tags);
     }
 
@@ -1695,10 +1610,8 @@ public class NMSImpl implements NMSBridge {
                 for (int i = 0; i < list.size(); i++) {
                     converted.add(convertNBT("", list.get(i)));
                 }
-
                 return new ListTag(key, tagType, converted);
             }
-
         } else if (base instanceof net.minecraft.server.v1_10_R1.NBTTagCompound)
             return convertNBT((net.minecraft.server.v1_10_R1.NBTTagCompound) base);
         else if (base instanceof net.minecraft.server.v1_10_R1.NBTTagEnd)
@@ -1717,16 +1630,13 @@ public class NMSImpl implements NMSBridge {
                 if (f2 > 3.0F) {
                     f2 = 3.0F;
                 }
-
                 if (!entity.onGround) {
                     f2 *= 0.5F;
                 }
-
                 if (f2 > 0.0F) {
                     f4 += (0.54600006F - f4) * f2 / 3.0F;
                     f3 += (entity.cp() - f3) * f2 / 3.0F;
                 }
-
                 entity.a(f, f1, f3);
                 entity.move(entity.motX, entity.motY, entity.motZ);
                 entity.motX *= f4;
@@ -1735,12 +1645,10 @@ public class NMSImpl implements NMSBridge {
                 if (!entity.isNoGravity()) {
                     entity.motY -= 0.02D;
                 }
-
                 if (entity.positionChanged
                         && entity.c(entity.motX, entity.motY + 0.6000000238418579D - entity.locY + d1, entity.motZ)) {
                     entity.motY = 0.30000001192092896D;
                 }
-
             } else if (entity.ao()
                     && (!(entity instanceof EntityHuman) || !((EntityHuman) entity).abilities.isFlying)) {
                 double d1 = entity.locY;
@@ -1752,17 +1660,14 @@ public class NMSImpl implements NMSBridge {
                 if (!entity.isNoGravity()) {
                     entity.motY -= 0.02D;
                 }
-
                 if (entity.positionChanged
                         && entity.c(entity.motX, entity.motY + 0.6000000238418579D - entity.locY + d1, entity.motZ)) {
                     entity.motY = 0.30000001192092896D;
                 }
-
             } else if (entity.cG()) {
                 if (entity.motY > -0.5D) {
                     entity.fallDistance = 1.0F;
                 }
-
                 Vec3D vec3d = entity.aB();
                 float f5 = entity.pitch * 0.017453292F;
                 double d0 = Math.sqrt(vec3d.x * vec3d.x + vec3d.z * vec3d.z);
@@ -1777,19 +1682,16 @@ public class NMSImpl implements NMSBridge {
                     entity.motX += vec3d.x * d4 / d0;
                     entity.motZ += vec3d.z * d4 / d0;
                 }
-
                 if (f5 < 0.0F) {
                     double d4 = d2 * -MathHelper.sin(f5) * 0.04D;
                     entity.motY += d4 * 3.2D;
                     entity.motX -= vec3d.x * d4 / d0;
                     entity.motZ -= vec3d.z * d4 / d0;
                 }
-
                 if (d0 > 0.0D) {
                     entity.motX += (vec3d.x / d0 * d2 - entity.motX) * 0.1D;
                     entity.motZ += (vec3d.z / d0 * d2 - entity.motZ) * 0.1D;
                 }
-
                 entity.motX *= 0.9900000095367432D;
                 entity.motY *= 0.9800000190734863D;
                 entity.motZ *= 0.9900000095367432D;
@@ -1802,14 +1704,11 @@ public class NMSImpl implements NMSBridge {
                         entity.a(entity.e((int) f7), 1.0F, 1.0F);
                         entity.damageEntity(DamageSource.FLY_INTO_WALL, f7);
                     }
-
                 }
-
                 if (entity.onGround && !entity.world.isClientSide && entity.getFlag(7)
                         && !CraftEventFactory.callToggleGlideEvent(entity, false).isCancelled()) {
                     entity.setFlag(7, false);
                 }
-
             } else {
                 float f8 = 0.91F;
                 BlockPosition.PooledBlockPosition blockposition_pooledblockposition = BlockPosition.PooledBlockPosition
@@ -1817,7 +1716,6 @@ public class NMSImpl implements NMSBridge {
                 if (entity.onGround) {
                     f8 = entity.world.getType(blockposition_pooledblockposition).getBlock().frictionFactor * 0.91F;
                 }
-
                 float f4 = 0.16277136F / (f8 * f8 * f8);
                 float f3;
                 if (entity.onGround) {
@@ -1825,14 +1723,12 @@ public class NMSImpl implements NMSBridge {
                 } else {
                     f3 = entity.aS;
                 }
-
                 entity.a(f, f1, f3);
                 f8 = 0.91F;
                 if (entity.onGround) {
                     f8 = entity.world.getType(blockposition_pooledblockposition.e(entity.locX,
                             entity.getBoundingBox().b - 1.0D, entity.locZ)).getBlock().frictionFactor * 0.91F;
                 }
-
                 if (entity.m_()) {
                     entity.motX = MathHelper.a(entity.motX, -0.15000000596046448D, 0.15000000596046448D);
                     entity.motZ = MathHelper.a(entity.motZ, -0.15000000596046448D, 0.15000000596046448D);
@@ -1840,19 +1736,15 @@ public class NMSImpl implements NMSBridge {
                     if (entity.motY < -0.15D) {
                         entity.motY = -0.15D;
                     }
-
                     boolean flag = entity.isSneaking() && entity instanceof EntityHuman;
                     if (flag && entity.motY < 0.0D) {
                         entity.motY = 0.0D;
                     }
-
                 }
-
                 entity.move(entity.motX, entity.motY, entity.motZ);
                 if (entity.positionChanged && entity.m_()) {
                     entity.motY = 0.2D;
                 }
-
                 if (entity.hasEffect(MobEffects.LEVITATION)) {
                     entity.motY += (0.05D * (entity.getEffect(MobEffects.LEVITATION).getAmplifier() + 1) - entity.motY)
                             * 0.2D;
@@ -1865,21 +1757,16 @@ public class NMSImpl implements NMSBridge {
                         } else {
                             entity.motY = 0.0D;
                         }
-
                     } else if (!entity.isNoGravity()) {
                         entity.motY -= 0.08D;
                     }
-
                 }
-
                 entity.motY *= 0.9800000190734863D;
                 entity.motX *= f8;
                 entity.motZ *= f8;
                 blockposition_pooledblockposition.t();
             }
-
         }
-
         entity.aG = entity.aH;
         double d1 = entity.locX - entity.lastX;
         double d0 = entity.locZ - entity.lastZ;
@@ -1887,7 +1774,6 @@ public class NMSImpl implements NMSBridge {
         if (f2 > 1.0F) {
             f2 = 1.0F;
         }
-
         entity.aH += (f2 - entity.aH) * 0.4F;
         entity.aI += entity.aH;
     }
@@ -1918,7 +1804,6 @@ public class NMSImpl implements NMSBridge {
         } catch (IllegalAccessException e) {
             e.printStackTrace();
         }
-
         return null;
     }
 
@@ -1940,7 +1825,6 @@ public class NMSImpl implements NMSBridge {
         } catch (IllegalAccessException e) {
             e.printStackTrace();
         }
-
     }
 
     public static boolean isLeashed(NPC npc, Supplier<Boolean> isLeashed, EntityInsentient entity) {
@@ -1963,7 +1847,6 @@ public class NMSImpl implements NMSBridge {
         if (mat != null) {
             minecart.setDisplayBlock(Block.getById(mat.getId()).fromLegacyData(data));
         }
-
         minecart.setDisplayBlockOffset(offset);
     }
 
@@ -1991,13 +1874,10 @@ public class NMSImpl implements NMSBridge {
                     || location.distanceSquared(player.getLocation(PACKET_CACHE_LOCATION)) > radius) {
                 continue;
             }
-
             for (Packet<?> packet : packets) {
                 NMSImpl.sendPacket(player, packet);
             }
-
         }
-
     }
 
     public static void sendPacketsNearby(Player from, Location location, Packet<?>... packets) {
@@ -2010,7 +1890,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     public static void setSize(Entity entity, float f, float f1, boolean justCreated) {
@@ -2024,9 +1903,7 @@ public class NMSImpl implements NMSBridge {
             if (entity.width > f2 && !justCreated && !entity.world.isClientSide) {
                 entity.move((f2 - entity.width) / 2, 0.0D, (f2 - entity.width) / 2);
             }
-
         }
-
     }
 
     public static void stopNavigation(NavigationAbstract navigation) {
@@ -2044,7 +1921,6 @@ public class NMSImpl implements NMSBridge {
         } else if (entity instanceof EntityHumanNPC) {
             ((EntityHumanNPC) entity).updateAI();
         }
-
     }
 
     public static void updateNavigation(NavigationAbstract navigation) {
@@ -2098,7 +1974,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Exception e) {
             Messaging.logTr(Messages.ERROR_GETTING_ID_MAPPING, e.getMessage());
         }
-
         try {
             MAKE_REQUEST = YggdrasilAuthenticationService.class.getDeclaredMethod("makeRequest", URL.class,
                     Object.class, Class.class);
@@ -2106,7 +1981,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Exception ex) {
             ex.printStackTrace();
         }
-
         try {
             ENDERMAN_ANGRY = (DataWatcherObject<Boolean>) NMS.getField(EntityEnderman.class, "by").get(null);
         } catch (IllegalArgumentException e) {
@@ -2114,6 +1988,5 @@ public class NMSImpl implements NMSBridge {
         } catch (IllegalAccessException e) {
             e.printStackTrace();
         }
-
     }
 }
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/PlayerAnimationImpl.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/PlayerAnimationImpl.java
index 7f956fee3..5b31b7184 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/PlayerAnimationImpl.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/PlayerAnimationImpl.java
@@ -21,7 +21,6 @@ public class PlayerAnimationImpl {
             playDefaultAnimation(player, to, DEFAULTS.get(animation));
             return;
         }
-
         switch (animation) {
             case SNEAK:
                 player.getBukkitEntity().setSneaking(true);
@@ -52,7 +51,6 @@ public class PlayerAnimationImpl {
             default:
                 throw new UnsupportedOperationException();
         }
-
     }
 
     protected static void playDefaultAnimation(EntityPlayer player, Iterable<Player> to, int code) {
@@ -64,7 +62,6 @@ public class PlayerAnimationImpl {
         for (Player player : to) {
             NMSImpl.sendPacket(player, packet);
         }
-
     }
 
     private static EnumMap<PlayerAnimation, Integer> DEFAULTS = Maps.newEnumMap(PlayerAnimation.class);
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/PlayerControllerMove.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/PlayerControllerMove.java
index fe9d73e60..ac5b91b70 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/PlayerControllerMove.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/PlayerControllerMove.java
@@ -50,18 +50,15 @@ public class PlayerControllerMove extends ControllerMove {
         if (f3 > f2) {
             f3 = f2;
         }
-
         if (f3 < -f2) {
             f3 = -f2;
         }
-
         float f4 = f + f3;
         if (f4 < 0.0F) {
             f4 += 360.0F;
         } else if (f4 > 360.0F) {
             f4 -= 360.0F;
         }
-
         return f4;
     }
 
@@ -99,11 +96,8 @@ public class PlayerControllerMove extends ControllerMove {
                 } else {
                     ((EntityInsentient) this.a).getControllerJump().a();
                 }
-
             }
-
         }
-
     }
 
     protected int cg() {
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/PlayerNavigation.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/PlayerNavigation.java
index 1b61ba843..8cb07324b 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/PlayerNavigation.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/PlayerNavigation.java
@@ -64,27 +64,22 @@ public class PlayerNavigation extends NavigationAbstract {
             while (localBlockPosition.getY() > 0 && this.b.getType(localBlockPosition).getMaterial() == Material.AIR) {
                 localBlockPosition = localBlockPosition.down();
             }
-
             if (localBlockPosition.getY() > 0)
                 return supera(localBlockPosition.up());
             while (localBlockPosition.getY() < this.b.getHeight()
                     && this.b.getType(localBlockPosition).getMaterial() == Material.AIR) {
                 localBlockPosition = localBlockPosition.up();
             }
-
             paramBlockPosition = localBlockPosition;
         }
-
         if (this.b.getType(paramBlockPosition).getMaterial().isBuildable()) {
             localBlockPosition = paramBlockPosition.up();
             while (localBlockPosition.getY() < this.b.getHeight()
                     && this.b.getType(localBlockPosition).getMaterial().isBuildable()) {
                 localBlockPosition = localBlockPosition.up();
             }
-
             return a2(localBlockPosition);
         }
-
         return a2(paramBlockPosition);
     }
 
@@ -143,11 +138,8 @@ public class PlayerNavigation extends NavigationAbstract {
                             || localPathType == PathType.DAMAGE_OTHER)
                         return false;
                 }
-
             }
-
         }
-
         return true;
     }
 
@@ -157,11 +149,9 @@ public class PlayerNavigation extends NavigationAbstract {
             this.c = null;
             return false;
         }
-
         if (!paramPathEntity.a(this.c)) {
             this.c = paramPathEntity;
         }
-
         d();
         if (this.c.d() == 0)
             return false;
@@ -178,11 +168,9 @@ public class PlayerNavigation extends NavigationAbstract {
             if (paramVec3D.distanceSquared(this.j) < 2.25D) {
                 o();
             }
-
             this.i = this.h;
             this.j = paramVec3D;
         }
-
         if (this.c != null && !this.c.b()) {
             Vec3D localVec3D = this.c.f();
             if (!localVec3D.equals(this.k)) {
@@ -192,17 +180,14 @@ public class PlayerNavigation extends NavigationAbstract {
             } else {
                 this.l += System.currentTimeMillis() - this.m;
             }
-
             if (this.n > 0.0D && this.l > this.n * 3.0D) {
                 this.k = Vec3D.a;
                 this.l = 0L;
                 this.n = 0.0D;
                 o();
             }
-
             this.m = System.currentTimeMillis();
         }
-
     }
 
     @Override
@@ -230,11 +215,9 @@ public class PlayerNavigation extends NavigationAbstract {
         if (d1 >= 0.0D) {
             d7 += 1.0D;
         }
-
         if (d2 >= 0.0D) {
             d8 += 1.0D;
         }
-
         d7 /= d1;
         d8 /= d2;
         int k = d1 < 0.0D ? -1 : 1;
@@ -253,11 +236,9 @@ public class PlayerNavigation extends NavigationAbstract {
                 j += m;
                 i3 = i1 - j;
             }
-
             if (!a(i, (int) paramVec3D1.y, j, paramInt1, paramInt2, paramInt3, paramVec3D1, d1, d2))
                 return false;
         }
-
         return true;
     }
 
@@ -303,9 +284,7 @@ public class PlayerNavigation extends NavigationAbstract {
                 if (!localBlock.b(this.b, localBlockPosition))
                     return false;
             }
-
         }
-
         return true;
     }
 
@@ -334,11 +313,8 @@ public class PlayerNavigation extends NavigationAbstract {
                     this.c.a(i + 1, ((PathPoint) localObject).a(((PathPoint) localObject).a, localPathPoint.b + 1,
                             ((PathPoint) localObject).c));
                 }
-
             }
-
         }
-
         if (this.f2) {
             if (this.b.h(new BlockPosition(MathHelper.floor(this.a.locX), (int) (this.a.getBoundingBox().b + 0.5D),
                     MathHelper.floor(this.a.locZ))))
@@ -349,11 +325,8 @@ public class PlayerNavigation extends NavigationAbstract {
                     this.c.b(i - 1);
                     return;
                 }
-
             }
-
         }
-
     }
 
     public boolean f() {
@@ -383,11 +356,9 @@ public class PlayerNavigation extends NavigationAbstract {
                 this.q = this.b.getTime();
                 this.p = false;
             }
-
         } else {
             this.p = true;
         }
-
     }
 
     @Override
@@ -401,7 +372,6 @@ public class PlayerNavigation extends NavigationAbstract {
         if (this.p) {
             j();
         }
-
         if (n())
             return;
         if (b()) {
@@ -414,9 +384,7 @@ public class PlayerNavigation extends NavigationAbstract {
                     && MathHelper.floor(localVec3D.z) == MathHelper.floor(localObject.z)) {
                 this.c.c(this.c.e() + 1);
             }
-
         }
-
         if (n())
             return;
         Vec3D localVec3D = this.c.a(this.a);
@@ -438,16 +406,13 @@ public class PlayerNavigation extends NavigationAbstract {
                 i1 = i2;
                 break;
             }
-
         }
-
         this.o = this.a.width > 0.75F ? this.a.width / 2.0F : 0.75F - this.a.width / 2.0F;
         Vec3D localVec3D2 = this.c.f();
         if (MathHelper.e((float) (this.a.locX - (localVec3D2.x + 0.5D))) < this.o
                 && MathHelper.e((float) (this.a.locZ - (localVec3D2.z + 0.5D))) < this.o) {
             this.c.c(this.c.e() + 1);
         }
-
         int i3 = MathHelper.f(this.a.width);
         int i4 = (int) this.a.length + 1;
         int i5 = i3;
@@ -456,9 +421,7 @@ public class PlayerNavigation extends NavigationAbstract {
                 this.c.c(i6);
                 break;
             }
-
         }
-
         a(localVec3D1);
     }
 
@@ -493,7 +456,6 @@ public class PlayerNavigation extends NavigationAbstract {
             if (j > 16)
                 return (int) this.a.getBoundingBox().b;
         }
-
         return i;
     }
 
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/PlayerPathfinder.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/PlayerPathfinder.java
index 444fd4782..e4b7b1fae 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/PlayerPathfinder.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/PlayerPathfinder.java
@@ -51,7 +51,6 @@ public class PlayerPathfinder {
             i++;
             localPathPoint = localPathPoint.h;
         }
-
         PathPoint[] arrayOfPathPoint = new PathPoint[i];
         localPathPoint = paramPathPoint2;
         arrayOfPathPoint[--i] = localPathPoint;
@@ -59,7 +58,6 @@ public class PlayerPathfinder {
             localPathPoint = localPathPoint.h;
             arrayOfPathPoint[--i] = localPathPoint;
         }
-
         return new PathEntity(arrayOfPathPoint);
     }
 
@@ -77,17 +75,14 @@ public class PlayerPathfinder {
             if (i >= 2000) {
                 break;
             }
-
             PathPoint localObject2 = this.a.c();
             if (localObject2.equals(paramPathPoint2)) {
                 localObject1 = paramPathPoint2;
                 break;
             }
-
             if (localObject2.c(paramPathPoint2) < ((PathPoint) localObject1).c(paramPathPoint2)) {
                 localObject1 = localObject2;
             }
-
             localObject2.i = true;
             int j = this.d.a(this.c, localObject2, paramPathPoint2, paramFloat);
             for (int k = 0; k < j; k++) {
@@ -106,13 +101,9 @@ public class PlayerPathfinder {
                         localPathPoint.g = localPathPoint.e + localPathPoint.f;
                         this.a.a(localPathPoint);
                     }
-
                 }
-
             }
-
         }
-
         if (localObject1 == paramPathPoint1)
             return null;
         Object localObject2 = a(paramPathPoint1, (PathPoint) localObject1);
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/PlayerPathfinderAbstract.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/PlayerPathfinderAbstract.java
index 878982a9e..ea77d3a68 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/PlayerPathfinderAbstract.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/PlayerPathfinderAbstract.java
@@ -56,7 +56,6 @@ public abstract class PlayerPathfinderAbstract extends PathfinderAbstract {
             localPathPoint = new PathPoint(paramInt1, paramInt2, paramInt3);
             this.c.a(j, localPathPoint);
         }
-
         return localPathPoint;
     }
 
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/PlayerPathfinderNormal.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/PlayerPathfinderNormal.java
index d839490ad..592eb5cf4 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/PlayerPathfinderNormal.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/PlayerPathfinderNormal.java
@@ -61,12 +61,10 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
             while (localPathType2 == PathType.OPEN && --paramInt2 >= 1) {
                 localPathType2 = getPathTypeBase(paramIBlockAccess, paramInt1, paramInt2, paramInt3);
             }
-
             localPathType1 = localPathType2 == PathType.WALKABLE || localPathType2 == PathType.OPEN
                     || localPathType2 == PathType.WATER || localPathType2 == PathType.LAVA ? PathType.OPEN
                             : PathType.WALKABLE;
         }
-
         if (localPathType1 == PathType.WALKABLE) {
             for (int i = paramInt1 - 1; i <= paramInt1 + 1; i++) {
                 for (int k = paramInt3 - 1; k <= paramInt3 + 1; k++) {
@@ -77,15 +75,10 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                         } else if (localBlock2 == Blocks.FIRE) {
                             localPathType1 = PathType.DANGER_FIRE;
                         }
-
                     }
-
                 }
-
             }
-
         }
-
         return localPathType1;
     }
 
@@ -104,11 +97,9 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                     if (localPathType2 == PathType.DOOR_WOOD_CLOSED && paramBoolean1 && paramBoolean2) {
                         localPathType2 = PathType.WALKABLE;
                     }
-
                     if (localPathType2 == PathType.DOOR_OPEN && !paramBoolean2) {
                         localPathType2 = PathType.BLOCKED;
                     }
-
                     if (localPathType2 == PathType.RAIL
                             && !(paramIBlockAccess.getType(localBlockPosition)
                                     .getBlock() instanceof BlockMinecartTrackAbstract)
@@ -116,27 +107,20 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                                     .getBlock() instanceof BlockMinecartTrackAbstract)) {
                         localPathType2 = PathType.FENCE;
                     }
-
                     if (i == paramInt1 && k == paramInt2 && m == paramInt3) {
                         localObject1 = localPathType2;
                     }
-
                     if (k > paramInt2 && localPathType2 != PathType.OPEN) {
                         AxisAlignedBB localAxisAlignedBB = new AxisAlignedBB(i - d + 0.5D, paramInt2 + 0.001D,
                                 m - d + 0.5D, i + d + 0.5D, paramInt2 + paramEntityInsentient.length, m + d + 0.5D);
                         if (!paramEntityInsentient.world.b(localAxisAlignedBB)) {
                             localPathType2 = PathType.OPEN;
                         }
-
                     }
-
                     localEnumSet.add(localPathType2);
                 }
-
             }
-
         }
-
         if (localEnumSet.contains(PathType.FENCE))
             return PathType.FENCE;
         Object localObject2 = PathType.BLOCKED;
@@ -146,9 +130,7 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
             if (paramEntityInsentient.a(localPathType1) >= paramEntityInsentient.a((PathType) localObject2)) {
                 localObject2 = localPathType1;
             }
-
         }
-
         if (localObject1 == PathType.OPEN && paramEntityInsentient.a((PathType) localObject2) == 0.0F)
             return PathType.OPEN;
         return (PathType) localObject2;
@@ -169,11 +151,9 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                     if (localPathType2 == PathType.DOOR_WOOD_CLOSED && paramBoolean1 && paramBoolean2) {
                         localPathType2 = PathType.WALKABLE;
                     }
-
                     if (localPathType2 == PathType.DOOR_OPEN && !paramBoolean2) {
                         localPathType2 = PathType.BLOCKED;
                     }
-
                     if (localPathType2 == PathType.RAIL
                             && !(paramIBlockAccess.getType(localBlockPosition)
                                     .getBlock() instanceof BlockMinecartTrackAbstract)
@@ -181,27 +161,20 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                                     .getBlock() instanceof BlockMinecartTrackAbstract)) {
                         localPathType2 = PathType.FENCE;
                     }
-
                     if (i == paramInt1 && k == paramInt2 && m == paramInt3) {
                         localObject1 = localPathType2;
                     }
-
                     if (k > paramInt2 && localPathType2 != PathType.OPEN) {
                         AxisAlignedBB localAxisAlignedBB = new AxisAlignedBB(i - d + 0.5D, paramInt2 + 0.001D,
                                 m - d + 0.5D, i + d + 0.5D, paramInt2 + paramEntityInsentient.length, m + d + 0.5D);
                         if (!paramEntityInsentient.world.b(localAxisAlignedBB)) {
                             localPathType2 = PathType.OPEN;
                         }
-
                     }
-
                     localEnumSet.add(localPathType2);
                 }
-
             }
-
         }
-
         if (localEnumSet.contains(PathType.FENCE))
             return PathType.FENCE;
         Object localObject2 = PathType.BLOCKED;
@@ -211,9 +184,7 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
             if (paramEntityInsentient.a(localPathType1) >= paramEntityInsentient.a((PathType) localObject2)) {
                 localObject2 = localPathType1;
             }
-
         }
-
         if (localObject1 == PathType.OPEN && paramEntityInsentient.a((PathType) localObject2) == 0.0F)
             return PathType.OPEN;
         return (PathType) localObject2;
@@ -235,7 +206,6 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
             localPathPoint.m = localPathType;
             localPathPoint.l = Math.max(localPathPoint.l, f);
         }
-
         if (localPathType == PathType.WALKABLE)
             return localPathPoint;
         if (localPathPoint == null && paramInt4 > 0 && localPathType != PathType.FENCE
@@ -252,11 +222,8 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                 if (this.b.world.b(localAxisAlignedBB3)) {
                     localPathPoint = null;
                 }
-
             }
-
         }
-
         if (localPathType == PathType.OPEN) {
             AxisAlignedBB localAxisAlignedBB4 = new AxisAlignedBB(paramInt1 - d2 + 0.5D, paramInt2 + 0.001D,
                     paramInt3 - d2 + 0.5D, paramInt1 + d2 + 0.5D, paramInt2 + this.b.length, paramInt3 + d2 + 0.5D);
@@ -275,11 +242,8 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                     localPathPoint.l = Math.max(localPathPoint.l, f);
                 } else if (f < 0.0F)
                     return null;
-
             }
-
         }
-
         return localPathPoint;
     }
 
@@ -292,7 +256,6 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
         if (this.b.a(localPathType) >= 0.0F) {
             k = 1;
         }
-
         BlockPosition localBlockPosition = new BlockPosition(paramPathPoint1.a, paramPathPoint1.b, paramPathPoint1.c)
                 .down();
         double d = paramPathPoint1.b - (1.0D - this.a.getType(localBlockPosition).c(this.a, localBlockPosition).e);
@@ -307,19 +270,15 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
         if (localPathPoint1 != null && !localPathPoint1.i && localPathPoint1.a(paramPathPoint2) < paramFloat) {
             paramArrayOfPathPoint[i++] = localPathPoint1;
         }
-
         if (localPathPoint2 != null && !localPathPoint2.i && localPathPoint2.a(paramPathPoint2) < paramFloat) {
             paramArrayOfPathPoint[i++] = localPathPoint2;
         }
-
         if (localPathPoint3 != null && !localPathPoint3.i && localPathPoint3.a(paramPathPoint2) < paramFloat) {
             paramArrayOfPathPoint[i++] = localPathPoint3;
         }
-
         if (localPathPoint4 != null && !localPathPoint4.i && localPathPoint4.a(paramPathPoint2) < paramFloat) {
             paramArrayOfPathPoint[i++] = localPathPoint4;
         }
-
         int m = localPathPoint4 == null || localPathPoint4.m == PathType.OPEN || localPathPoint4.l != 0.0F ? 1 : 0;
         int n = localPathPoint1 == null || localPathPoint1.m == PathType.OPEN || localPathPoint1.l != 0.0F ? 1 : 0;
         int i1 = localPathPoint3 == null || localPathPoint3.m == PathType.OPEN || localPathPoint3.l != 0.0F ? 1 : 0;
@@ -331,36 +290,28 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
             if (localPathPoint5 != null && !localPathPoint5.i && localPathPoint5.a(paramPathPoint2) < paramFloat) {
                 paramArrayOfPathPoint[i++] = localPathPoint5;
             }
-
         }
-
         if (m != 0 && i1 != 0) {
             localPathPoint5 = a(paramPathPoint1.a + 1, paramPathPoint1.b, paramPathPoint1.c - 1, k, d,
                     EnumDirection.NORTH);
             if (localPathPoint5 != null && !localPathPoint5.i && localPathPoint5.a(paramPathPoint2) < paramFloat) {
                 paramArrayOfPathPoint[i++] = localPathPoint5;
             }
-
         }
-
         if (n != 0 && i2 != 0) {
             localPathPoint5 = a(paramPathPoint1.a - 1, paramPathPoint1.b, paramPathPoint1.c + 1, k, d,
                     EnumDirection.SOUTH);
             if (localPathPoint5 != null && !localPathPoint5.i && localPathPoint5.a(paramPathPoint2) < paramFloat) {
                 paramArrayOfPathPoint[i++] = localPathPoint5;
             }
-
         }
-
         if (n != 0 && i1 != 0) {
             localPathPoint5 = a(paramPathPoint1.a + 1, paramPathPoint1.b, paramPathPoint1.c + 1, k, d,
                     EnumDirection.SOUTH);
             if (localPathPoint5 != null && !localPathPoint5.i && localPathPoint5.a(paramPathPoint2) < paramFloat) {
                 paramArrayOfPathPoint[i++] = localPathPoint5;
             }
-
         }
-
         return i;
     }
 
@@ -379,19 +330,16 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                         MathHelper.floor(this.b.locZ));
                 localObject2 = this.a.getType(localObject1).getBlock();
             }
-
         } else if (!this.b.onGround) {
             localObject1 = new BlockPosition(this.b);
             while ((this.a.getType(localObject1).getMaterial() == Material.AIR
                     || this.a.getType(localObject1).getBlock().b(this.a, localObject1)) && localObject1.getY() > 0) {
                 localObject1 = localObject1.down();
             }
-
             i = localObject1.up().getY();
         } else {
             i = MathHelper.floor(this.b.getBoundingBox().b + 0.5D);
         }
-
         localObject1 = new BlockPosition(this.b);
         Object localObject2 = a(this.b, localObject1.getX(), i, localObject1.getZ());
         if (this.b.a((PathType) localObject2) < 0.0F) {
@@ -405,9 +353,7 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                 if (this.b.a(localPathType) >= 0.0F)
                     return a(localBlockPosition.getX(), localBlockPosition.getY(), localBlockPosition.getZ());
             }
-
         }
-
         return a(localObject1.getX(), i, localObject1.getZ());
     }
 
@@ -444,11 +390,9 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
             if (localMaterial == Material.LAVA)
                 return PathType.LAVA;
         }
-
         if (localBlock1.b(paramIBlockAccess, localBlockPosition) && localPathType1 == PathType.BLOCKED) {
             localPathType1 = PathType.OPEN;
         }
-
         return localPathType1;
     }
 }
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/PlayerlistTrackerEntry.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/PlayerlistTrackerEntry.java
index 0281fe2c5..a408d7fff 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/PlayerlistTrackerEntry.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/PlayerlistTrackerEntry.java
@@ -38,7 +38,6 @@ public class PlayerlistTrackerEntry extends EntityTrackerEntry {
             if (event.isCancelled())
                 return;
         }
-
         super.updatePlayer(entityplayer);
 
         if (tracker.getBukkitEntity().getType() != EntityType.PLAYER)
@@ -55,13 +54,10 @@ public class PlayerlistTrackerEntry extends EntityTrackerEntry {
                         return;
                     skinnable.getSkinTracker().updateViewer(entityplayer.getBukkitEntity());
                 }
-
                 Bukkit.getPluginManager().callEvent(
                         new NPCLinkToPlayerEvent(((NPCHolder) tracker).getNPC(), entityplayer.getBukkitEntity()));
             }
-
         }
-
     }
 
     private static int getE(EntityTrackerEntry entry) {
@@ -75,7 +71,6 @@ public class PlayerlistTrackerEntry extends EntityTrackerEntry {
         } catch (IllegalAccessException e) {
             e.printStackTrace();
         }
-
         return 0;
     }
 
@@ -87,7 +82,6 @@ public class PlayerlistTrackerEntry extends EntityTrackerEntry {
         } catch (IllegalAccessException e) {
             e.printStackTrace();
         }
-
         return 0;
     }
 
@@ -99,7 +93,6 @@ public class PlayerlistTrackerEntry extends EntityTrackerEntry {
         } catch (IllegalAccessException e) {
             e.printStackTrace();
         }
-
         return 0;
     }
 
@@ -111,7 +104,6 @@ public class PlayerlistTrackerEntry extends EntityTrackerEntry {
         } catch (IllegalAccessException e) {
             e.printStackTrace();
         }
-
         return null;
     }
 
@@ -123,7 +115,6 @@ public class PlayerlistTrackerEntry extends EntityTrackerEntry {
         } catch (IllegalAccessException e) {
             e.printStackTrace();
         }
-
         return false;
     }
 
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ArmorStandController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ArmorStandController.java
index b15e7fb65..891c9359f 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ArmorStandController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ArmorStandController.java
@@ -80,7 +80,6 @@ public class ArmorStandController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -91,7 +90,6 @@ public class ArmorStandController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -105,7 +103,6 @@ public class ArmorStandController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -113,7 +110,6 @@ public class ArmorStandController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new ArmorStandNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/BatController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/BatController.java
index 8339d605e..db3b9fd11 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/BatController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/BatController.java
@@ -58,7 +58,6 @@ public class BatController extends MobEntityController {
             if (npc != null) {
                 setAsleep(false);
             }
-
         }
 
         @Override
@@ -100,7 +99,6 @@ public class BatController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -114,7 +112,6 @@ public class BatController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -127,7 +124,6 @@ public class BatController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new BatNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -146,7 +142,6 @@ public class BatController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -157,7 +152,6 @@ public class BatController extends MobEntityController {
                 NMSImpl.updateAI(this);
                 npc.update();
             }
-
         }
     }
 }
\ No newline at end of file
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/BlazeController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/BlazeController.java
index f249857e8..254d2a5e1 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/BlazeController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/BlazeController.java
@@ -96,7 +96,6 @@ public class BlazeController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -110,7 +109,6 @@ public class BlazeController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -123,7 +121,6 @@ public class BlazeController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new BlazeNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -142,7 +139,6 @@ public class BlazeController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -150,7 +146,6 @@ public class BlazeController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
     }
 }
\ No newline at end of file
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CaveSpiderController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CaveSpiderController.java
index ef4d1b1b5..f05fd7d86 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CaveSpiderController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CaveSpiderController.java
@@ -69,7 +69,6 @@ public class CaveSpiderController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -106,7 +105,6 @@ public class CaveSpiderController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -119,7 +117,6 @@ public class CaveSpiderController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -128,7 +125,6 @@ public class CaveSpiderController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -138,7 +134,6 @@ public class CaveSpiderController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -151,7 +146,6 @@ public class CaveSpiderController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new CaveSpiderNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -170,7 +164,6 @@ public class CaveSpiderController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -179,7 +172,6 @@ public class CaveSpiderController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -197,7 +189,6 @@ public class CaveSpiderController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
     }
 }
\ No newline at end of file
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ChickenController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ChickenController.java
index 8d68eaa8a..c9f0979c7 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ChickenController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ChickenController.java
@@ -70,7 +70,6 @@ public class ChickenController extends MobEntityController {
                 super.a(flag);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, flag, super::a);
         }
 
@@ -79,7 +78,6 @@ public class ChickenController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -116,7 +114,6 @@ public class ChickenController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -129,7 +126,6 @@ public class ChickenController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -138,7 +134,6 @@ public class ChickenController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -148,7 +143,6 @@ public class ChickenController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -161,7 +155,6 @@ public class ChickenController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new ChickenNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -180,7 +173,6 @@ public class ChickenController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -189,7 +181,6 @@ public class ChickenController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -205,7 +196,6 @@ public class ChickenController extends MobEntityController {
             if (npc != null) {
                 this.bC = 100; // egg timer
             }
-
             super.n();
         }
     }
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CowController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CowController.java
index c0c231f34..77756eb9d 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CowController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CowController.java
@@ -74,7 +74,6 @@ public class CowController extends MobEntityController {
                 super.a(flag);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, flag, super::a);
         }
 
@@ -83,7 +82,6 @@ public class CowController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -130,7 +128,6 @@ public class CowController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -143,7 +140,6 @@ public class CowController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -152,7 +148,6 @@ public class CowController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -162,7 +157,6 @@ public class CowController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -175,7 +169,6 @@ public class CowController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new CowNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -194,7 +187,6 @@ public class CowController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -203,7 +195,6 @@ public class CowController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CreeperController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CreeperController.java
index dd5746f37..7befab05c 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CreeperController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CreeperController.java
@@ -72,7 +72,6 @@ public class CreeperController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -109,7 +108,6 @@ public class CreeperController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -122,7 +120,6 @@ public class CreeperController extends MobEntityController {
             if (npc == null || !npc.isProtected()) {
                 super.dk();
             }
-
         }
 
         @Override
@@ -130,7 +127,6 @@ public class CreeperController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -139,7 +135,6 @@ public class CreeperController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -149,7 +144,6 @@ public class CreeperController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -162,7 +156,6 @@ public class CreeperController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new CreeperNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -181,7 +174,6 @@ public class CreeperController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -190,7 +182,6 @@ public class CreeperController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -206,7 +197,6 @@ public class CreeperController extends MobEntityController {
             if (npc == null || allowPowered) {
                 super.onLightningStrike(entitylightning);
             }
-
         }
 
         public void setAllowPowered(boolean allowPowered) {
@@ -220,7 +210,6 @@ public class CreeperController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
     }
 }
\ No newline at end of file
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EnderDragonController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EnderDragonController.java
index 78e728384..0704ae1c8 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EnderDragonController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EnderDragonController.java
@@ -103,7 +103,6 @@ public class EnderDragonController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -123,7 +122,6 @@ public class EnderDragonController extends MobEntityController {
                 motY = old.y;
                 motZ = old.z;
             }
-
             return res;
         }
 
@@ -133,7 +131,6 @@ public class EnderDragonController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -146,7 +143,6 @@ public class EnderDragonController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new EnderDragonNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -165,7 +161,6 @@ public class EnderDragonController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -173,25 +168,20 @@ public class EnderDragonController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
             if (npc != null) {
                 if (getDragonControllerManager().a().getControllerPhase() == DragonControllerPhase.j) {
                     setHealth(0F);
                     return;
                 }
-
                 if (this.c < 0) {
                     for (int i = 0; i < this.b.length; ++i) {
                         this.b[i][0] = this.yaw;
                         this.b[i][1] = this.locY;
                     }
-
                 }
-
                 if (++this.c == this.b.length) {
                     this.c = 0;
                 }
-
                 this.b[this.c][0] = this.yaw;
                 this.b[this.c][1] = this.locY;
 
@@ -204,11 +194,9 @@ public class EnderDragonController extends MobEntityController {
                     children[j].lastY = vec3.y;
                     children[j].lastZ = vec3.z;
                 }
-
                 if (getBukkitEntity().getPassenger() != null) {
                     yaw = getBukkitEntity().getPassenger().getLocation().getYaw() - 180;
                 }
-
                 if (motX != 0 || motY != 0 || motZ != 0) {
                     motX *= 0.98;
                     motY *= 0.98;
@@ -216,10 +204,8 @@ public class EnderDragonController extends MobEntityController {
                     if (getBukkitEntity().getPassenger() == null) {
                         yaw = Util.getDragonYaw(getBukkitEntity(), motX, motZ);
                     }
-
                     setPosition(locX + motX, locY + motY, locZ + motZ);
                 }
-
                 if (npc.hasTrait(EnderDragonTrait.class) && npc.getOrAddTrait(EnderDragonTrait.class).isDestroyWalls()
                         && NMSImpl.ENDERDRAGON_CHECK_WALLS != null) {
                     for (int i = 0; i < 3; i++) {
@@ -229,11 +215,8 @@ public class EnderDragonController extends MobEntityController {
                         } catch (Throwable e) {
                             e.printStackTrace();
                         }
-
                     }
-
                 }
-
                 if (npc.data().get(NPC.Metadata.COLLIDABLE, false)) {
                     try {
                         KNOCKBACK.invoke(this, this.world.getEntities(this,
@@ -247,13 +230,10 @@ public class EnderDragonController extends MobEntityController {
                     } catch (Throwable t) {
                         t.printStackTrace();
                     }
-
                 }
-
             } else {
                 super.n();
             }
-
         }
 
         private static final MethodHandle HURT = NMS.getMethodHandle(EntityEnderDragon.class, "b", true,
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EndermanController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EndermanController.java
index 14ba8afac..197abcd34 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EndermanController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EndermanController.java
@@ -69,7 +69,6 @@ public class EndermanController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -106,7 +105,6 @@ public class EndermanController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -119,7 +117,6 @@ public class EndermanController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -128,7 +125,6 @@ public class EndermanController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -138,7 +134,6 @@ public class EndermanController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -151,7 +146,6 @@ public class EndermanController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new EndermanNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -177,7 +171,6 @@ public class EndermanController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -186,7 +179,6 @@ public class EndermanController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -204,7 +196,6 @@ public class EndermanController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
     }
 }
\ No newline at end of file
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EndermiteController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EndermiteController.java
index 4d33803b6..dbdce4fb3 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EndermiteController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EndermiteController.java
@@ -69,7 +69,6 @@ public class EndermiteController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -106,7 +105,6 @@ public class EndermiteController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -119,7 +117,6 @@ public class EndermiteController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -128,7 +125,6 @@ public class EndermiteController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -138,7 +134,6 @@ public class EndermiteController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -151,7 +146,6 @@ public class EndermiteController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new EndermiteNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -170,7 +164,6 @@ public class EndermiteController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -179,7 +172,6 @@ public class EndermiteController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -197,7 +189,6 @@ public class EndermiteController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
     }
 }
\ No newline at end of file
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EntityHumanNPC.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EntityHumanNPC.java
index 2d0cd5725..5a0289ed2 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EntityHumanNPC.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EntityHumanNPC.java
@@ -86,7 +86,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         } else {
             skinTracker = null;
         }
-
     }
 
     @Override
@@ -94,7 +93,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         if (npc == null || !npc.isFlyable()) {
             super.a(d0, flag, block, blockposition);
         }
-
     }
 
     @Override
@@ -142,7 +140,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         if (npc != null) {
             Util.callCollisionEvent(npc, entity.getBukkitEntity());
         }
-
     }
 
     @Override
@@ -155,7 +152,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
             velocityChanged = false;
             Bukkit.getScheduler().runTask(CitizensAPI.getPlugin(), () -> EntityHumanNPC.this.velocityChanged = true);
         }
-
         return damaged;
     }
 
@@ -181,7 +177,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         if (npc == null || !npc.isFlyable()) {
             super.e(f, f1);
         }
-
     }
 
     @Override
@@ -190,7 +185,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         if (vector != null) {
             super.f(vector.getX(), vector.getY(), vector.getZ());
         }
-
     }
 
     @Override
@@ -200,7 +194,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         } else {
             NMSImpl.flyingMoveLogic(this, f, f1);
         }
-
     }
 
     @Override
@@ -208,7 +201,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
             bukkitEntity = new PlayerNPC(this);
         }
-
         return super.getBukkitEntity();
     }
 
@@ -242,7 +234,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         if (skinName == null) {
             skinName = npc.getName();
         }
-
         return skinName.toLowerCase();
     }
 
@@ -266,12 +257,10 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         } catch (IOException e) {
             // swallow
         }
-
         AttributeInstance range = getAttributeInstance(GenericAttributes.FOLLOW_RANGE);
         if (range == null) {
             range = getAttributeMap().b(GenericAttributes.FOLLOW_RANGE);
         }
-
         range.setValue(Setting.DEFAULT_PATHFINDING_RANGE.asDouble());
         controllerJump = new PlayerControllerJump(this);
         controllerMove = new PlayerControllerMove(this);
@@ -305,11 +294,9 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
                 cm();
                 jumpTicks = 10;
             }
-
         } else {
             jumpTicks = 0;
         }
-
         be *= 0.98F;
         bf *= 0.98F;
         bg *= 0.9F;
@@ -318,7 +305,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         if (jumpTicks > 0) {
             jumpTicks--;
         }
-
     }
 
     private void moveWithFallDamage(float mx, float my) {
@@ -327,7 +313,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         if (!npc.isProtected()) {
             a(this.locY - y, onGround);
         }
-
     }
 
     @Override
@@ -336,7 +321,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
             super.playerTick();
             return;
         }
-
         cA();
         boolean navigating = npc.getNavigator().isNavigating();
         if (!navigating && getBukkitEntity() != null
@@ -345,19 +329,15 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
                 && (!npc.isProtected() || SpigotUtil.checkYSafe(locY, getBukkitEntity().getWorld()))) {
             moveWithFallDamage(0, 0);
         }
-
         if (Math.abs(motX) < EPSILON && Math.abs(motY) < EPSILON && Math.abs(motZ) < EPSILON) {
             motX = motY = motZ = 0;
         }
-
         if (navigating) {
             if (!NMSImpl.isNavigationFinished(navigation)) {
                 NMSImpl.updateNavigation(navigation);
             }
-
             moveOnCurrentHeading();
         }
-
         updateAI();
         ct();
         if (npc.data().get(NPC.Metadata.PICKUP_ITEMS, false)) {
@@ -367,16 +347,12 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
             } else {
                 axisalignedbb = this.getBoundingBox().grow(1.0, 0.5, 1.0);
             }
-
             for (Entity entity : this.world.getEntities(this, axisalignedbb)) {
                 if (!entity.dead) {
                     entity.d(this);
                 }
-
             }
-
         }
-
     }
 
     public void setMoveDestination(double x, double y, double z, double speed) {
@@ -432,16 +408,12 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
                 if (cache != null && !cache.isEmpty()) {
                     this.getAttributeMap().a(cache.a(slot));
                 }
-
                 if (equipment != null && !equipment.isEmpty()) {
                     this.getAttributeMap().b(equipment.a(slot));
                 }
-
             }
-
             equipmentCache.put(slot, equipment);
         }
-
         if (!itemChanged)
             return;
         Location current = getBukkitEntity().getLocation(packetLocationCache);
@@ -450,7 +422,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         for (EnumItemSlot slot : EnumItemSlot.values()) {
             packets[i++] = new PacketPlayOutEntityEquipment(getId(), slot, getEquipment(slot));
         }
-
         NMSImpl.sendPacketsNearby(getBukkitEntity(), current, packets);
     }
 
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EvokerController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EvokerController.java
index 06b1b3c9a..a7f1c9909 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EvokerController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EvokerController.java
@@ -55,7 +55,6 @@ public class EvokerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -92,7 +91,6 @@ public class EvokerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -105,7 +103,6 @@ public class EvokerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -114,7 +111,6 @@ public class EvokerController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -124,7 +120,6 @@ public class EvokerController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -137,7 +132,6 @@ public class EvokerController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new EvokerNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -156,7 +150,6 @@ public class EvokerController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -165,7 +158,6 @@ public class EvokerController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GhastController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GhastController.java
index 2387aa7e6..8f22c4208 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GhastController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GhastController.java
@@ -82,7 +82,6 @@ public class GhastController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -101,7 +100,6 @@ public class GhastController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -114,7 +112,6 @@ public class GhastController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new GhastNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -133,7 +130,6 @@ public class GhastController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -141,7 +137,6 @@ public class GhastController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
             super.M();
         }
     }
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GiantController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GiantController.java
index a10b4b906..1b350b87a 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GiantController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GiantController.java
@@ -55,7 +55,6 @@ public class GiantController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -92,7 +91,6 @@ public class GiantController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -105,7 +103,6 @@ public class GiantController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -114,7 +111,6 @@ public class GiantController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -124,7 +120,6 @@ public class GiantController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -137,7 +132,6 @@ public class GiantController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new GiantNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -156,7 +150,6 @@ public class GiantController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -165,7 +158,6 @@ public class GiantController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -183,7 +175,6 @@ public class GiantController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
     }
 
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GuardianController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GuardianController.java
index f5ccd6b97..5fd8c3b74 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GuardianController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GuardianController.java
@@ -55,7 +55,6 @@ public class GuardianController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -92,7 +91,6 @@ public class GuardianController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -105,7 +103,6 @@ public class GuardianController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -114,7 +111,6 @@ public class GuardianController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -124,7 +120,6 @@ public class GuardianController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -137,7 +132,6 @@ public class GuardianController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new GuardianNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -156,7 +150,6 @@ public class GuardianController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -175,7 +168,6 @@ public class GuardianController extends MobEntityController {
                 NMSImpl.updateAI(this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -185,7 +177,6 @@ public class GuardianController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
     }
 
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GuardianElderController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GuardianElderController.java
index 1f935aafe..0eb6d1ccc 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GuardianElderController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GuardianElderController.java
@@ -55,7 +55,6 @@ public class GuardianElderController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -92,7 +91,6 @@ public class GuardianElderController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -105,7 +103,6 @@ public class GuardianElderController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -114,7 +111,6 @@ public class GuardianElderController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -124,7 +120,6 @@ public class GuardianElderController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -137,7 +132,6 @@ public class GuardianElderController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new GuardianElderNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -156,7 +150,6 @@ public class GuardianElderController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -175,7 +168,6 @@ public class GuardianElderController extends MobEntityController {
                 NMSImpl.updateAI(this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -185,7 +177,6 @@ public class GuardianElderController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
     }
 
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseController.java
index 346519a1c..f0c02d44f 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseController.java
@@ -60,7 +60,6 @@ public class HorseController extends MobEntityController {
                 ((Horse) getBukkitEntity()).setDomestication(((Horse) getBukkitEntity()).getMaxDomestication());
                 baseMovementSpeed = this.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED).getValue();
             }
-
         }
 
         @Override
@@ -74,7 +73,6 @@ public class HorseController extends MobEntityController {
                 super.a(flag);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, flag, super::a);
         }
 
@@ -83,7 +81,6 @@ public class HorseController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -120,7 +117,6 @@ public class HorseController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -133,7 +129,6 @@ public class HorseController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -142,7 +137,6 @@ public class HorseController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -152,7 +146,6 @@ public class HorseController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -165,7 +158,6 @@ public class HorseController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new HorseNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -184,7 +176,6 @@ public class HorseController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -198,15 +189,12 @@ public class HorseController extends MobEntityController {
                 } else {
                     riding = false;
                 }
-
                 if (riding) {
                     c(4, true);
                 }
-
                 NMS.setStepHeight(getBukkitEntity(), 1);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseDonkeyController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseDonkeyController.java
index d20a980bc..5e3da4e2d 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseDonkeyController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseDonkeyController.java
@@ -62,7 +62,6 @@ public class HorseDonkeyController extends MobEntityController {
                         .setDomestication(((AbstractHorse) getBukkitEntity()).getMaxDomestication());
                 baseMovementSpeed = this.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED).getValue();
             }
-
         }
 
         @Override
@@ -76,7 +75,6 @@ public class HorseDonkeyController extends MobEntityController {
                 super.a(flag);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, flag, super::a);
         }
 
@@ -85,7 +83,6 @@ public class HorseDonkeyController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -122,7 +119,6 @@ public class HorseDonkeyController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -135,7 +131,6 @@ public class HorseDonkeyController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -144,7 +139,6 @@ public class HorseDonkeyController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -154,7 +148,6 @@ public class HorseDonkeyController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -167,7 +160,6 @@ public class HorseDonkeyController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new HorseDonkeyNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -186,7 +178,6 @@ public class HorseDonkeyController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -200,15 +191,12 @@ public class HorseDonkeyController extends MobEntityController {
                 } else {
                     riding = false;
                 }
-
                 if (riding) {
                     c(4, true);
                 }
-
                 NMS.setStepHeight(getBukkitEntity(), 1);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseMuleController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseMuleController.java
index d37d1d8c7..64ff61f4b 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseMuleController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseMuleController.java
@@ -62,7 +62,6 @@ public class HorseMuleController extends MobEntityController {
                         .setDomestication(((AbstractHorse) getBukkitEntity()).getMaxDomestication());
                 baseMovementSpeed = this.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED).getValue();
             }
-
         }
 
         @Override
@@ -76,7 +75,6 @@ public class HorseMuleController extends MobEntityController {
                 super.a(flag);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, flag, super::a);
         }
 
@@ -85,7 +83,6 @@ public class HorseMuleController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -122,7 +119,6 @@ public class HorseMuleController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -135,7 +131,6 @@ public class HorseMuleController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -144,7 +139,6 @@ public class HorseMuleController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -154,7 +148,6 @@ public class HorseMuleController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -167,7 +160,6 @@ public class HorseMuleController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new HorseMuleNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -186,7 +178,6 @@ public class HorseMuleController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -200,15 +191,12 @@ public class HorseMuleController extends MobEntityController {
                 } else {
                     riding = false;
                 }
-
                 if (riding) {
                     c(4, true);
                 }
-
                 NMS.setStepHeight(getBukkitEntity(), 1);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseSkeletonController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseSkeletonController.java
index babeac3e0..f3511b37d 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseSkeletonController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseSkeletonController.java
@@ -62,7 +62,6 @@ public class HorseSkeletonController extends MobEntityController {
                         .setDomestication(((AbstractHorse) getBukkitEntity()).getMaxDomestication());
                 baseMovementSpeed = this.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED).getValue();
             }
-
         }
 
         @Override
@@ -76,7 +75,6 @@ public class HorseSkeletonController extends MobEntityController {
                 super.a(flag);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, flag, super::a);
         }
 
@@ -85,7 +83,6 @@ public class HorseSkeletonController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -122,7 +119,6 @@ public class HorseSkeletonController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -135,7 +131,6 @@ public class HorseSkeletonController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -144,7 +139,6 @@ public class HorseSkeletonController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -154,7 +148,6 @@ public class HorseSkeletonController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -167,7 +160,6 @@ public class HorseSkeletonController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new HorseSkeletonNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -186,7 +178,6 @@ public class HorseSkeletonController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -200,15 +191,12 @@ public class HorseSkeletonController extends MobEntityController {
                 } else {
                     riding = false;
                 }
-
                 if (riding) {
                     c(4, true);
                 }
-
                 NMS.setStepHeight(getBukkitEntity(), 1);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseZombieController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseZombieController.java
index 26af7fe3f..a91de8e32 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseZombieController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseZombieController.java
@@ -62,7 +62,6 @@ public class HorseZombieController extends MobEntityController {
                         .setDomestication(((AbstractHorse) getBukkitEntity()).getMaxDomestication());
                 baseMovementSpeed = this.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED).getValue();
             }
-
         }
 
         @Override
@@ -76,7 +75,6 @@ public class HorseZombieController extends MobEntityController {
                 super.a(flag);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, flag, super::a);
         }
 
@@ -85,7 +83,6 @@ public class HorseZombieController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -122,7 +119,6 @@ public class HorseZombieController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -135,7 +131,6 @@ public class HorseZombieController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -144,7 +139,6 @@ public class HorseZombieController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -154,7 +148,6 @@ public class HorseZombieController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -167,7 +160,6 @@ public class HorseZombieController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new HorseZombieNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -186,7 +178,6 @@ public class HorseZombieController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -200,15 +191,12 @@ public class HorseZombieController extends MobEntityController {
                 } else {
                     riding = false;
                 }
-
                 if (riding) {
                     c(4, true);
                 }
-
                 NMS.setStepHeight(getBukkitEntity(), 1);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HumanController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HumanController.java
index 7a5b74889..3f2969516 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HumanController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HumanController.java
@@ -35,11 +35,9 @@ public class HumanController extends AbstractEntityController {
         if (npc.requiresNameHologram()) {
             name = teamName;
         }
-
         if (Setting.USE_SCOREBOARD_TEAMS.asBoolean()) {
             npc.getOrAddTrait(ScoreboardTrait.class).createTeam(name);
         }
-
         final GameProfile profile = new GameProfile(uuid, name);
         final EntityHumanNPC handle = new EntityHumanNPC(nmsWorld.getServer().getServer(), nmsWorld, profile,
                 new PlayerInteractManager(nmsWorld), npc);
@@ -47,7 +45,6 @@ public class HumanController extends AbstractEntityController {
         if (skin != null) {
             skin.apply(handle);
         }
-
         Bukkit.getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(), () -> {
             if (getBukkitEntity() == null || !getBukkitEntity().isValid()
                     || getBukkitEntity() != handle.getBukkitEntity())
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/IronGolemController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/IronGolemController.java
index 96d4e8fcd..a7394cdb2 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/IronGolemController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/IronGolemController.java
@@ -55,7 +55,6 @@ public class IronGolemController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -92,7 +91,6 @@ public class IronGolemController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -105,7 +103,6 @@ public class IronGolemController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -114,7 +111,6 @@ public class IronGolemController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -124,7 +120,6 @@ public class IronGolemController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -137,7 +132,6 @@ public class IronGolemController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new IronGolemNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -156,7 +150,6 @@ public class IronGolemController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -165,7 +158,6 @@ public class IronGolemController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -183,7 +175,6 @@ public class IronGolemController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
     }
 
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/LlamaController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/LlamaController.java
index abe24ee0e..8e4fc7451 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/LlamaController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/LlamaController.java
@@ -54,7 +54,6 @@ public class LlamaController extends MobEntityController {
             if (npc != null) {
                 ((Llama) getBukkitEntity()).setDomestication(((Llama) getBukkitEntity()).getMaxDomestication());
             }
-
         }
 
         @Override
@@ -68,7 +67,6 @@ public class LlamaController extends MobEntityController {
                 super.a(flag);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, flag, super::a);
         }
 
@@ -77,7 +75,6 @@ public class LlamaController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -114,7 +111,6 @@ public class LlamaController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -127,7 +123,6 @@ public class LlamaController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -136,7 +131,6 @@ public class LlamaController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -146,7 +140,6 @@ public class LlamaController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -159,7 +152,6 @@ public class LlamaController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new LlamaNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -178,7 +170,6 @@ public class LlamaController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -189,7 +180,6 @@ public class LlamaController extends MobEntityController {
                 NMS.setStepHeight(getBukkitEntity(), 1);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/MagmaCubeController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/MagmaCubeController.java
index f9b6f1d11..d4c83b1a1 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/MagmaCubeController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/MagmaCubeController.java
@@ -49,7 +49,6 @@ public class MagmaCubeController extends MobEntityController {
                 setSize(3, true);
                 this.moveController = new PlayerControllerMove(this);
             }
-
         }
 
         @Override
@@ -62,7 +61,6 @@ public class MagmaCubeController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -77,7 +75,6 @@ public class MagmaCubeController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -108,7 +105,6 @@ public class MagmaCubeController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -116,7 +112,6 @@ public class MagmaCubeController extends MobEntityController {
             if (npc == null) {
                 super.d(human);
             }
-
         }
 
         @Override
@@ -129,7 +124,6 @@ public class MagmaCubeController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -138,7 +132,6 @@ public class MagmaCubeController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -148,7 +141,6 @@ public class MagmaCubeController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -161,7 +153,6 @@ public class MagmaCubeController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new MagmaCubeNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -180,7 +171,6 @@ public class MagmaCubeController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -198,7 +188,6 @@ public class MagmaCubeController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
     }
 
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/MobEntityController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/MobEntityController.java
index 150debb86..ac5824c27 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/MobEntityController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/MobEntityController.java
@@ -34,7 +34,6 @@ public abstract class MobEntityController extends AbstractEntityController {
         if (entity instanceof EntityInsentient) {
             NMSImpl.clearGoals(((EntityInsentient) entity).goalSelector, ((EntityInsentient) entity).targetSelector);
         }
-
         entity.setPositionRotation(at.getX(), at.getY(), at.getZ(), at.getYaw(), at.getPitch());
         if (npc != null) {
             // entity.onGround isn't updated right away - we approximate here so
@@ -43,19 +42,15 @@ public abstract class MobEntityController extends AbstractEntityController {
             if (beneath.isSolid()) {
                 entity.onGround = true;
             }
-
             try {
                 UUID_FIELD.invoke(entity, npc.getUniqueId());
             } catch (Throwable e) {
                 e.printStackTrace();
             }
-
             if (Setting.USE_SCOREBOARD_TEAMS.asBoolean()) {
                 npc.getOrAddTrait(ScoreboardTrait.class).createTeam(npc.getUniqueId().toString());
             }
-
         }
-
         return entity.getBukkitEntity();
     }
 
@@ -66,7 +61,6 @@ public abstract class MobEntityController extends AbstractEntityController {
             ex.printStackTrace();
             return null;
         }
-
     }
 
     private static Constructor<?> getConstructor(Class<?> clazz) {
@@ -79,7 +73,6 @@ public abstract class MobEntityController extends AbstractEntityController {
         } catch (Exception ex) {
             throw new IllegalStateException("unable to find an entity constructor");
         }
-
     }
 
     private static final Map<Class<?>, Constructor<?>> CONSTRUCTOR_CACHE = new WeakHashMap<>();
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/MushroomCowController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/MushroomCowController.java
index 566b9a2c0..1cf8fb1cb 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/MushroomCowController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/MushroomCowController.java
@@ -58,7 +58,6 @@ public class MushroomCowController extends MobEntityController {
                 super.a(flag);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, flag, super::a);
         }
 
@@ -67,7 +66,6 @@ public class MushroomCowController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -111,7 +109,6 @@ public class MushroomCowController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -124,7 +121,6 @@ public class MushroomCowController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -133,7 +129,6 @@ public class MushroomCowController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -143,7 +138,6 @@ public class MushroomCowController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -156,7 +150,6 @@ public class MushroomCowController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new MushroomCowNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -175,7 +168,6 @@ public class MushroomCowController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -184,7 +176,6 @@ public class MushroomCowController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/OcelotController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/OcelotController.java
index 2c865de7b..2a447fd99 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/OcelotController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/OcelotController.java
@@ -56,7 +56,6 @@ public class OcelotController extends MobEntityController {
                 super.a(flag);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, flag, super::a);
         }
 
@@ -65,7 +64,6 @@ public class OcelotController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -102,7 +100,6 @@ public class OcelotController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -115,7 +112,6 @@ public class OcelotController extends MobEntityController {
             if (npc == null) {
                 super.di();
             }
-
         }
 
         @Override
@@ -123,7 +119,6 @@ public class OcelotController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -132,7 +127,6 @@ public class OcelotController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -142,7 +136,6 @@ public class OcelotController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -155,7 +148,6 @@ public class OcelotController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new OcelotNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -174,7 +166,6 @@ public class OcelotController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -183,7 +174,6 @@ public class OcelotController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PigController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PigController.java
index 76aa76112..71cba4d9b 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PigController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PigController.java
@@ -57,7 +57,6 @@ public class PigController extends MobEntityController {
                 super.a(flag);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, flag, super::a);
         }
 
@@ -66,7 +65,6 @@ public class PigController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -103,7 +101,6 @@ public class PigController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -122,7 +119,6 @@ public class PigController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -131,7 +127,6 @@ public class PigController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -141,7 +136,6 @@ public class PigController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -154,7 +148,6 @@ public class PigController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new PigNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -173,7 +166,6 @@ public class PigController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -182,7 +174,6 @@ public class PigController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -198,7 +189,6 @@ public class PigController extends MobEntityController {
             if (npc == null) {
                 super.onLightningStrike(entitylightning);
             }
-
         }
     }
 
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PigZombieController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PigZombieController.java
index b3e5802f5..646e95ac4 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PigZombieController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PigZombieController.java
@@ -55,7 +55,6 @@ public class PigZombieController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -92,7 +91,6 @@ public class PigZombieController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -105,7 +103,6 @@ public class PigZombieController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -114,7 +111,6 @@ public class PigZombieController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -124,7 +120,6 @@ public class PigZombieController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -137,7 +132,6 @@ public class PigZombieController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new PigZombieNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -156,7 +150,6 @@ public class PigZombieController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -165,7 +158,6 @@ public class PigZombieController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PolarBearController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PolarBearController.java
index 79b51a46b..e27f6b3b3 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PolarBearController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PolarBearController.java
@@ -54,7 +54,6 @@ public class PolarBearController extends MobEntityController {
                 super.a(flag);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, flag, super::a);
         }
 
@@ -92,7 +91,6 @@ public class PolarBearController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -106,7 +104,6 @@ public class PolarBearController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -119,7 +116,6 @@ public class PolarBearController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new PolarBearNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -138,7 +134,6 @@ public class PolarBearController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -147,7 +142,6 @@ public class PolarBearController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
     }
 
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/RabbitController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/RabbitController.java
index 192142a41..7df8c909e 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/RabbitController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/RabbitController.java
@@ -57,7 +57,6 @@ public class RabbitController extends MobEntityController {
                 super.a(flag);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, flag, super::a);
         }
 
@@ -66,7 +65,6 @@ public class RabbitController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -103,7 +101,6 @@ public class RabbitController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -116,7 +113,6 @@ public class RabbitController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -125,7 +121,6 @@ public class RabbitController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -135,7 +130,6 @@ public class RabbitController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -148,7 +142,6 @@ public class RabbitController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new RabbitNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -172,7 +165,6 @@ public class RabbitController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -184,7 +176,6 @@ public class RabbitController extends MobEntityController {
             } else {
                 super.M();
             }
-
         }
 
         @Override
@@ -203,7 +194,6 @@ public class RabbitController extends MobEntityController {
                 this.datawatcher.set(NMSImpl.getRabbitTypeField(), i);
                 return;
             }
-
             super.setRabbitType(i);
         }
     }
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SheepController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SheepController.java
index fccf80550..608783d16 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SheepController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SheepController.java
@@ -56,7 +56,6 @@ public class SheepController extends MobEntityController {
                 super.a(flag);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, flag, super::a);
         }
 
@@ -65,7 +64,6 @@ public class SheepController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -102,7 +100,6 @@ public class SheepController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -115,7 +112,6 @@ public class SheepController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -124,7 +120,6 @@ public class SheepController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -134,7 +129,6 @@ public class SheepController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -147,7 +141,6 @@ public class SheepController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SheepNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -166,7 +159,6 @@ public class SheepController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -175,7 +167,6 @@ public class SheepController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ShulkerController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ShulkerController.java
index ea191459c..43c0c19be 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ShulkerController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ShulkerController.java
@@ -57,7 +57,6 @@ public class ShulkerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -73,7 +72,6 @@ public class ShulkerController extends MobEntityController {
             } else {
                 super.A_();
             }
-
         }
 
         @Override
@@ -104,7 +102,6 @@ public class ShulkerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -117,7 +114,6 @@ public class ShulkerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -126,7 +122,6 @@ public class ShulkerController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -136,7 +131,6 @@ public class ShulkerController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -149,7 +143,6 @@ public class ShulkerController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new ShulkerNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -168,7 +161,6 @@ public class ShulkerController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -184,7 +176,6 @@ public class ShulkerController extends MobEntityController {
             if (npc == null) {
                 super.n();
             }
-
         }
 
         @Override
@@ -203,7 +194,6 @@ public class ShulkerController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
     }
 
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SilverfishController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SilverfishController.java
index f9c53f9c7..9e82978a6 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SilverfishController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SilverfishController.java
@@ -55,7 +55,6 @@ public class SilverfishController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -92,7 +91,6 @@ public class SilverfishController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -105,7 +103,6 @@ public class SilverfishController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -114,7 +111,6 @@ public class SilverfishController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -124,7 +120,6 @@ public class SilverfishController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -137,7 +132,6 @@ public class SilverfishController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SilverfishNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -156,7 +150,6 @@ public class SilverfishController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -165,7 +158,6 @@ public class SilverfishController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -183,7 +175,6 @@ public class SilverfishController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
     }
 
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SkeletonController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SkeletonController.java
index ae7461274..625669df8 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SkeletonController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SkeletonController.java
@@ -55,7 +55,6 @@ public class SkeletonController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -92,7 +91,6 @@ public class SkeletonController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -105,7 +103,6 @@ public class SkeletonController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -114,7 +111,6 @@ public class SkeletonController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -124,7 +120,6 @@ public class SkeletonController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -137,7 +132,6 @@ public class SkeletonController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SkeletonNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -156,7 +150,6 @@ public class SkeletonController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -165,7 +158,6 @@ public class SkeletonController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -183,7 +175,6 @@ public class SkeletonController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
     }
 
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SkeletonStrayController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SkeletonStrayController.java
index 0cf3288ee..5fcdd4ad5 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SkeletonStrayController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SkeletonStrayController.java
@@ -55,7 +55,6 @@ public class SkeletonStrayController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -92,7 +91,6 @@ public class SkeletonStrayController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -105,7 +103,6 @@ public class SkeletonStrayController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -114,7 +111,6 @@ public class SkeletonStrayController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -124,7 +120,6 @@ public class SkeletonStrayController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -137,7 +132,6 @@ public class SkeletonStrayController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new StrayNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -156,7 +150,6 @@ public class SkeletonStrayController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -165,7 +158,6 @@ public class SkeletonStrayController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -183,7 +175,6 @@ public class SkeletonStrayController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
     }
 
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SkeletonWitherController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SkeletonWitherController.java
index b7923c76b..690dfca55 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SkeletonWitherController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SkeletonWitherController.java
@@ -55,7 +55,6 @@ public class SkeletonWitherController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -92,7 +91,6 @@ public class SkeletonWitherController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -105,7 +103,6 @@ public class SkeletonWitherController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -114,7 +111,6 @@ public class SkeletonWitherController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -124,7 +120,6 @@ public class SkeletonWitherController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -137,7 +132,6 @@ public class SkeletonWitherController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SkeletonWitherNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -156,7 +150,6 @@ public class SkeletonWitherController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -165,7 +158,6 @@ public class SkeletonWitherController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -183,7 +175,6 @@ public class SkeletonWitherController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
     }
 
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SlimeController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SlimeController.java
index 83a58d554..df7d5fbae 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SlimeController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SlimeController.java
@@ -49,7 +49,6 @@ public class SlimeController extends MobEntityController {
                 setSize(3, true);
                 this.moveController = new PlayerControllerMove(this);
             }
-
         }
 
         @Override
@@ -62,7 +61,6 @@ public class SlimeController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -77,7 +75,6 @@ public class SlimeController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -108,7 +105,6 @@ public class SlimeController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -116,7 +112,6 @@ public class SlimeController extends MobEntityController {
             if (npc == null) {
                 super.d(human);
             }
-
         }
 
         @Override
@@ -129,7 +124,6 @@ public class SlimeController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -138,7 +132,6 @@ public class SlimeController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -148,7 +141,6 @@ public class SlimeController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -161,7 +153,6 @@ public class SlimeController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SlimeNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -180,7 +171,6 @@ public class SlimeController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -198,7 +188,6 @@ public class SlimeController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
     }
 
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SnowmanController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SnowmanController.java
index e040be4ee..dec39bd97 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SnowmanController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SnowmanController.java
@@ -55,7 +55,6 @@ public class SnowmanController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -92,7 +91,6 @@ public class SnowmanController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -105,7 +103,6 @@ public class SnowmanController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -114,7 +111,6 @@ public class SnowmanController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -124,7 +120,6 @@ public class SnowmanController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -137,7 +132,6 @@ public class SnowmanController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SnowmanNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -156,7 +150,6 @@ public class SnowmanController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -165,7 +158,6 @@ public class SnowmanController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -183,7 +175,6 @@ public class SnowmanController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
     }
 
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SpiderController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SpiderController.java
index 6b71ee56c..42c616a8e 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SpiderController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SpiderController.java
@@ -55,7 +55,6 @@ public class SpiderController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -92,7 +91,6 @@ public class SpiderController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -105,7 +103,6 @@ public class SpiderController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -114,7 +111,6 @@ public class SpiderController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -124,7 +120,6 @@ public class SpiderController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -137,7 +132,6 @@ public class SpiderController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SpiderNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -156,7 +150,6 @@ public class SpiderController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -165,7 +158,6 @@ public class SpiderController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -183,7 +175,6 @@ public class SpiderController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
     }
 
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SquidController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SquidController.java
index 6bd8a2948..1003b8e53 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SquidController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SquidController.java
@@ -55,7 +55,6 @@ public class SquidController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -92,7 +91,6 @@ public class SquidController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -105,7 +103,6 @@ public class SquidController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -114,7 +111,6 @@ public class SquidController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -124,7 +120,6 @@ public class SquidController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -137,7 +132,6 @@ public class SquidController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SquidNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -156,7 +150,6 @@ public class SquidController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -173,7 +166,6 @@ public class SquidController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -183,7 +175,6 @@ public class SquidController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
     }
 
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VexController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VexController.java
index a52726db0..32902263a 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VexController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VexController.java
@@ -44,7 +44,6 @@ public class VexController extends MobEntityController {
             if (npc != null) {
                 setNoGravity(true);
             }
-
         }
 
         @Override
@@ -86,7 +85,6 @@ public class VexController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -100,7 +98,6 @@ public class VexController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -113,7 +110,6 @@ public class VexController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new VexNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -132,7 +128,6 @@ public class VexController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -141,7 +136,6 @@ public class VexController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
     }
 
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VillagerController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VillagerController.java
index 992eec91b..46d0c8b35 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VillagerController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VillagerController.java
@@ -64,7 +64,6 @@ public class VillagerController extends MobEntityController {
                 super.a(flag);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, flag, super::a);
         }
 
@@ -73,7 +72,6 @@ public class VillagerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -90,9 +88,7 @@ public class VillagerController extends MobEntityController {
                 if (list != null) {
                     list.clear();
                 }
-
             }
-
             return super.a(entityhuman, enumhand);
         }
 
@@ -124,7 +120,6 @@ public class VillagerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -138,7 +133,6 @@ public class VillagerController extends MobEntityController {
                 blockingATrade = false;
                 return true;
             }
-
             return super.dk();
         }
 
@@ -147,7 +141,6 @@ public class VillagerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -156,7 +149,6 @@ public class VillagerController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -166,7 +158,6 @@ public class VillagerController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -179,7 +170,6 @@ public class VillagerController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new VillagerNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -198,7 +188,6 @@ public class VillagerController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -207,7 +196,6 @@ public class VillagerController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -223,7 +211,6 @@ public class VillagerController extends MobEntityController {
             if (npc == null) {
                 super.onLightningStrike(entitylightning);
             }
-
         }
     }
 
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VindicatorController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VindicatorController.java
index 70416a7c3..b09a152c2 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VindicatorController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VindicatorController.java
@@ -56,7 +56,6 @@ public class VindicatorController extends MobEntityController {
                 super.a(flag);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, flag, super::a);
         }
 
@@ -65,7 +64,6 @@ public class VindicatorController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -102,7 +100,6 @@ public class VindicatorController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -115,7 +112,6 @@ public class VindicatorController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -124,7 +120,6 @@ public class VindicatorController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -134,7 +129,6 @@ public class VindicatorController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -147,7 +141,6 @@ public class VindicatorController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new VindicatorNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -166,7 +159,6 @@ public class VindicatorController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -175,7 +167,6 @@ public class VindicatorController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/WitchController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/WitchController.java
index 1a9aaa445..344ecf792 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/WitchController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/WitchController.java
@@ -55,7 +55,6 @@ public class WitchController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -92,7 +91,6 @@ public class WitchController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -105,7 +103,6 @@ public class WitchController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -114,7 +111,6 @@ public class WitchController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -124,7 +120,6 @@ public class WitchController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -137,7 +132,6 @@ public class WitchController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new WitchNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -156,7 +150,6 @@ public class WitchController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -165,7 +158,6 @@ public class WitchController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -183,7 +175,6 @@ public class WitchController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
     }
 
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/WitherController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/WitherController.java
index 0b4b2863a..3097a6952 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/WitherController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/WitherController.java
@@ -82,7 +82,6 @@ public class WitherController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -102,7 +101,6 @@ public class WitherController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -115,7 +113,6 @@ public class WitherController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new WitherNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -134,7 +131,6 @@ public class WitherController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -149,7 +145,6 @@ public class WitherController extends MobEntityController {
             } else {
                 npc.update();
             }
-
         }
     }
 
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/WolfController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/WolfController.java
index 826761bd3..948d5e61e 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/WolfController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/WolfController.java
@@ -58,7 +58,6 @@ public class WolfController extends MobEntityController {
                 super.a(flag);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, flag, super::a);
         }
 
@@ -67,7 +66,6 @@ public class WolfController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -104,7 +102,6 @@ public class WolfController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -117,7 +114,6 @@ public class WolfController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -126,7 +122,6 @@ public class WolfController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -136,7 +131,6 @@ public class WolfController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -149,7 +143,6 @@ public class WolfController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new WolfNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -168,7 +161,6 @@ public class WolfController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -177,7 +169,6 @@ public class WolfController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ZombieController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ZombieController.java
index fd74224fa..eaaa9b01c 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ZombieController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ZombieController.java
@@ -55,7 +55,6 @@ public class ZombieController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -92,7 +91,6 @@ public class ZombieController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -105,7 +103,6 @@ public class ZombieController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -114,7 +111,6 @@ public class ZombieController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -124,7 +120,6 @@ public class ZombieController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -137,7 +132,6 @@ public class ZombieController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new ZombieNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -156,7 +150,6 @@ public class ZombieController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -165,7 +158,6 @@ public class ZombieController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ZombieHuskController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ZombieHuskController.java
index 296c78ddb..59772c555 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ZombieHuskController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ZombieHuskController.java
@@ -55,7 +55,6 @@ public class ZombieHuskController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -92,7 +91,6 @@ public class ZombieHuskController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -105,7 +103,6 @@ public class ZombieHuskController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -114,7 +111,6 @@ public class ZombieHuskController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -124,7 +120,6 @@ public class ZombieHuskController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -137,7 +132,6 @@ public class ZombieHuskController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new ZombieHuskNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -156,7 +150,6 @@ public class ZombieHuskController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -165,7 +158,6 @@ public class ZombieHuskController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ZombieVillagerController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ZombieVillagerController.java
index adec55471..1b32deea8 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ZombieVillagerController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ZombieVillagerController.java
@@ -55,7 +55,6 @@ public class ZombieVillagerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -92,7 +91,6 @@ public class ZombieVillagerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -105,7 +103,6 @@ public class ZombieVillagerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -114,7 +111,6 @@ public class ZombieVillagerController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -124,7 +120,6 @@ public class ZombieVillagerController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -137,7 +132,6 @@ public class ZombieVillagerController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new ZombieVillagerNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -156,7 +150,6 @@ public class ZombieVillagerController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -165,7 +158,6 @@ public class ZombieVillagerController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/AreaEffectCloudController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/AreaEffectCloudController.java
index 6f9ed5951..7b1838d9a 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/AreaEffectCloudController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/AreaEffectCloudController.java
@@ -66,7 +66,6 @@ public class AreaEffectCloudController extends MobEntityController {
             } else {
                 super.A_();
             }
-
         }
 
         @Override
@@ -77,7 +76,6 @@ public class AreaEffectCloudController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -91,7 +89,6 @@ public class AreaEffectCloudController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -99,7 +96,6 @@ public class AreaEffectCloudController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new AreaEffectCloudNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/BoatController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/BoatController.java
index 18920c334..da0d445f7 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/BoatController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/BoatController.java
@@ -67,7 +67,6 @@ public class BoatController extends MobEntityController {
             } else {
                 super.A_();
             }
-
         }
 
         @Override
@@ -78,7 +77,6 @@ public class BoatController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -92,7 +90,6 @@ public class BoatController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -100,7 +97,6 @@ public class BoatController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new BoatNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -116,7 +112,6 @@ public class BoatController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
     }
 }
\ No newline at end of file
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/DragonFireballController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/DragonFireballController.java
index e60361d97..79eda0012 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/DragonFireballController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/DragonFireballController.java
@@ -67,11 +67,9 @@ public class DragonFireballController extends MobEntityController {
                 if (!npc.isProtected()) {
                     super.A_();
                 }
-
             } else {
                 super.A_();
             }
-
         }
 
         @Override
@@ -82,7 +80,6 @@ public class DragonFireballController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -96,7 +93,6 @@ public class DragonFireballController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -104,7 +100,6 @@ public class DragonFireballController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new DragonFireballNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -120,7 +115,6 @@ public class DragonFireballController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
     }
 }
\ No newline at end of file
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/EggController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/EggController.java
index 80765bc45..697645ed5 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/EggController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/EggController.java
@@ -82,11 +82,9 @@ public class EggController extends AbstractEntityController {
                 if (!npc.isProtected()) {
                     super.A_();
                 }
-
             } else {
                 super.A_();
             }
-
         }
 
         @Override
@@ -97,7 +95,6 @@ public class EggController extends AbstractEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -111,7 +108,6 @@ public class EggController extends AbstractEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -119,7 +115,6 @@ public class EggController extends AbstractEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new EggNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/EnderCrystalController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/EnderCrystalController.java
index d2a10e1c6..37d5e4bb9 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/EnderCrystalController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/EnderCrystalController.java
@@ -66,7 +66,6 @@ public class EnderCrystalController extends MobEntityController {
             } else {
                 super.A_();
             }
-
         }
 
         @Override
@@ -77,7 +76,6 @@ public class EnderCrystalController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -91,7 +89,6 @@ public class EnderCrystalController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -99,7 +96,6 @@ public class EnderCrystalController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new EnderCrystalNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/EnderPearlController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/EnderPearlController.java
index 04af34139..fd28b49e3 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/EnderPearlController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/EnderPearlController.java
@@ -66,11 +66,9 @@ public class EnderPearlController extends MobEntityController {
                 if (!npc.isProtected()) {
                     super.A_();
                 }
-
             } else {
                 super.A_();
             }
-
         }
 
         @Override
@@ -81,7 +79,6 @@ public class EnderPearlController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -95,7 +92,6 @@ public class EnderPearlController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -103,7 +99,6 @@ public class EnderPearlController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new EnderPearlNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/EnderSignalController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/EnderSignalController.java
index ddeeec8fd..cd9bff49b 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/EnderSignalController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/EnderSignalController.java
@@ -66,7 +66,6 @@ public class EnderSignalController extends MobEntityController {
             } else {
                 super.A_();
             }
-
         }
 
         @Override
@@ -77,7 +76,6 @@ public class EnderSignalController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -91,7 +89,6 @@ public class EnderSignalController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -99,7 +96,6 @@ public class EnderSignalController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new EnderSignalNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/EvokerFangsController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/EvokerFangsController.java
index d7b2439e2..902b40521 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/EvokerFangsController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/EvokerFangsController.java
@@ -67,7 +67,6 @@ public class EvokerFangsController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -78,7 +77,6 @@ public class EvokerFangsController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -92,7 +90,6 @@ public class EvokerFangsController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -100,7 +97,6 @@ public class EvokerFangsController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new EvokerFangsNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/ExperienceOrbController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/ExperienceOrbController.java
index 676750e04..aa8840f7b 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/ExperienceOrbController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/ExperienceOrbController.java
@@ -52,7 +52,6 @@ public class ExperienceOrbController extends MobEntityController {
             } else {
                 super.A_();
             }
-
         }
 
         @Override
@@ -63,7 +62,6 @@ public class ExperienceOrbController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -77,7 +75,6 @@ public class ExperienceOrbController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -85,7 +82,6 @@ public class ExperienceOrbController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new ExperienceOrbNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/FallingBlockController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/FallingBlockController.java
index a399ebb73..d8692b865 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/FallingBlockController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/FallingBlockController.java
@@ -78,11 +78,9 @@ public class FallingBlockController extends AbstractEntityController {
                     motZ *= 0.98;
                     move(EnumMoveType.SELF, motX, motY, motZ);
                 }
-
             } else {
                 super.A_();
             }
-
         }
 
         @Override
@@ -93,7 +91,6 @@ public class FallingBlockController extends AbstractEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -107,7 +104,6 @@ public class FallingBlockController extends AbstractEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -115,7 +111,6 @@ public class FallingBlockController extends AbstractEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new FallingBlockNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -131,7 +126,6 @@ public class FallingBlockController extends AbstractEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
 
         private static final double EPSILON = 0.001;
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/FireworkController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/FireworkController.java
index ec81f3754..178fecffe 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/FireworkController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/FireworkController.java
@@ -52,7 +52,6 @@ public class FireworkController extends MobEntityController {
             } else {
                 super.A_();
             }
-
         }
 
         @Override
@@ -63,7 +62,6 @@ public class FireworkController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -77,7 +75,6 @@ public class FireworkController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -85,7 +82,6 @@ public class FireworkController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new FireworkNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/FishingHookController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/FishingHookController.java
index 410a32ffb..2dc4b0f00 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/FishingHookController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/FishingHookController.java
@@ -52,7 +52,6 @@ public class FishingHookController extends MobEntityController {
             } else {
                 super.A_();
             }
-
         }
 
         @Override
@@ -63,7 +62,6 @@ public class FishingHookController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -77,7 +75,6 @@ public class FishingHookController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -85,7 +82,6 @@ public class FishingHookController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new FishingHookNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/ItemController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/ItemController.java
index 47ac29e6a..2af553193 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/ItemController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/ItemController.java
@@ -65,7 +65,6 @@ public class ItemController extends AbstractEntityController {
             } else {
                 super.A_();
             }
-
         }
 
         @Override
@@ -76,7 +75,6 @@ public class ItemController extends AbstractEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -84,7 +82,6 @@ public class ItemController extends AbstractEntityController {
             if (npc == null) {
                 super.d(entityhuman);
             }
-
         }
 
         @Override
@@ -98,7 +95,6 @@ public class ItemController extends AbstractEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -106,7 +102,6 @@ public class ItemController extends AbstractEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new ItemNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/ItemFrameController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/ItemFrameController.java
index a3d24f8b0..35a77364f 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/ItemFrameController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/ItemFrameController.java
@@ -65,7 +65,6 @@ public class ItemFrameController extends MobEntityController {
             } else {
                 super.A_();
             }
-
         }
 
         @Override
@@ -76,7 +75,6 @@ public class ItemFrameController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -90,7 +88,6 @@ public class ItemFrameController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -98,7 +95,6 @@ public class ItemFrameController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new ItemFrameNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/LargeFireballController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/LargeFireballController.java
index d9129ded0..5aea7e6e7 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/LargeFireballController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/LargeFireballController.java
@@ -53,11 +53,9 @@ public class LargeFireballController extends MobEntityController {
                 if (!npc.isProtected()) {
                     super.A_();
                 }
-
             } else {
                 super.A_();
             }
-
         }
 
         @Override
@@ -68,7 +66,6 @@ public class LargeFireballController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -82,7 +79,6 @@ public class LargeFireballController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -90,7 +86,6 @@ public class LargeFireballController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new LargeFireballNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -106,7 +101,6 @@ public class LargeFireballController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
     }
 
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/LeashController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/LeashController.java
index 90afbb61f..57e197427 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/LeashController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/LeashController.java
@@ -52,7 +52,6 @@ public class LeashController extends MobEntityController {
             } else {
                 super.A_();
             }
-
         }
 
         @Override
@@ -63,7 +62,6 @@ public class LeashController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -77,7 +75,6 @@ public class LeashController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -85,7 +82,6 @@ public class LeashController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new LeashNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/LlamaSpitController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/LlamaSpitController.java
index 2afa2595f..e4bd3ff28 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/LlamaSpitController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/LlamaSpitController.java
@@ -70,11 +70,9 @@ public class LlamaSpitController extends AbstractEntityController {
                 if (!npc.isProtected()) {
                     super.A_();
                 }
-
             } else {
                 super.A_();
             }
-
         }
 
         @Override
@@ -85,7 +83,6 @@ public class LlamaSpitController extends AbstractEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -99,7 +96,6 @@ public class LlamaSpitController extends AbstractEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -107,7 +103,6 @@ public class LlamaSpitController extends AbstractEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new LlamaSpitNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartChestController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartChestController.java
index 24b8d97d0..e974a5d08 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartChestController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartChestController.java
@@ -53,7 +53,6 @@ public class MinecartChestController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
 
         @Override
@@ -64,7 +63,6 @@ public class MinecartChestController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -78,7 +76,6 @@ public class MinecartChestController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -86,7 +83,6 @@ public class MinecartChestController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new MinecartChestNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartCommandController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartCommandController.java
index 6b8bca4e5..cd647c259 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartCommandController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartCommandController.java
@@ -53,7 +53,6 @@ public class MinecartCommandController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
 
         @Override
@@ -64,7 +63,6 @@ public class MinecartCommandController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -78,7 +76,6 @@ public class MinecartCommandController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -86,7 +83,6 @@ public class MinecartCommandController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new MinecartCommandNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartFurnaceController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartFurnaceController.java
index 83138e80f..b3a9a510c 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartFurnaceController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartFurnaceController.java
@@ -53,7 +53,6 @@ public class MinecartFurnaceController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
 
         @Override
@@ -64,7 +63,6 @@ public class MinecartFurnaceController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -78,7 +76,6 @@ public class MinecartFurnaceController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -86,7 +83,6 @@ public class MinecartFurnaceController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new MinecartFurnaceNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartHopperController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartHopperController.java
index 596f65152..fa20e3910 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartHopperController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartHopperController.java
@@ -49,7 +49,6 @@ public class MinecartHopperController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
 
         @Override
@@ -60,7 +59,6 @@ public class MinecartHopperController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -74,7 +72,6 @@ public class MinecartHopperController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartRideableController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartRideableController.java
index aa8058c5c..e20d902ab 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartRideableController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartRideableController.java
@@ -53,7 +53,6 @@ public class MinecartRideableController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
 
         @Override
@@ -64,7 +63,6 @@ public class MinecartRideableController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -78,7 +76,6 @@ public class MinecartRideableController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -86,7 +83,6 @@ public class MinecartRideableController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new MinecartRideableNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartSpawnerController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartSpawnerController.java
index 2d65c35dc..9c30ee637 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartSpawnerController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartSpawnerController.java
@@ -49,7 +49,6 @@ public class MinecartSpawnerController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
 
         @Override
@@ -60,7 +59,6 @@ public class MinecartSpawnerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -74,7 +72,6 @@ public class MinecartSpawnerController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartTNTController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartTNTController.java
index 8fa7faffa..7a893253e 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartTNTController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartTNTController.java
@@ -49,7 +49,6 @@ public class MinecartTNTController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
 
         @Override
@@ -60,7 +59,6 @@ public class MinecartTNTController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -74,7 +72,6 @@ public class MinecartTNTController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/PaintingController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/PaintingController.java
index ab6749a19..b1415aaca 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/PaintingController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/PaintingController.java
@@ -52,7 +52,6 @@ public class PaintingController extends MobEntityController {
             } else {
                 super.A_();
             }
-
         }
 
         @Override
@@ -63,7 +62,6 @@ public class PaintingController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -77,7 +75,6 @@ public class PaintingController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -85,7 +82,6 @@ public class PaintingController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new PaintingNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/ShulkerBulletController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/ShulkerBulletController.java
index b352be8d1..4e4a150e9 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/ShulkerBulletController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/ShulkerBulletController.java
@@ -52,7 +52,6 @@ public class ShulkerBulletController extends MobEntityController {
             } else {
                 super.A_();
             }
-
         }
 
         @Override
@@ -63,7 +62,6 @@ public class ShulkerBulletController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -77,7 +75,6 @@ public class ShulkerBulletController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -85,7 +82,6 @@ public class ShulkerBulletController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new ShulkerBulletNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/SmallFireballController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/SmallFireballController.java
index 1fa6af532..d5fb82a31 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/SmallFireballController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/SmallFireballController.java
@@ -52,11 +52,9 @@ public class SmallFireballController extends MobEntityController {
                 if (!npc.isProtected()) {
                     super.A_();
                 }
-
             } else {
                 super.A_();
             }
-
         }
 
         @Override
@@ -67,7 +65,6 @@ public class SmallFireballController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -81,7 +78,6 @@ public class SmallFireballController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -89,7 +85,6 @@ public class SmallFireballController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SmallFireballNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/SnowballController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/SnowballController.java
index e59c397d2..e161521d4 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/SnowballController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/SnowballController.java
@@ -52,7 +52,6 @@ public class SnowballController extends MobEntityController {
             } else {
                 super.A_();
             }
-
         }
 
         @Override
@@ -63,7 +62,6 @@ public class SnowballController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -77,7 +75,6 @@ public class SnowballController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -85,7 +82,6 @@ public class SnowballController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SnowballNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/SpectralArrowController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/SpectralArrowController.java
index bf4469348..7ab82ddd1 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/SpectralArrowController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/SpectralArrowController.java
@@ -52,7 +52,6 @@ public class SpectralArrowController extends MobEntityController {
             } else {
                 super.A_();
             }
-
         }
 
         @Override
@@ -63,7 +62,6 @@ public class SpectralArrowController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -77,7 +75,6 @@ public class SpectralArrowController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -85,7 +82,6 @@ public class SpectralArrowController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SpectralArrowNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/TNTPrimedController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/TNTPrimedController.java
index 5e11e9279..ca36f6622 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/TNTPrimedController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/TNTPrimedController.java
@@ -52,7 +52,6 @@ public class TNTPrimedController extends MobEntityController {
             } else {
                 super.A_();
             }
-
         }
 
         @Override
@@ -63,7 +62,6 @@ public class TNTPrimedController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -77,7 +75,6 @@ public class TNTPrimedController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -85,7 +82,6 @@ public class TNTPrimedController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new TNTPrimedNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/ThrownExpBottleController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/ThrownExpBottleController.java
index 9318b17cf..038a8259b 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/ThrownExpBottleController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/ThrownExpBottleController.java
@@ -52,11 +52,9 @@ public class ThrownExpBottleController extends MobEntityController {
                 if (!npc.isProtected()) {
                     super.A_();
                 }
-
             } else {
                 super.A_();
             }
-
         }
 
         @Override
@@ -67,7 +65,6 @@ public class ThrownExpBottleController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -81,7 +78,6 @@ public class ThrownExpBottleController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -89,7 +85,6 @@ public class ThrownExpBottleController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new ThrownExpBottleNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/ThrownPotionController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/ThrownPotionController.java
index 83a56cfeb..7652101a7 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/ThrownPotionController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/ThrownPotionController.java
@@ -53,7 +53,6 @@ public class ThrownPotionController extends MobEntityController {
             } else {
                 super.A_();
             }
-
         }
 
         @Override
@@ -64,7 +63,6 @@ public class ThrownPotionController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -78,7 +76,6 @@ public class ThrownPotionController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -89,9 +86,7 @@ public class ThrownPotionController extends MobEntityController {
                 } else {
                     bukkitEntity = new SplashThrownPotionNPC(this);
                 }
-
             }
-
             return super.getBukkitEntity();
         }
 
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/TippedArrowController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/TippedArrowController.java
index cc1d9fb26..baa2d4472 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/TippedArrowController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/TippedArrowController.java
@@ -52,7 +52,6 @@ public class TippedArrowController extends MobEntityController {
             } else {
                 super.A_();
             }
-
         }
 
         @Override
@@ -63,7 +62,6 @@ public class TippedArrowController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -77,7 +75,6 @@ public class TippedArrowController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -85,7 +82,6 @@ public class TippedArrowController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new TippedArrowNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/WitherSkullController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/WitherSkullController.java
index d9b7bbb3b..50943776c 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/WitherSkullController.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/WitherSkullController.java
@@ -52,7 +52,6 @@ public class WitherSkullController extends MobEntityController {
             } else {
                 super.A_();
             }
-
         }
 
         @Override
@@ -63,7 +62,6 @@ public class WitherSkullController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -77,7 +75,6 @@ public class WitherSkullController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -85,7 +82,6 @@ public class WitherSkullController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new WitherSkullNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/CitizensBlockBreaker.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/CitizensBlockBreaker.java
index a8848d027..f62d2ba82 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/CitizensBlockBreaker.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/CitizensBlockBreaker.java
@@ -47,7 +47,6 @@ public class CitizensBlockBreaker extends AbstractBlockBreaker {
             ItemStack current = getCurrentItem();
             return current != null ? current.b(block) : false;
         }
-
     }
 
     @Override
@@ -65,13 +64,10 @@ public class CitizensBlockBreaker extends AbstractBlockBreaker {
                 if (i > 0) {
                     f += i * i + 1;
                 }
-
             }
-
             if (handle.hasEffect(MobEffects.FASTER_DIG)) {
                 f *= 1.0F + (handle.getEffect(MobEffects.FASTER_DIG).getAmplifier() + 1) * 0.2F;
             }
-
             if (handle.hasEffect(MobEffects.SLOWER_DIG)) {
                 float f1 = 1.0F;
                 switch (handle.getEffect(MobEffects.SLOWER_DIG).getAmplifier()) {
@@ -88,20 +84,15 @@ public class CitizensBlockBreaker extends AbstractBlockBreaker {
                     default:
                         f1 = 8.1E-4F;
                 }
-
                 f *= f1;
             }
-
             if (handle.a(Material.WATER) && !EnchantmentManager.i(handle)) {
                 f /= 5.0F;
             }
-
         }
-
         if (!getHandle().onGround) {
             f /= 5.0F;
         }
-
         return f;
     }
 }
\ No newline at end of file
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/NMSImpl.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/NMSImpl.java
index 5d3454f06..3e1c3df8a 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/NMSImpl.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/NMSImpl.java
@@ -295,7 +295,6 @@ public class NMSImpl implements NMSBridge {
         } else if (!handle.world.players.contains(handle)) {
             handle.world.players.add(handle);
         }
-
     }
 
     @Override
@@ -308,7 +307,6 @@ public class NMSImpl implements NMSBridge {
             PlayerAnimation.ARM_SWING.play(humanHandle.getBukkitEntity());
             return;
         }
-
         AttributeInstance attackDamage = handle.getAttributeInstance(GenericAttributes.ATTACK_DAMAGE);
         float f = (float) (attackDamage == null ? 1 : attackDamage.getValue());
         int i = 0;
@@ -316,7 +314,6 @@ public class NMSImpl implements NMSBridge {
             f += EnchantmentManager.a(handle.getItemInMainHand(), target.getMonsterType());
             i += EnchantmentManager.a(Enchantments.KNOCKBACK, handle);
         }
-
         boolean flag = target.damageEntity(DamageSource.mobAttack(handle), f);
         if (!flag)
             return;
@@ -326,12 +323,10 @@ public class NMSImpl implements NMSBridge {
             handle.motX *= 0.6D;
             handle.motZ *= 0.6D;
         }
-
         int fireAspectLevel = EnchantmentManager.getFireAspectEnchantmentLevel(handle);
         if (fireAspectLevel > 0) {
             target.setOnFire(fireAspectLevel * 4);
         }
-
     }
 
     @Override
@@ -343,11 +338,9 @@ public class NMSImpl implements NMSBridge {
             } catch (Throwable t) {
                 t.printStackTrace();
             }
-
         } else if (handle instanceof EntityHumanNPC) {
             ((EntityHumanNPC) handle).getControllerMove().f = false;
         }
-
     }
 
     @Override
@@ -380,19 +373,14 @@ public class NMSImpl implements NMSBridge {
                         if (!changed && !ItemStack.matches(old, curr)) {
                             changed = true;
                         }
-
                         equipment.put(slot, curr);
                     }
-
                     if (changed) {
                         for (EnumItemSlot slot : EnumItemSlot.values()) {
                             agg.send(new PacketPlayOutEntityEquipment(handle.getId(), slot, equipment.get(slot)));
                         }
-
                     }
-
                 }
-
                 tracker.track(Lists.newArrayList(tracker.trackedPlayers));
             }
 
@@ -412,9 +400,7 @@ public class NMSImpl implements NMSBridge {
                     if (callback != null) {
                         callback.accept(entity);
                     }
-
                 }
-
                 tracker.trackedPlayers.clear();
             }
         };
@@ -462,10 +448,8 @@ public class NMSImpl implements NMSBridge {
                 bserver = (BossBattleServer) ENDERDRAGON_BATTLE_BAR_FIELD
                         .get(ENDERDRAGON_BATTLE_FIELD.get(NMSImpl.getHandle(entity)));
             }
-
         } catch (Exception e) {
         }
-
         if (bserver == null)
             return null;
         BossBar ret = Bukkit.createBossBar("", BarColor.BLUE, BarStyle.SEGMENTED_10);
@@ -473,7 +457,6 @@ public class NMSImpl implements NMSBridge {
             CRAFT_BOSSBAR_HANDLE_FIELD.set(ret, bserver);
         } catch (Exception e) {
         }
-
         return ret;
     }
 
@@ -491,7 +474,6 @@ public class NMSImpl implements NMSBridge {
         if (aabb == null) {
             aabb = world.getType(pos).d(world, pos);
         }
-
         return new BoundingBox(aabb.a, aabb.b, aabb.c, aabb.d, aabb.e, aabb.f);
     }
 
@@ -591,15 +573,12 @@ public class NMSImpl implements NMSBridge {
             } catch (Exception e) {
                 return null;
             }
-
         }
-
         try {
             return (GameProfile) SKULL_PROFILE_FIELD.get(meta);
         } catch (Exception e) {
             return null;
         }
-
     }
 
     @Override
@@ -612,7 +591,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Exception e) {
             throw new CommandException(Messages.INVALID_SOUND);
         }
-
     }
 
     @Override
@@ -628,7 +606,6 @@ public class NMSImpl implements NMSBridge {
         EntityLiving handle = NMSImpl.getHandle((LivingEntity) npc.getEntity());
         if (handle == null) {
         }
-
         return DEFAULT_SPEED;
         // return (float)
         // handle.getAttributeInstance(GenericAttributes.d).getValue();
@@ -672,9 +649,7 @@ public class NMSImpl implements NMSBridge {
             } else {
                 ((EntityInsentient) raw).a(PathType.WATER, oldWater + 1F);
             }
-
         }
-
         navigation.q().b(params.hasExaminer(DoorExaminer.class));
         return new MCNavigator() {
             float lastSpeed;
@@ -687,7 +662,6 @@ public class NMSImpl implements NMSBridge {
                     PathPoint pp = navigation.k().a(i);
                     blocks.add(entity.getWorld().getBlockAt(pp.a, pp.b, pp.c));
                 }
-
                 return blocks;
             }
 
@@ -706,16 +680,13 @@ public class NMSImpl implements NMSBridge {
                 if (params.debug() && navigation.k() != null) {
                     Util.sendBlockChanges(getBlocks(entity, navigation), null);
                 }
-
                 if (oldWater >= 0) {
                     if (raw instanceof EntityPlayer) {
                         ((EntityHumanNPC) raw).a(PathType.WATER, oldWater);
                     } else {
                         ((EntityInsentient) raw).a(PathType.WATER, oldWater);
                     }
-
                 }
-
                 stopNavigation(navigation);
             }
 
@@ -727,20 +698,16 @@ public class NMSImpl implements NMSBridge {
                     if (handle instanceof EntityHorse) {
                         handle.width = Math.min(0.99f, oldWidth);
                     }
-
                     if (!function.apply(navigation)) {
                         reason = CancelReason.STUCK;
                     }
-
                     handle.width = oldWidth; // minecraft requires that an entity fit onto both blocks if width >= 1f,
                                              // but we'd prefer to make it just fit on 1 so hack around it a bit.
                     lastSpeed = params.speed();
                 }
-
                 if (params.debug() && !NMSImpl.isNavigationFinished(navigation)) {
                     Util.sendBlockChanges(getBlocks(entity, navigation), Material.YELLOW_FLOWER);
                 }
-
                 navigation.a(params.speed());
                 return NMSImpl.isNavigationFinished(navigation);
             }
@@ -922,37 +889,30 @@ public class NMSImpl implements NMSBridge {
             if (zDiff < 0.0) {
                 yaw += Math.abs(180 - yaw) * 2;
             }
-
             if (handle instanceof EntityEnderDragon) {
                 yaw = Util.getDragonYaw(handle.getBukkitEntity(), xDiff, zDiff);
             } else {
                 yaw = yaw - 90;
             }
-
             if (headOnly) {
                 setHeadYaw(entity, (float) yaw);
             } else {
                 look(entity, (float) yaw, (float) pitch);
             }
-
             return;
         }
-
         if (handle instanceof EntityInsentient) {
             ((EntityInsentient) handle).getControllerLook().a(to.getX(), to.getY(), to.getZ(),
                     ((EntityInsentient) handle).cL(), ((EntityInsentient) handle).N());
             while (((EntityLiving) handle).aP >= 180F) {
                 ((EntityLiving) handle).aP -= 360F;
             }
-
             while (((EntityLiving) handle).aP < -180F) {
                 ((EntityLiving) handle).aP += 360F;
             }
-
         } else if (handle instanceof EntityHumanNPC) {
             ((EntityHumanNPC) handle).getNPC().getOrAddTrait(RotationTrait.class).getPhysicalSession().rotateToFace(to);
         }
-
     }
 
     @Override
@@ -965,22 +925,18 @@ public class NMSImpl implements NMSBridge {
             } else {
                 look(from, to.getLocation(), false, true);
             }
-
         } else if (handle instanceof EntityInsentient) {
             ((EntityInsentient) handle).getControllerLook().a(target, ((EntityInsentient) handle).cL(),
                     ((EntityInsentient) handle).N());
             while (((EntityLiving) handle).aP >= 180F) {
                 ((EntityLiving) handle).aP -= 360F;
             }
-
             while (((EntityLiving) handle).aP < -180F) {
                 ((EntityLiving) handle).aP += 360F;
             }
-
         } else if (handle instanceof EntityHumanNPC) {
             ((EntityHumanNPC) handle).getNPC().getOrAddTrait(RotationTrait.class).getPhysicalSession().rotateToFace(to);
         }
-
     }
 
     @Override
@@ -1020,9 +976,7 @@ public class NMSImpl implements NMSBridge {
                         e.printStackTrace();
                         return super.getBukkitView();
                     }
-
                 }
-
                 return this.bukkitEntity;
             }
         };
@@ -1068,7 +1022,6 @@ public class NMSImpl implements NMSBridge {
                 if (entity1.dead || !entity1.w(entity)) {
                     entity.stopRiding();
                 }
-
             } else {
                 if (!entity.dead) {
                     try {
@@ -1079,22 +1032,17 @@ public class NMSImpl implements NMSBridge {
                         entity.appendEntityCrashDetails(crashreportsystemdetails);
                         throw new ReportedException(crashreport);
                     }
-
                 }
-
                 if (entity.dead) {
                     entity.world.removeEntity(entity);
                 } else if (!removeFromPlayerList) {
                     if (!entity.world.players.contains(entity)) {
                         entity.world.players.add(entity);
                     }
-
                 } else {
                     entity.world.players.remove(entity);
                 }
-
             }
-
         };
     }
 
@@ -1108,12 +1056,10 @@ public class NMSImpl implements NMSBridge {
             if (key == null) {
                 continue;
             }
-
             int code = ENTITY_REGISTRY.a(search);
             ENTITY_REGISTRY.put(code, key, (Class<? extends Entity>) clazz);
             return;
         }
-
         throw new IllegalArgumentException("unable to find valid entity superclass for class " + clazz.toString());
     }
 
@@ -1152,7 +1098,6 @@ public class NMSImpl implements NMSBridge {
             hook.hooked = null;
             hook.getBukkitEntity().remove();
         }
-
     }
 
     @Override
@@ -1174,13 +1119,10 @@ public class NMSImpl implements NMSBridge {
             } catch (IllegalAccessException e) {
                 e.printStackTrace();
             }
-
         }
-
         if (getHandle(entity) instanceof EntityHumanNPC) {
             ((EntityHumanNPC) getHandle(entity)).setTracked();
         }
-
     }
 
     @Override
@@ -1190,11 +1132,9 @@ public class NMSImpl implements NMSBridge {
         if (bodyYaw == null) {
             bodyYaw = handle.yaw;
         }
-
         if (pitch == null) {
             pitch = handle.pitch;
         }
-
         List<Packet<?>> toSend = Lists.newArrayList();
         if (position) {
             EntityTrackerEntry entry = ((WorldServer) handle.world).getTracker().trackedEntities.get(handle.getId());
@@ -1207,18 +1147,15 @@ public class NMSImpl implements NMSBridge {
                 e.printStackTrace();
                 return;
             }
-
             toSend.add(new PacketPlayOutRelEntityMoveLook(handle.getId(), (short) dx, (short) dy, (short) dz,
                     (byte) (bodyYaw * 256.0F / 360.0F), (byte) (pitch * 256.0F / 360.0F), handle.onGround));
         } else {
             toSend.add(new PacketPlayOutEntityLook(handle.getId(), (byte) (bodyYaw * 256.0F / 360.0F),
                     (byte) (pitch * 256.0F / 360.0F), handle.onGround));
         }
-
         if (headYaw != null) {
             toSend.add(new PacketPlayOutEntityHeadRotation(handle, (byte) (headYaw * 256.0F / 360.0F)));
         }
-
         sendPacketsNearby(null, from.getLocation(), toSend, 64);
     }
 
@@ -1242,7 +1179,6 @@ public class NMSImpl implements NMSBridge {
             entities[i] = (EntityPlayer) skinnable;
             i++;
         }
-
         NMSImpl.sendPacket(recipient,
                 new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.REMOVE_PLAYER, entities));
     }
@@ -1263,14 +1199,12 @@ public class NMSImpl implements NMSBridge {
         if (TEAM_FIELD == null) {
             TEAM_FIELD = NMS.getGetter(team.getClass(), "team");
         }
-
         try {
             ScoreboardTeam nmsTeam = (ScoreboardTeam) TEAM_FIELD.invoke(team);
             sendPacket(recipient, new PacketPlayOutScoreboardTeam(nmsTeam, mode));
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     @Override
@@ -1298,7 +1232,6 @@ public class NMSImpl implements NMSBridge {
         } else if (handle instanceof EntityHumanNPC) {
             ((EntityHumanNPC) handle).setMoveDestination(x, y, z, speed);
         }
-
     }
 
     @Override
@@ -1323,7 +1256,6 @@ public class NMSImpl implements NMSBridge {
         if (!(handle instanceof EntityHuman)) {
             handle.aN = yaw;
         }
-
         handle.aP = yaw;
     }
 
@@ -1373,14 +1305,11 @@ public class NMSImpl implements NMSBridge {
             } catch (Exception e) {
                 return;
             }
-
         }
-
         try {
             SKULL_PROFILE_FIELD.set(meta, profile);
         } catch (Exception e) {
         }
-
     }
 
     @Override
@@ -1394,7 +1323,6 @@ public class NMSImpl implements NMSBridge {
         } else if (handle instanceof EntityHumanNPC) {
             ((EntityHumanNPC) handle).setShouldJump();
         }
-
     }
 
     @Override
@@ -1412,7 +1340,6 @@ public class NMSImpl implements NMSBridge {
         if (entity instanceof Player) {
             ((Player) entity).setSneaking(sneaking);
         }
-
     }
 
     @Override
@@ -1445,7 +1372,6 @@ public class NMSImpl implements NMSBridge {
         } catch (IllegalAccessException e) {
             e.printStackTrace();
         }
-
         return false;
     }
 
@@ -1458,7 +1384,6 @@ public class NMSImpl implements NMSBridge {
             setter.invoke(ENTITY_REGISTRY.get());
         } catch (Throwable e) {
         }
-
     }
 
     @Override
@@ -1491,7 +1416,6 @@ public class NMSImpl implements NMSBridge {
                     facingByte = (byte) 3;
                     break;
             }
-
             Location bedLoc = loc.clone().add(0, -loc.getY(), 0);
             PacketPlayOutBed bed = new PacketPlayOutBed(from,
                     new BlockPosition(bedLoc.getBlockX(), bedLoc.getBlockY(), bedLoc.getBlockZ()));
@@ -1510,7 +1434,6 @@ public class NMSImpl implements NMSBridge {
                 list.forEach(packet -> sendPacket(nearby, packet));
                 meta.set(nearby.getUniqueId(), entity.getUniqueId().toString(), System.currentTimeMillis());
             }
-
         } else {
             PacketPlayOutAnimation packet = new PacketPlayOutAnimation(from, 2);
             sendPacketNearby(entity, entity.getLocation(), packet, 64);
@@ -1518,11 +1441,8 @@ public class NMSImpl implements NMSBridge {
                 if (meta.remove(player.getUniqueId(), entity.getUniqueId().toString())) {
                     sendPacket(player, packet);
                 }
-
             }
-
         }
-
     }
 
     @Override
@@ -1538,7 +1458,6 @@ public class NMSImpl implements NMSBridge {
         if (RANDOM.nextFloat() <= 0.85F && (handle.ak() || handle.ao())) {
             handle.motY += power;
         }
-
     }
 
     @Override
@@ -1566,7 +1485,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Exception e) {
             Messaging.logTr(Messages.ERROR_UPDATING_NAVIGATION_WORLD, e.getMessage());
         }
-
     }
 
     @Override
@@ -1578,10 +1496,8 @@ public class NMSImpl implements NMSBridge {
             if (en instanceof EntityHumanNPC) {
                 ((EntityHumanNPC) en).updatePathfindingRange(pathfindingRange);
             }
-
             return;
         }
-
         if (PATHFINDING_RANGE == null)
             return;
         EntityInsentient handle = (EntityInsentient) en;
@@ -1594,7 +1510,6 @@ public class NMSImpl implements NMSBridge {
         } catch (IllegalAccessException e) {
             e.printStackTrace();
         }
-
     }
 
     private static class CitizensInventoryAnvil extends CraftInventoryAnvil implements ForwardingInventory {
@@ -1703,7 +1618,6 @@ public class NMSImpl implements NMSBridge {
             living.setPosition(living.locX - 0.01, living.locY, living.locZ - 0.01);
             living.setPosition(living.locX + 0.01, living.locY, living.locZ + 0.01);
         }
-
     }
 
     public static void clearGoals(PathfinderGoalSelector... goalSelectors) {
@@ -1716,9 +1630,7 @@ public class NMSImpl implements NMSBridge {
             } catch (Exception e) {
                 Messaging.logTr(Messages.ERROR_CLEARING_GOALS, e.getLocalizedMessage());
             }
-
         }
-
     }
 
     private static CompoundTag convertNBT(net.minecraft.server.v1_11_R1.NBTTagCompound tag) {
@@ -1728,7 +1640,6 @@ public class NMSImpl implements NMSBridge {
         for (String key : tag.c()) {
             tags.put(key, convertNBT(key, tag.get(key)));
         }
-
         return new CompoundTag("", tags);
     }
 
@@ -1759,10 +1670,8 @@ public class NMSImpl implements NMSBridge {
                 for (int i = 0; i < list.size(); i++) {
                     converted.add(convertNBT("", list.get(i)));
                 }
-
                 return new ListTag(key, tagType, converted);
             }
-
         } else if (base instanceof net.minecraft.server.v1_11_R1.NBTTagCompound)
             return convertNBT((net.minecraft.server.v1_11_R1.NBTTagCompound) base);
         else if (base instanceof net.minecraft.server.v1_11_R1.NBTTagEnd)
@@ -1780,16 +1689,13 @@ public class NMSImpl implements NMSBridge {
                 if (f2 > 3.0F) {
                     f2 = 3.0F;
                 }
-
                 if (!entity.onGround) {
                     f2 *= 0.5F;
                 }
-
                 if (f2 > 0.0F) {
                     f4 += (0.54600006F - f4) * f2 / 3.0F;
                     f3 += (entity.cq() - f3) * f2 / 3.0F;
                 }
-
                 entity.a(f, f1, f3);
                 entity.move(EnumMoveType.SELF, entity.motX, entity.motY, entity.motZ);
                 entity.motX *= f4;
@@ -1798,12 +1704,10 @@ public class NMSImpl implements NMSBridge {
                 if (!entity.isNoGravity()) {
                     entity.motY -= 0.02D;
                 }
-
                 if (entity.positionChanged
                         && entity.c(entity.motX, entity.motY + 0.6000000238418579D - entity.locY + d1, entity.motZ)) {
                     entity.motY = 0.30000001192092896D;
                 }
-
             } else if (entity.ao()
                     && (!(entity instanceof EntityHuman) || !((EntityHuman) entity).abilities.isFlying)) {
                 double d1 = entity.locY;
@@ -1815,17 +1719,14 @@ public class NMSImpl implements NMSBridge {
                 if (!entity.isNoGravity()) {
                     entity.motY -= 0.02D;
                 }
-
                 if (entity.positionChanged
                         && entity.c(entity.motX, entity.motY + 0.6000000238418579D - entity.locY + d1, entity.motZ)) {
                     entity.motY = 0.30000001192092896D;
                 }
-
             } else if (entity.cH()) {
                 if (entity.motY > -0.5D) {
                     entity.fallDistance = 1.0F;
                 }
-
                 Vec3D vec3d = entity.aB();
                 float f5 = entity.pitch * 0.017453292F;
                 double d0 = Math.sqrt(vec3d.x * vec3d.x + vec3d.z * vec3d.z);
@@ -1840,19 +1741,16 @@ public class NMSImpl implements NMSBridge {
                     entity.motX += vec3d.x * d4 / d0;
                     entity.motZ += vec3d.z * d4 / d0;
                 }
-
                 if (f5 < 0.0F) {
                     double d4 = d2 * -MathHelper.sin(f5) * 0.04D;
                     entity.motY += d4 * 3.2D;
                     entity.motX -= vec3d.x * d4 / d0;
                     entity.motZ -= vec3d.z * d4 / d0;
                 }
-
                 if (d0 > 0.0D) {
                     entity.motX += (vec3d.x / d0 * d2 - entity.motX) * 0.1D;
                     entity.motZ += (vec3d.z / d0 * d2 - entity.motZ) * 0.1D;
                 }
-
                 entity.motX *= 0.9900000095367432D;
                 entity.motY *= 0.9800000190734863D;
                 entity.motZ *= 0.9900000095367432D;
@@ -1865,14 +1763,11 @@ public class NMSImpl implements NMSBridge {
                         entity.a(entity.e((int) f7), 1.0F, 1.0F);
                         entity.damageEntity(DamageSource.FLY_INTO_WALL, f7);
                     }
-
                 }
-
                 if (entity.onGround && !entity.world.isClientSide && entity.getFlag(7)
                         && !CraftEventFactory.callToggleGlideEvent(entity, false).isCancelled()) {
                     entity.setFlag(7, false);
                 }
-
             } else {
                 float f8 = 0.91F;
                 BlockPosition.PooledBlockPosition blockposition_pooledblockposition = BlockPosition.PooledBlockPosition
@@ -1880,7 +1775,6 @@ public class NMSImpl implements NMSBridge {
                 if (entity.onGround) {
                     f8 = entity.world.getType(blockposition_pooledblockposition).getBlock().frictionFactor * 0.91F;
                 }
-
                 float f4 = 0.16277136F / (f8 * f8 * f8);
                 float f3;
                 if (entity.onGround) {
@@ -1888,14 +1782,12 @@ public class NMSImpl implements NMSBridge {
                 } else {
                     f3 = entity.aR;
                 }
-
                 entity.a(f, f1, f3);
                 f8 = 0.91F;
                 if (entity.onGround) {
                     f8 = entity.world.getType(blockposition_pooledblockposition.e(entity.locX,
                             entity.getBoundingBox().b - 1.0D, entity.locZ)).getBlock().frictionFactor * 0.91F;
                 }
-
                 if (entity.m_()) {
                     entity.motX = MathHelper.a(entity.motX, -0.15000000596046448D, 0.15000000596046448D);
                     entity.motZ = MathHelper.a(entity.motZ, -0.15000000596046448D, 0.15000000596046448D);
@@ -1903,19 +1795,15 @@ public class NMSImpl implements NMSBridge {
                     if (entity.motY < -0.15D) {
                         entity.motY = -0.15D;
                     }
-
                     boolean flag = entity.isSneaking() && entity instanceof EntityHuman;
                     if (flag && entity.motY < 0.0D) {
                         entity.motY = 0.0D;
                     }
-
                 }
-
                 entity.move(EnumMoveType.SELF, entity.motX, entity.motY, entity.motZ);
                 if (entity.positionChanged && entity.m_()) {
                     entity.motY = 0.2D;
                 }
-
                 if (entity.hasEffect(MobEffects.LEVITATION)) {
                     entity.motY += (0.05D * (entity.getEffect(MobEffects.LEVITATION).getAmplifier() + 1) - entity.motY)
                             * 0.2D;
@@ -1928,21 +1816,16 @@ public class NMSImpl implements NMSBridge {
                         } else {
                             entity.motY = 0.0D;
                         }
-
                     } else if (!entity.isNoGravity()) {
                         entity.motY -= 0.08D;
                     }
-
                 }
-
                 entity.motY *= 0.9800000190734863D;
                 entity.motX *= f8;
                 entity.motZ *= f8;
                 blockposition_pooledblockposition.t();
             }
-
         }
-
         entity.aF = entity.aG;
         double d1 = entity.locX - entity.lastX;
         double d0 = entity.locZ - entity.lastZ;
@@ -1950,7 +1833,6 @@ public class NMSImpl implements NMSBridge {
         if (f2 > 1.0F) {
             f2 = 1.0F;
         }
-
         entity.aG += (f2 - entity.aG) * 0.4F;
         entity.aH += entity.aG;
     }
@@ -1981,7 +1863,6 @@ public class NMSImpl implements NMSBridge {
         } catch (IllegalAccessException e) {
             e.printStackTrace();
         }
-
         return null;
     }
 
@@ -2003,7 +1884,6 @@ public class NMSImpl implements NMSBridge {
         } catch (IllegalAccessException e) {
             e.printStackTrace();
         }
-
     }
 
     public static boolean isLeashed(NPC npc, Supplier<Boolean> isLeashed, EntityInsentient entity) {
@@ -2026,7 +1906,6 @@ public class NMSImpl implements NMSBridge {
         if (mat != null) {
             minecart.setDisplayBlock(Block.getById(mat.getId()).fromLegacyData(data));
         }
-
         minecart.setDisplayBlockOffset(offset);
     }
 
@@ -2054,13 +1933,10 @@ public class NMSImpl implements NMSBridge {
                     || location.distanceSquared(player.getLocation(PACKET_CACHE_LOCATION)) > radius) {
                 continue;
             }
-
             for (Packet<?> packet : packets) {
                 NMSImpl.sendPacket(player, packet);
             }
-
         }
-
     }
 
     public static void sendPacketsNearby(Player from, Location location, Packet<?>... packets) {
@@ -2073,7 +1949,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     public static void setSize(Entity entity, float f, float f1, boolean justCreated) {
@@ -2087,9 +1962,7 @@ public class NMSImpl implements NMSBridge {
             if (entity.width > f2 && !justCreated && !entity.world.isClientSide) {
                 entity.move(EnumMoveType.SELF, (f2 - entity.width) / 2, 0.0D, (f2 - entity.width) / 2);
             }
-
         }
-
     }
 
     public static void stopNavigation(NavigationAbstract navigation) {
@@ -2107,7 +1980,6 @@ public class NMSImpl implements NMSBridge {
         } else if (entity instanceof EntityHumanNPC) {
             ((EntityHumanNPC) entity).updateAI();
         }
-
     }
 
     public static void updateNavigation(NavigationAbstract navigation) {
@@ -2160,7 +2032,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             Messaging.logTr(Messages.ERROR_GETTING_ID_MAPPING, e.getMessage());
         }
-
         try {
             MAKE_REQUEST = YggdrasilAuthenticationService.class.getDeclaredMethod("makeRequest", URL.class,
                     Object.class, Class.class);
@@ -2168,7 +2039,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Exception ex) {
             ex.printStackTrace();
         }
-
         try {
             ENDERMAN_ANGRY = (DataWatcherObject<Boolean>) NMS.getField(EntityEnderman.class, "bx").get(null);
         } catch (IllegalArgumentException e) {
@@ -2176,6 +2046,5 @@ public class NMSImpl implements NMSBridge {
         } catch (IllegalAccessException e) {
             e.printStackTrace();
         }
-
     }
 }
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/PlayerAnimationImpl.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/PlayerAnimationImpl.java
index c8f6e83f4..5757808ae 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/PlayerAnimationImpl.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/PlayerAnimationImpl.java
@@ -21,7 +21,6 @@ public class PlayerAnimationImpl {
             playDefaultAnimation(player, to, DEFAULTS.get(animation));
             return;
         }
-
         switch (animation) {
             case START_ELYTRA:
                 player.M();
@@ -52,7 +51,6 @@ public class PlayerAnimationImpl {
             default:
                 throw new UnsupportedOperationException();
         }
-
     }
 
     protected static void playDefaultAnimation(EntityPlayer player, Iterable<Player> to, int code) {
@@ -64,7 +62,6 @@ public class PlayerAnimationImpl {
         for (Player player : to) {
             NMSImpl.sendPacket(player, packet);
         }
-
     }
 
     private static EnumMap<PlayerAnimation, Integer> DEFAULTS = Maps.newEnumMap(PlayerAnimation.class);
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/PlayerControllerMove.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/PlayerControllerMove.java
index 37d9cdf21..e35321fcd 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/PlayerControllerMove.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/PlayerControllerMove.java
@@ -50,18 +50,15 @@ public class PlayerControllerMove extends ControllerMove {
         if (f3 > f2) {
             f3 = f2;
         }
-
         if (f3 < -f2) {
             f3 = -f2;
         }
-
         float f4 = f + f3;
         if (f4 < 0.0F) {
             f4 += 360.0F;
         } else if (f4 > 360.0F) {
             f4 -= 360.0F;
         }
-
         return f4;
     }
 
@@ -84,7 +81,6 @@ public class PlayerControllerMove extends ControllerMove {
                 this.a.bf = 0.0F;
                 return;
             }
-
             float f = (float) Math.toDegrees(Math.atan2(d1, d0)) - 90.0F;
             this.a.yaw = a(this.a.yaw, f, 90.0F);
             NMS.setHeadYaw(a.getBukkitEntity(), this.a.yaw);
@@ -102,11 +98,8 @@ public class PlayerControllerMove extends ControllerMove {
                 } else {
                     ((EntityInsentient) this.a).getControllerJump().a();
                 }
-
             }
-
         }
-
     }
 
     protected int cg() {
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/PlayerNavigation.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/PlayerNavigation.java
index b09d4b14d..05639e43b 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/PlayerNavigation.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/PlayerNavigation.java
@@ -68,27 +68,22 @@ public class PlayerNavigation extends NavigationAbstract {
             while (localBlockPosition.getY() > 0 && this.b.getType(localBlockPosition).getMaterial() == Material.AIR) {
                 localBlockPosition = localBlockPosition.down();
             }
-
             if (localBlockPosition.getY() > 0)
                 return a2(localBlockPosition.up());
             while (localBlockPosition.getY() < this.b.getHeight()
                     && this.b.getType(localBlockPosition).getMaterial() == Material.AIR) {
                 localBlockPosition = localBlockPosition.up();
             }
-
             paramBlockPosition = localBlockPosition;
         }
-
         if (this.b.getType(paramBlockPosition).getMaterial().isBuildable()) {
             localBlockPosition = paramBlockPosition.up();
             while (localBlockPosition.getY() < this.b.getHeight()
                     && this.b.getType(localBlockPosition).getMaterial().isBuildable()) {
                 localBlockPosition = localBlockPosition.up();
             }
-
             return a2(localBlockPosition);
         }
-
         return a2(paramBlockPosition);
     }
 
@@ -142,11 +137,8 @@ public class PlayerNavigation extends NavigationAbstract {
                             || localPathType == PathType.DAMAGE_OTHER)
                         return false;
                 }
-
             }
-
         }
-
         return true;
     }
 
@@ -156,11 +148,9 @@ public class PlayerNavigation extends NavigationAbstract {
             this.c = null;
             return false;
         }
-
         if (!paramPathEntity.a(this.c)) {
             this.c = paramPathEntity;
         }
-
         d();
         if (this.c.d() == 0)
             return false;
@@ -177,11 +167,9 @@ public class PlayerNavigation extends NavigationAbstract {
             if (paramVec3D.distanceSquared(this.i) < 2.25D) {
                 o();
             }
-
             this.h = this.g;
             this.i = paramVec3D;
         }
-
         if (this.c != null && !this.c.b()) {
             Vec3D localVec3D = this.c.f();
             if (localVec3D.equals(this.j)) {
@@ -191,17 +179,14 @@ public class PlayerNavigation extends NavigationAbstract {
                 double d1 = paramVec3D.f(this.j);
                 this.m = this.a.cq() > 0.0F ? d1 / this.a.cq() * 1000.0D : 0.0D;
             }
-
             if (this.m > 0.0D && this.k > this.m * 3.0D) {
                 this.j = Vec3D.a;
                 this.k = 0L;
                 this.m = 0.0D;
                 o();
             }
-
             this.l = System.currentTimeMillis();
         }
-
     }
 
     @Override
@@ -229,11 +214,9 @@ public class PlayerNavigation extends NavigationAbstract {
         if (d1 >= 0.0D) {
             d7 += 1.0D;
         }
-
         if (d2 >= 0.0D) {
             d8 += 1.0D;
         }
-
         d7 /= d1;
         d8 /= d2;
         int k = d1 < 0.0D ? -1 : 1;
@@ -252,11 +235,9 @@ public class PlayerNavigation extends NavigationAbstract {
                 j += m;
                 i3 = i1 - j;
             }
-
             if (!a(i, (int) paramVec3D1.y, j, paramInt1, paramInt2, paramInt3, paramVec3D1, d1, d2))
                 return false;
         }
-
         return true;
     }
 
@@ -320,9 +301,7 @@ public class PlayerNavigation extends NavigationAbstract {
                 if (!localBlock.b(this.b, localBlockPosition))
                     return false;
             }
-
         }
-
         return true;
     }
 
@@ -350,11 +329,8 @@ public class PlayerNavigation extends NavigationAbstract {
                     this.c.a(i + 1, ((PathPoint) localObject).a(((PathPoint) localObject).a, localPathPoint.b + 1,
                             ((PathPoint) localObject).c));
                 }
-
             }
-
         }
-
         if (this.f2) {
             if (this.b.h(new BlockPosition(MathHelper.floor(this.a.locX), (int) (this.a.getBoundingBox().b + 0.5D),
                     MathHelper.floor(this.a.locZ))))
@@ -365,11 +341,8 @@ public class PlayerNavigation extends NavigationAbstract {
                     this.c.b(i - 1);
                     return;
                 }
-
             }
-
         }
-
     }
 
     public void d(boolean paramBoolean) {
@@ -403,11 +376,9 @@ public class PlayerNavigation extends NavigationAbstract {
                 this.p = this.b.getTime();
                 this.o = false;
             }
-
         } else {
             this.o = true;
         }
-
     }
 
     @Override
@@ -421,7 +392,6 @@ public class PlayerNavigation extends NavigationAbstract {
         if (this.o) {
             j();
         }
-
         if (n())
             return;
         if (b()) {
@@ -434,9 +404,7 @@ public class PlayerNavigation extends NavigationAbstract {
                     && MathHelper.floor(localVec3D.z) == MathHelper.floor(localObject.z)) {
                 this.c.c(this.c.e() + 1);
             }
-
         }
-
         if (n())
             return;
         Vec3D localVec3D = this.c.a(this.a);
@@ -458,9 +426,7 @@ public class PlayerNavigation extends NavigationAbstract {
                 i1 = i2;
                 break;
             }
-
         }
-
         this.n = this.a.width > 0.75F ? this.a.width / 2.0F : 0.75F - this.a.width / 2.0F;
         Vec3D localVec3D2 = this.c.f();
         if (MathHelper.e((float) (this.a.locX - (localVec3D2.x + 0.5D))) < this.n
@@ -468,7 +434,6 @@ public class PlayerNavigation extends NavigationAbstract {
                 && Math.abs(this.a.locY - localVec3D2.y) < 1.0D) {
             this.c.c(this.c.e() + 1);
         }
-
         int i3 = MathHelper.f(this.a.width);
         int i4 = MathHelper.f(this.a.length);
         int i5 = i3;
@@ -477,9 +442,7 @@ public class PlayerNavigation extends NavigationAbstract {
                 this.c.c(i6);
                 break;
             }
-
         }
-
         a(localVec3D1);
     }
 
@@ -519,7 +482,6 @@ public class PlayerNavigation extends NavigationAbstract {
             if (j > 16)
                 return (int) this.a.getBoundingBox().b;
         }
-
         return i;
     }
 
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/PlayerPathfinder.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/PlayerPathfinder.java
index 03775cb25..b2bee4023 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/PlayerPathfinder.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/PlayerPathfinder.java
@@ -51,7 +51,6 @@ public class PlayerPathfinder {
             i++;
             localPathPoint = localPathPoint.h;
         }
-
         PathPoint[] arrayOfPathPoint = new PathPoint[i];
         localPathPoint = paramPathPoint2;
         arrayOfPathPoint[--i] = localPathPoint;
@@ -59,7 +58,6 @@ public class PlayerPathfinder {
             localPathPoint = localPathPoint.h;
             arrayOfPathPoint[--i] = localPathPoint;
         }
-
         return new PathEntity(arrayOfPathPoint);
     }
 
@@ -77,17 +75,14 @@ public class PlayerPathfinder {
             if (i >= 2000) {
                 break;
             }
-
             PathPoint localObject2 = this.a.c();
             if (localObject2.equals(paramPathPoint2)) {
                 localObject1 = paramPathPoint2;
                 break;
             }
-
             if (localObject2.c(paramPathPoint2) < ((PathPoint) localObject1).c(paramPathPoint2)) {
                 localObject1 = localObject2;
             }
-
             localObject2.i = true;
             int j = this.d.a(this.c, localObject2, paramPathPoint2, paramFloat);
             for (int k = 0; k < j; k++) {
@@ -106,13 +101,9 @@ public class PlayerPathfinder {
                         localPathPoint.g = localPathPoint.e + localPathPoint.f;
                         this.a.a(localPathPoint);
                     }
-
                 }
-
             }
-
         }
-
         if (localObject1 == paramPathPoint1)
             return null;
         Object localObject2 = a(paramPathPoint1, (PathPoint) localObject1);
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/PlayerPathfinderAbstract.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/PlayerPathfinderAbstract.java
index b0660f242..148c38ec2 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/PlayerPathfinderAbstract.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/PlayerPathfinderAbstract.java
@@ -56,7 +56,6 @@ public abstract class PlayerPathfinderAbstract extends PathfinderAbstract {
             localPathPoint = new PathPoint(paramInt1, paramInt2, paramInt3);
             this.c.a(j, localPathPoint);
         }
-
         return localPathPoint;
     }
 
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/PlayerPathfinderNormal.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/PlayerPathfinderNormal.java
index be4276a46..613c87709 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/PlayerPathfinderNormal.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/PlayerPathfinderNormal.java
@@ -61,13 +61,10 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
             if (localPathType2 == PathType.DAMAGE_FIRE || localObject == Blocks.df) {
                 localPathType1 = PathType.DAMAGE_FIRE;
             }
-
             if (localPathType2 == PathType.DAMAGE_CACTUS) {
                 localPathType1 = PathType.DAMAGE_CACTUS;
             }
-
         }
-
         Object localObject = BlockPosition.PooledBlockPosition.s();
         if (localPathType1 == PathType.WALKABLE) {
             for (int i = -1; i <= 1; i++) {
@@ -80,15 +77,10 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                         } else if (localBlock == Blocks.FIRE) {
                             localPathType1 = PathType.DANGER_FIRE;
                         }
-
                     }
-
                 }
-
             }
-
         }
-
         ((BlockPosition.PooledBlockPosition) localObject).t();
         return localPathType1;
     }
@@ -110,11 +102,9 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                     if (localPathType2 == PathType.DOOR_WOOD_CLOSED && paramBoolean1 && paramBoolean2) {
                         localPathType2 = PathType.WALKABLE;
                     }
-
                     if (localPathType2 == PathType.DOOR_OPEN && !paramBoolean2) {
                         localPathType2 = PathType.BLOCKED;
                     }
-
                     if (localPathType2 == PathType.RAIL
                             && !(paramIBlockAccess.getType(localBlockPosition)
                                     .getBlock() instanceof BlockMinecartTrackAbstract)
@@ -122,18 +112,13 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                                     .getBlock() instanceof BlockMinecartTrackAbstract)) {
                         localPathType2 = PathType.FENCE;
                     }
-
                     if (i == 0 && k == 0 && m == 0) {
                         localObject1 = localPathType2;
                     }
-
                     localEnumSet.add(localPathType2);
                 }
-
             }
-
         }
-
         if (localEnumSet.contains(PathType.FENCE))
             return PathType.FENCE;
         PathType localObject2 = PathType.BLOCKED;
@@ -143,9 +128,7 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
             if (paramEntityInsentient.a(localPathType1) >= paramEntityInsentient.a(localObject2)) {
                 localObject2 = localPathType1;
             }
-
         }
-
         if (localObject1 == PathType.OPEN && paramEntityInsentient.a(localObject2) == 0.0F)
             return PathType.OPEN;
         return localObject2;
@@ -168,11 +151,9 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                     if (localPathType2 == PathType.DOOR_WOOD_CLOSED && paramBoolean1 && paramBoolean2) {
                         localPathType2 = PathType.WALKABLE;
                     }
-
                     if (localPathType2 == PathType.DOOR_OPEN && !paramBoolean2) {
                         localPathType2 = PathType.BLOCKED;
                     }
-
                     if (localPathType2 == PathType.RAIL
                             && !(paramIBlockAccess.getType(localBlockPosition)
                                     .getBlock() instanceof BlockMinecartTrackAbstract)
@@ -180,18 +161,13 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                                     .getBlock() instanceof BlockMinecartTrackAbstract)) {
                         localPathType2 = PathType.FENCE;
                     }
-
                     if (i == 0 && k == 0 && m == 0) {
                         localObject1 = localPathType2;
                     }
-
                     localEnumSet.add(localPathType2);
                 }
-
             }
-
         }
-
         if (localEnumSet.contains(PathType.FENCE))
             return PathType.FENCE;
         PathType localObject2 = PathType.BLOCKED;
@@ -201,9 +177,7 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
             if (paramEntityInsentient.a(localPathType1) >= paramEntityInsentient.a(localObject2)) {
                 localObject2 = localPathType1;
             }
-
         }
-
         if (localObject1 == PathType.OPEN && paramEntityInsentient.a(localObject2) == 0.0F)
             return PathType.OPEN;
         return localObject2;
@@ -225,7 +199,6 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
             localPathPoint.m = localPathType1;
             localPathPoint.l = Math.max(localPathPoint.l, f);
         }
-
         if (localPathType1 == PathType.WALKABLE)
             return localPathPoint;
         if (localPathPoint == null && paramInt4 > 0 && localPathType1 != PathType.FENCE
@@ -242,11 +215,8 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                 if (this.b.world.b(localAxisAlignedBB3)) {
                     localPathPoint = null;
                 }
-
             }
-
         }
-
         if (localPathType1 == PathType.OPEN) {
             AxisAlignedBB localAxisAlignedBB4 = new AxisAlignedBB(paramInt1 - d2 + 0.5D, paramInt2 + 0.001D,
                     paramInt3 - d2 + 0.5D, paramInt1 + d2 + 0.5D, paramInt2 + this.b.length, paramInt3 + d2 + 0.5D);
@@ -260,9 +230,7 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                     localPathPoint.l = Math.max(localPathPoint.l, f);
                     return localPathPoint;
                 }
-
             }
-
             int i = 0;
             while (paramInt2 > 0 && localPathType1 == PathType.OPEN) {
                 paramInt2--;
@@ -276,11 +244,8 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                     localPathPoint.l = Math.max(localPathPoint.l, f);
                 } else if (f < 0.0F)
                     return null;
-
             }
-
         }
-
         return localPathPoint;
     }
 
@@ -293,7 +258,6 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
         if (this.b.a(localPathType) >= 0.0F) {
             k = MathHelper.d(Math.max(1.0F, this.b.P));
         }
-
         BlockPosition localBlockPosition = new BlockPosition(paramPathPoint1.a, paramPathPoint1.b, paramPathPoint1.c)
                 .down();
         double d = paramPathPoint1.b - (1.0D - this.a.getType(localBlockPosition).d(this.a, localBlockPosition).e);
@@ -308,19 +272,15 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
         if (localPathPoint1 != null && !localPathPoint1.i && localPathPoint1.a(paramPathPoint2) < paramFloat) {
             paramArrayOfPathPoint[i++] = localPathPoint1;
         }
-
         if (localPathPoint2 != null && !localPathPoint2.i && localPathPoint2.a(paramPathPoint2) < paramFloat) {
             paramArrayOfPathPoint[i++] = localPathPoint2;
         }
-
         if (localPathPoint3 != null && !localPathPoint3.i && localPathPoint3.a(paramPathPoint2) < paramFloat) {
             paramArrayOfPathPoint[i++] = localPathPoint3;
         }
-
         if (localPathPoint4 != null && !localPathPoint4.i && localPathPoint4.a(paramPathPoint2) < paramFloat) {
             paramArrayOfPathPoint[i++] = localPathPoint4;
         }
-
         int m = localPathPoint4 == null || localPathPoint4.m == PathType.OPEN || localPathPoint4.l != 0.0F ? 1 : 0;
         int n = localPathPoint1 == null || localPathPoint1.m == PathType.OPEN || localPathPoint1.l != 0.0F ? 1 : 0;
         int i1 = localPathPoint3 == null || localPathPoint3.m == PathType.OPEN || localPathPoint3.l != 0.0F ? 1 : 0;
@@ -332,36 +292,28 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
             if (localPathPoint5 != null && !localPathPoint5.i && localPathPoint5.a(paramPathPoint2) < paramFloat) {
                 paramArrayOfPathPoint[i++] = localPathPoint5;
             }
-
         }
-
         if (m != 0 && i1 != 0) {
             localPathPoint5 = a(paramPathPoint1.a + 1, paramPathPoint1.b, paramPathPoint1.c - 1, k, d,
                     EnumDirection.NORTH);
             if (localPathPoint5 != null && !localPathPoint5.i && localPathPoint5.a(paramPathPoint2) < paramFloat) {
                 paramArrayOfPathPoint[i++] = localPathPoint5;
             }
-
         }
-
         if (n != 0 && i2 != 0) {
             localPathPoint5 = a(paramPathPoint1.a - 1, paramPathPoint1.b, paramPathPoint1.c + 1, k, d,
                     EnumDirection.SOUTH);
             if (localPathPoint5 != null && !localPathPoint5.i && localPathPoint5.a(paramPathPoint2) < paramFloat) {
                 paramArrayOfPathPoint[i++] = localPathPoint5;
             }
-
         }
-
         if (n != 0 && i1 != 0) {
             localPathPoint5 = a(paramPathPoint1.a + 1, paramPathPoint1.b, paramPathPoint1.c + 1, k, d,
                     EnumDirection.SOUTH);
             if (localPathPoint5 != null && !localPathPoint5.i && localPathPoint5.a(paramPathPoint2) < paramFloat) {
                 paramArrayOfPathPoint[i++] = localPathPoint5;
             }
-
         }
-
         return i;
     }
 
@@ -380,7 +332,6 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                         MathHelper.floor(this.b.locZ));
                 localObject2 = this.a.getType(localObject1).getBlock();
             }
-
         } else if (this.b.onGround) {
             i = MathHelper.floor(this.b.getBoundingBox().b + 0.5D);
         } else {
@@ -389,10 +340,8 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                     || this.a.getType(localObject1).getBlock().b(this.a, localObject1)) && localObject1.getY() > 0) {
                 localObject1 = localObject1.down();
             }
-
             i = localObject1.up().getY();
         }
-
         localObject1 = new BlockPosition(this.b);
         Object localObject2 = a(this.b, localObject1.getX(), i, localObject1.getZ());
         if (this.b.a((PathType) localObject2) < 0.0F) {
@@ -406,9 +355,7 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                 if (this.b.a(localPathType) >= 0.0F)
                     return a(localBlockPosition.getX(), localBlockPosition.getY(), localBlockPosition.getZ());
             }
-
         }
-
         return a(localObject1.getX(), i, localObject1.getZ());
     }
 
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/PlayerlistTrackerEntry.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/PlayerlistTrackerEntry.java
index 04f48b90f..ff6aca35b 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/PlayerlistTrackerEntry.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/PlayerlistTrackerEntry.java
@@ -42,14 +42,12 @@ public class PlayerlistTrackerEntry extends EntityTrackerEntry {
                         if (res == null) {
                             updateLastPlayer(player);
                         }
-
                         return res;
                     }
                 });
             } catch (Throwable e) {
                 e.printStackTrace();
             }
-
         } else {
             try {
                 Set<EntityPlayer> delegate = super.trackedPlayers;
@@ -60,7 +58,6 @@ public class PlayerlistTrackerEntry extends EntityTrackerEntry {
                         if (res) {
                             updateLastPlayer(player);
                         }
-
                         return res;
                     }
 
@@ -72,9 +69,7 @@ public class PlayerlistTrackerEntry extends EntityTrackerEntry {
             } catch (Throwable e) {
                 e.printStackTrace();
             }
-
         }
-
     }
 
     public PlayerlistTrackerEntry(EntityTrackerEntry entry) {
@@ -90,7 +85,6 @@ public class PlayerlistTrackerEntry extends EntityTrackerEntry {
             Bukkit.getPluginManager().callEvent(
                     new NPCLinkToPlayerEvent(((NPCHolder) tracker).getNPC(), lastUpdatedPlayer.getBukkitEntity()));
         }
-
     }
 
     @Override
@@ -105,7 +99,6 @@ public class PlayerlistTrackerEntry extends EntityTrackerEntry {
             if (event.isCancelled())
                 return;
         }
-
         super.updatePlayer(entityplayer);
     }
 
@@ -120,7 +113,6 @@ public class PlayerlistTrackerEntry extends EntityTrackerEntry {
         } catch (IllegalAccessException e) {
             e.printStackTrace();
         }
-
         return 0;
     }
 
@@ -132,7 +124,6 @@ public class PlayerlistTrackerEntry extends EntityTrackerEntry {
         } catch (IllegalAccessException e) {
             e.printStackTrace();
         }
-
         return 0;
     }
 
@@ -144,7 +135,6 @@ public class PlayerlistTrackerEntry extends EntityTrackerEntry {
         } catch (IllegalAccessException e) {
             e.printStackTrace();
         }
-
         return 0;
     }
 
@@ -156,7 +146,6 @@ public class PlayerlistTrackerEntry extends EntityTrackerEntry {
         } catch (IllegalAccessException e) {
             e.printStackTrace();
         }
-
         return null;
     }
 
@@ -168,7 +157,6 @@ public class PlayerlistTrackerEntry extends EntityTrackerEntry {
         } catch (IllegalAccessException e) {
             e.printStackTrace();
         }
-
         return false;
     }
 
@@ -191,9 +179,7 @@ public class PlayerlistTrackerEntry extends EntityTrackerEntry {
                 TRACKING_MAP_SETTER = NMS.getFirstSetter(EntityTrackerEntry.class, Map.class);
                 TRACKING_MAP_GETTER = NMS.getFirstGetter(EntityTrackerEntry.class, Map.class);
             }
-
         } catch (Exception e) {
         }
-
     }
 }
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ArmorStandController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ArmorStandController.java
index 9101904bb..24ad3426e 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ArmorStandController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ArmorStandController.java
@@ -81,7 +81,6 @@ public class ArmorStandController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -92,7 +91,6 @@ public class ArmorStandController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -106,7 +104,6 @@ public class ArmorStandController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -114,7 +111,6 @@ public class ArmorStandController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new ArmorStandNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/BatController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/BatController.java
index 93470e58d..9d1d02f51 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/BatController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/BatController.java
@@ -60,7 +60,6 @@ public class BatController extends MobEntityController {
             if (npc != null) {
                 setAsleep(false);
             }
-
         }
 
         @Override
@@ -92,7 +91,6 @@ public class BatController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -116,7 +114,6 @@ public class BatController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -129,7 +126,6 @@ public class BatController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new BatNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -153,7 +149,6 @@ public class BatController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -164,7 +159,6 @@ public class BatController extends MobEntityController {
                 NMSImpl.updateAI(this);
                 npc.update();
             }
-
         }
     }
 }
\ No newline at end of file
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/BlazeController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/BlazeController.java
index d5d3ac50c..d867af809 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/BlazeController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/BlazeController.java
@@ -88,7 +88,6 @@ public class BlazeController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -112,7 +111,6 @@ public class BlazeController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -125,7 +123,6 @@ public class BlazeController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new BlazeNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -149,7 +146,6 @@ public class BlazeController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -157,7 +153,6 @@ public class BlazeController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
     }
 }
\ No newline at end of file
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CaveSpiderController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CaveSpiderController.java
index 6c6ab7983..5ca534cd9 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CaveSpiderController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CaveSpiderController.java
@@ -71,7 +71,6 @@ public class CaveSpiderController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -87,7 +86,6 @@ public class CaveSpiderController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -108,7 +106,6 @@ public class CaveSpiderController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -131,7 +128,6 @@ public class CaveSpiderController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -140,7 +136,6 @@ public class CaveSpiderController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -153,7 +148,6 @@ public class CaveSpiderController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new CaveSpiderNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -177,7 +171,6 @@ public class CaveSpiderController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -186,7 +179,6 @@ public class CaveSpiderController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -204,7 +196,6 @@ public class CaveSpiderController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
     }
 }
\ No newline at end of file
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ChickenController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ChickenController.java
index 06562f8ed..418a694e0 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ChickenController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ChickenController.java
@@ -72,7 +72,6 @@ public class ChickenController extends MobEntityController {
                 super.a(flag);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, flag, super::a);
         }
 
@@ -81,7 +80,6 @@ public class ChickenController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -97,7 +95,6 @@ public class ChickenController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -118,7 +115,6 @@ public class ChickenController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -141,7 +137,6 @@ public class ChickenController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -150,7 +145,6 @@ public class ChickenController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -163,7 +157,6 @@ public class ChickenController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new ChickenNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -187,7 +180,6 @@ public class ChickenController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -196,7 +188,6 @@ public class ChickenController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -212,7 +203,6 @@ public class ChickenController extends MobEntityController {
             if (npc != null) {
                 this.bC = 100; // egg timer
             }
-
             super.n();
         }
     }
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CowController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CowController.java
index 49438aef8..b77b1645a 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CowController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CowController.java
@@ -76,7 +76,6 @@ public class CowController extends MobEntityController {
                 super.a(flag);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, flag, super::a);
         }
 
@@ -85,7 +84,6 @@ public class CowController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -111,7 +109,6 @@ public class CowController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -132,7 +129,6 @@ public class CowController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -155,7 +151,6 @@ public class CowController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -164,7 +159,6 @@ public class CowController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -177,7 +171,6 @@ public class CowController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new CowNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -201,7 +194,6 @@ public class CowController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -210,7 +202,6 @@ public class CowController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CreeperController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CreeperController.java
index 1355b72c9..2d54b0737 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CreeperController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CreeperController.java
@@ -74,7 +74,6 @@ public class CreeperController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -90,7 +89,6 @@ public class CreeperController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -111,7 +109,6 @@ public class CreeperController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -134,7 +131,6 @@ public class CreeperController extends MobEntityController {
             if (npc == null || !npc.isProtected()) {
                 super.do_();
             }
-
         }
 
         @Override
@@ -142,7 +138,6 @@ public class CreeperController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -151,7 +146,6 @@ public class CreeperController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -164,7 +158,6 @@ public class CreeperController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new CreeperNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -188,7 +181,6 @@ public class CreeperController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -197,7 +189,6 @@ public class CreeperController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -213,7 +204,6 @@ public class CreeperController extends MobEntityController {
             if (npc == null || allowPowered) {
                 super.onLightningStrike(entitylightning);
             }
-
         }
 
         public void setAllowPowered(boolean allowPowered) {
@@ -227,7 +217,6 @@ public class CreeperController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
     }
 }
\ No newline at end of file
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EnderDragonController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EnderDragonController.java
index e20dc31f4..2452dd837 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EnderDragonController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EnderDragonController.java
@@ -94,7 +94,6 @@ public class EnderDragonController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -124,7 +123,6 @@ public class EnderDragonController extends MobEntityController {
                 motY = old.y;
                 motZ = old.z;
             }
-
             return res;
         }
 
@@ -134,7 +132,6 @@ public class EnderDragonController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -147,7 +144,6 @@ public class EnderDragonController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new EnderDragonNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -171,7 +167,6 @@ public class EnderDragonController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -179,25 +174,20 @@ public class EnderDragonController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
             if (npc != null) {
                 if (getDragonControllerManager().a().getControllerPhase() == DragonControllerPhase.j) {
                     setHealth(0F);
                     return;
                 }
-
                 if (this.c < 0) {
                     for (int i = 0; i < this.b.length; ++i) {
                         this.b[i][0] = this.yaw;
                         this.b[i][1] = this.locY;
                     }
-
                 }
-
                 if (++this.c == this.b.length) {
                     this.c = 0;
                 }
-
                 this.b[this.c][0] = this.yaw;
                 this.b[this.c][1] = this.locY;
 
@@ -210,11 +200,9 @@ public class EnderDragonController extends MobEntityController {
                     children[j].lastY = vec3.y;
                     children[j].lastZ = vec3.z;
                 }
-
                 if (getBukkitEntity().getPassenger() != null) {
                     yaw = getBukkitEntity().getPassenger().getLocation().getYaw() - 180;
                 }
-
                 if (motX != 0 || motY != 0 || motZ != 0) {
                     motX *= 0.98;
                     motY *= 0.98;
@@ -222,10 +210,8 @@ public class EnderDragonController extends MobEntityController {
                     if (getBukkitEntity().getPassenger() == null) {
                         yaw = Util.getDragonYaw(getBukkitEntity(), motX, motZ);
                     }
-
                     setPosition(locX + motX, locY + motY, locZ + motZ);
                 }
-
                 if (npc.hasTrait(EnderDragonTrait.class) && npc.getOrAddTrait(EnderDragonTrait.class).isDestroyWalls()
                         && NMSImpl.ENDERDRAGON_CHECK_WALLS != null) {
                     for (int i = 0; i < 3; i++) {
@@ -235,11 +221,8 @@ public class EnderDragonController extends MobEntityController {
                         } catch (Throwable e) {
                             e.printStackTrace();
                         }
-
                     }
-
                 }
-
                 if (npc.data().get(NPC.Metadata.COLLIDABLE, false)) {
                     try {
                         KNOCKBACK.invoke(this, this.world.getEntities(this,
@@ -253,13 +236,10 @@ public class EnderDragonController extends MobEntityController {
                     } catch (Throwable t) {
                         t.printStackTrace();
                     }
-
                 }
-
             } else {
                 super.n();
             }
-
         }
 
         private static final MethodHandle HURT = NMS.getMethodHandle(EntityEnderDragon.class, "b", true,
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EndermanController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EndermanController.java
index 27f7f01cc..61437135f 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EndermanController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EndermanController.java
@@ -71,7 +71,6 @@ public class EndermanController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -87,7 +86,6 @@ public class EndermanController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -108,7 +106,6 @@ public class EndermanController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -131,7 +128,6 @@ public class EndermanController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -140,7 +136,6 @@ public class EndermanController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -153,7 +148,6 @@ public class EndermanController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new EndermanNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -184,7 +178,6 @@ public class EndermanController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -193,7 +186,6 @@ public class EndermanController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -211,7 +203,6 @@ public class EndermanController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
     }
 }
\ No newline at end of file
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EndermiteController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EndermiteController.java
index 815f8c4b9..4b7a44eb9 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EndermiteController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EndermiteController.java
@@ -71,7 +71,6 @@ public class EndermiteController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -87,7 +86,6 @@ public class EndermiteController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -108,7 +106,6 @@ public class EndermiteController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -131,7 +128,6 @@ public class EndermiteController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -140,7 +136,6 @@ public class EndermiteController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -153,7 +148,6 @@ public class EndermiteController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new EndermiteNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -177,7 +171,6 @@ public class EndermiteController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -186,7 +179,6 @@ public class EndermiteController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -204,7 +196,6 @@ public class EndermiteController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
     }
 }
\ No newline at end of file
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EntityHumanNPC.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EntityHumanNPC.java
index 1bbc3602e..a040a0960 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EntityHumanNPC.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EntityHumanNPC.java
@@ -89,7 +89,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         } else {
             skinTracker = null;
         }
-
     }
 
     @Override
@@ -97,7 +96,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         if (npc == null || !npc.isFlyable()) {
             super.a(d0, flag, block, blockposition);
         }
-
     }
 
     @Override
@@ -114,7 +112,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         } else {
             NMSImpl.flyingMoveLogic(this, f, f1, f2);
         }
-
     }
 
     public float a(PathType pathtype) {
@@ -150,7 +147,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         if (npc != null) {
             Util.callCollisionEvent(npc, entity.getBukkitEntity());
         }
-
     }
 
     @Override
@@ -168,7 +164,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
             velocityChanged = false;
             Bukkit.getScheduler().runTask(CitizensAPI.getPlugin(), () -> EntityHumanNPC.this.velocityChanged = true);
         }
-
         return damaged;
     }
 
@@ -200,7 +195,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         if (npc == null || !npc.isFlyable()) {
             super.e(f, f1);
         }
-
     }
 
     @Override
@@ -209,7 +203,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         if (vector != null) {
             super.f(vector.getX(), vector.getY(), vector.getZ());
         }
-
     }
 
     @Override
@@ -217,7 +210,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
             bukkitEntity = new PlayerNPC(this);
         }
-
         return super.getBukkitEntity();
     }
 
@@ -251,7 +243,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         if (skinName == null) {
             skinName = npc.getName();
         }
-
         return skinName.toLowerCase();
     }
 
@@ -275,12 +266,10 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         } catch (IOException e) {
             // swallow
         }
-
         AttributeInstance range = getAttributeInstance(GenericAttributes.FOLLOW_RANGE);
         if (range == null) {
             range = getAttributeMap().b(GenericAttributes.FOLLOW_RANGE);
         }
-
         range.setValue(Setting.DEFAULT_PATHFINDING_RANGE.asDouble());
         controllerJump = new PlayerControllerJump(this);
         controllerMove = new PlayerControllerMove(this);
@@ -295,7 +284,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     @Override
@@ -323,11 +311,9 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
                 cu();
                 jumpTicks = 10;
             }
-
         } else {
             jumpTicks = 0;
         }
-
         be *= 0.98F;
         bg *= 0.98F;
         bh *= 0.9F;
@@ -336,7 +322,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         if (jumpTicks > 0) {
             jumpTicks--;
         }
-
     }
 
     private void moveWithFallDamage(float mx, float my, float mz) {
@@ -345,7 +330,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         if (!npc.isProtected()) {
             a(this.locY - y, onGround);
         }
-
     }
 
     @Override
@@ -354,7 +338,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
             super.playerTick();
             return;
         }
-
         Y();
         boolean navigating = npc.getNavigator().isNavigating();
         if (!navigating && getBukkitEntity() != null
@@ -363,19 +346,15 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
                 && (!npc.isProtected() || SpigotUtil.checkYSafe(locY, getBukkitEntity().getWorld()))) {
             moveWithFallDamage(0, 0, 0);
         }
-
         if (Math.abs(motX) < EPSILON && Math.abs(motY) < EPSILON && Math.abs(motZ) < EPSILON) {
             motX = motY = motZ = 0;
         }
-
         if (navigating) {
             if (!NMSImpl.isNavigationFinished(navigation)) {
                 NMSImpl.updateNavigation(navigation);
             }
-
             moveOnCurrentHeading();
         }
-
         updateAI();
         cB();
         if (npc.data().get(NPC.Metadata.PICKUP_ITEMS, false)) {
@@ -385,16 +364,12 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
             } else {
                 axisalignedbb = this.getBoundingBox().grow(1.0, 0.5, 1.0);
             }
-
             for (Entity entity : this.world.getEntities(this, axisalignedbb)) {
                 if (!entity.dead) {
                     entity.d(this);
                 }
-
             }
-
         }
-
     }
 
     public void setMoveDestination(double x, double y, double z, double speed) {
@@ -450,16 +425,12 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
                 if (cache != null && !cache.isEmpty()) {
                     this.getAttributeMap().a(cache.a(slot));
                 }
-
                 if (equipment != null && !equipment.isEmpty()) {
                     this.getAttributeMap().b(equipment.a(slot));
                 }
-
             }
-
             equipmentCache.put(slot, equipment);
         }
-
         if (!itemChanged)
             return;
         Location current = getBukkitEntity().getLocation(packetLocationCache);
@@ -468,7 +439,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         for (EnumItemSlot slot : EnumItemSlot.values()) {
             packets[i++] = new PacketPlayOutEntityEquipment(getId(), slot, getEquipment(slot));
         }
-
         NMSImpl.sendPacketsNearby(getBukkitEntity(), current, packets);
     }
 
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EvokerController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EvokerController.java
index 44d7a5bc6..66f00a024 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EvokerController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EvokerController.java
@@ -57,7 +57,6 @@ public class EvokerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -73,7 +72,6 @@ public class EvokerController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -94,7 +92,6 @@ public class EvokerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -117,7 +114,6 @@ public class EvokerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -126,7 +122,6 @@ public class EvokerController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -139,7 +134,6 @@ public class EvokerController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new EvokerNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -163,7 +157,6 @@ public class EvokerController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -172,7 +165,6 @@ public class EvokerController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GhastController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GhastController.java
index c2b592741..4f6e355a8 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GhastController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GhastController.java
@@ -79,7 +79,6 @@ public class GhastController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -103,7 +102,6 @@ public class GhastController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -116,7 +114,6 @@ public class GhastController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new GhastNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -140,7 +137,6 @@ public class GhastController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -148,7 +144,6 @@ public class GhastController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
             super.M();
         }
     }
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GiantController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GiantController.java
index fa076e848..5ac9ee55e 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GiantController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GiantController.java
@@ -57,7 +57,6 @@ public class GiantController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -73,7 +72,6 @@ public class GiantController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -94,7 +92,6 @@ public class GiantController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -117,7 +114,6 @@ public class GiantController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -126,7 +122,6 @@ public class GiantController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -139,7 +134,6 @@ public class GiantController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new GiantNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -163,7 +157,6 @@ public class GiantController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -172,7 +165,6 @@ public class GiantController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -190,7 +182,6 @@ public class GiantController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
     }
 
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GuardianController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GuardianController.java
index 25cb61cda..8af08eee6 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GuardianController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GuardianController.java
@@ -57,7 +57,6 @@ public class GuardianController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -73,7 +72,6 @@ public class GuardianController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -94,7 +92,6 @@ public class GuardianController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -117,7 +114,6 @@ public class GuardianController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -126,7 +122,6 @@ public class GuardianController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -139,7 +134,6 @@ public class GuardianController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new GuardianNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -163,7 +157,6 @@ public class GuardianController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -182,7 +175,6 @@ public class GuardianController extends MobEntityController {
                 NMSImpl.updateAI(this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -192,7 +184,6 @@ public class GuardianController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
     }
 
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GuardianElderController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GuardianElderController.java
index 703855867..228eb9f72 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GuardianElderController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GuardianElderController.java
@@ -57,7 +57,6 @@ public class GuardianElderController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -73,7 +72,6 @@ public class GuardianElderController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -94,7 +92,6 @@ public class GuardianElderController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -117,7 +114,6 @@ public class GuardianElderController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -126,7 +122,6 @@ public class GuardianElderController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -139,7 +134,6 @@ public class GuardianElderController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new GuardianElderNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -163,7 +157,6 @@ public class GuardianElderController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -182,7 +175,6 @@ public class GuardianElderController extends MobEntityController {
                 NMSImpl.updateAI(this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -192,7 +184,6 @@ public class GuardianElderController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
     }
 
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseController.java
index 797a461d5..cf72bc442 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseController.java
@@ -62,7 +62,6 @@ public class HorseController extends MobEntityController {
                 ((Horse) getBukkitEntity()).setDomestication(((Horse) getBukkitEntity()).getMaxDomestication());
                 baseMovementSpeed = this.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED).getValue();
             }
-
         }
 
         @Override
@@ -76,7 +75,6 @@ public class HorseController extends MobEntityController {
                 super.a(flag);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, flag, super::a);
         }
 
@@ -85,7 +83,6 @@ public class HorseController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -101,7 +98,6 @@ public class HorseController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -122,7 +118,6 @@ public class HorseController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -152,7 +147,6 @@ public class HorseController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -161,7 +155,6 @@ public class HorseController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -174,7 +167,6 @@ public class HorseController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new HorseNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -198,7 +190,6 @@ public class HorseController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -212,15 +203,12 @@ public class HorseController extends MobEntityController {
                 } else {
                     riding = false;
                 }
-
                 if (riding) {
                     c(4, true); // datawatcher method
                 }
-
                 NMS.setStepHeight(getBukkitEntity(), 1);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseDonkeyController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseDonkeyController.java
index 999e5f044..115647b68 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseDonkeyController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseDonkeyController.java
@@ -62,7 +62,6 @@ public class HorseDonkeyController extends MobEntityController {
                 ((Donkey) getBukkitEntity()).setDomestication(((Donkey) getBukkitEntity()).getMaxDomestication());
                 baseMovementSpeed = this.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED).getValue();
             }
-
         }
 
         @Override
@@ -76,7 +75,6 @@ public class HorseDonkeyController extends MobEntityController {
                 super.a(flag);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, flag, super::a);
         }
 
@@ -85,7 +83,6 @@ public class HorseDonkeyController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -101,7 +98,6 @@ public class HorseDonkeyController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -122,7 +118,6 @@ public class HorseDonkeyController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -152,7 +147,6 @@ public class HorseDonkeyController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -161,7 +155,6 @@ public class HorseDonkeyController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -174,7 +167,6 @@ public class HorseDonkeyController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new HorseDonkeyNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -198,7 +190,6 @@ public class HorseDonkeyController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -212,15 +203,12 @@ public class HorseDonkeyController extends MobEntityController {
                 } else {
                     riding = false;
                 }
-
                 if (riding) {
                     c(4, true); // datawatcher method
                 }
-
                 NMS.setStepHeight(getBukkitEntity(), 1);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseMuleController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseMuleController.java
index a6bf5869e..ec525b57c 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseMuleController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseMuleController.java
@@ -62,7 +62,6 @@ public class HorseMuleController extends MobEntityController {
                 ((Mule) getBukkitEntity()).setDomestication(((Mule) getBukkitEntity()).getMaxDomestication());
                 baseMovementSpeed = this.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED).getValue();
             }
-
         }
 
         @Override
@@ -76,7 +75,6 @@ public class HorseMuleController extends MobEntityController {
                 super.a(flag);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, flag, super::a);
         }
 
@@ -85,7 +83,6 @@ public class HorseMuleController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -101,7 +98,6 @@ public class HorseMuleController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -122,7 +118,6 @@ public class HorseMuleController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -152,7 +147,6 @@ public class HorseMuleController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -161,7 +155,6 @@ public class HorseMuleController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -174,7 +167,6 @@ public class HorseMuleController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new HorseMuleNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -198,7 +190,6 @@ public class HorseMuleController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -212,15 +203,12 @@ public class HorseMuleController extends MobEntityController {
                 } else {
                     riding = false;
                 }
-
                 if (riding) {
                     c(4, true); // datawatcher method
                 }
-
                 NMS.setStepHeight(getBukkitEntity(), 1);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseSkeletonController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseSkeletonController.java
index 14fae33a0..c5a76d18b 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseSkeletonController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseSkeletonController.java
@@ -63,7 +63,6 @@ public class HorseSkeletonController extends MobEntityController {
                         .setDomestication(((SkeletonHorse) getBukkitEntity()).getMaxDomestication());
                 baseMovementSpeed = this.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED).getValue();
             }
-
         }
 
         @Override
@@ -77,7 +76,6 @@ public class HorseSkeletonController extends MobEntityController {
                 super.a(flag);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, flag, super::a);
         }
 
@@ -86,7 +84,6 @@ public class HorseSkeletonController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -102,7 +99,6 @@ public class HorseSkeletonController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -123,7 +119,6 @@ public class HorseSkeletonController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -153,7 +148,6 @@ public class HorseSkeletonController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -162,7 +156,6 @@ public class HorseSkeletonController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -175,7 +168,6 @@ public class HorseSkeletonController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new HorseSkeletonNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -199,7 +191,6 @@ public class HorseSkeletonController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -213,15 +204,12 @@ public class HorseSkeletonController extends MobEntityController {
                 } else {
                     riding = false;
                 }
-
                 if (riding) {
                     c(4, true); // datawatcher method
                 }
-
                 NMS.setStepHeight(getBukkitEntity(), 1);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseZombieController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseZombieController.java
index eecfc5a80..d9509182b 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseZombieController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseZombieController.java
@@ -63,7 +63,6 @@ public class HorseZombieController extends MobEntityController {
                         .setDomestication(((ZombieHorse) getBukkitEntity()).getMaxDomestication());
                 baseMovementSpeed = this.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED).getValue();
             }
-
         }
 
         @Override
@@ -77,7 +76,6 @@ public class HorseZombieController extends MobEntityController {
                 super.a(flag);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, flag, super::a);
         }
 
@@ -86,7 +84,6 @@ public class HorseZombieController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -102,7 +99,6 @@ public class HorseZombieController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -123,7 +119,6 @@ public class HorseZombieController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -153,7 +148,6 @@ public class HorseZombieController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -162,7 +156,6 @@ public class HorseZombieController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -175,7 +168,6 @@ public class HorseZombieController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new HorseZombieNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -199,7 +191,6 @@ public class HorseZombieController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -213,15 +204,12 @@ public class HorseZombieController extends MobEntityController {
                 } else {
                     riding = false;
                 }
-
                 if (riding) {
                     c(4, true); // datawatcher method
                 }
-
                 NMS.setStepHeight(getBukkitEntity(), 1);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HumanController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HumanController.java
index 38c0d49e7..30ffae8c8 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HumanController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HumanController.java
@@ -35,11 +35,9 @@ public class HumanController extends AbstractEntityController {
         if (npc.requiresNameHologram()) {
             name = teamName;
         }
-
         if (Setting.USE_SCOREBOARD_TEAMS.asBoolean()) {
             npc.getOrAddTrait(ScoreboardTrait.class).createTeam(name);
         }
-
         final GameProfile profile = new GameProfile(uuid, name);
         final EntityHumanNPC handle = new EntityHumanNPC(nmsWorld.getServer().getServer(), nmsWorld, profile,
                 new PlayerInteractManager(nmsWorld), npc);
@@ -47,7 +45,6 @@ public class HumanController extends AbstractEntityController {
         if (skin != null) {
             skin.apply(handle);
         }
-
         Bukkit.getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(), () -> {
             if (getBukkitEntity() == null || !getBukkitEntity().isValid()
                     || getBukkitEntity() != handle.getBukkitEntity())
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/IllusionerController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/IllusionerController.java
index e8dc515d9..3f95ee6dc 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/IllusionerController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/IllusionerController.java
@@ -57,7 +57,6 @@ public class IllusionerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -73,7 +72,6 @@ public class IllusionerController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -94,7 +92,6 @@ public class IllusionerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -117,7 +114,6 @@ public class IllusionerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -126,7 +122,6 @@ public class IllusionerController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -139,7 +134,6 @@ public class IllusionerController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new IllusionerNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -163,7 +157,6 @@ public class IllusionerController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -172,7 +165,6 @@ public class IllusionerController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/IronGolemController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/IronGolemController.java
index 66e50b874..e06550047 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/IronGolemController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/IronGolemController.java
@@ -57,7 +57,6 @@ public class IronGolemController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -73,7 +72,6 @@ public class IronGolemController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -94,7 +92,6 @@ public class IronGolemController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -117,7 +114,6 @@ public class IronGolemController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -126,7 +122,6 @@ public class IronGolemController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -139,7 +134,6 @@ public class IronGolemController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new IronGolemNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -163,7 +157,6 @@ public class IronGolemController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -172,7 +165,6 @@ public class IronGolemController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -190,7 +182,6 @@ public class IronGolemController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
     }
 
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/LlamaController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/LlamaController.java
index c64cbb0d0..95cd15337 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/LlamaController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/LlamaController.java
@@ -63,7 +63,6 @@ public class LlamaController extends MobEntityController {
                 ((Llama) getBukkitEntity()).setDomestication(((Llama) getBukkitEntity()).getMaxDomestication());
                 baseMovementSpeed = this.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED).getValue();
             }
-
         }
 
         @Override
@@ -77,7 +76,6 @@ public class LlamaController extends MobEntityController {
                 super.a(flag);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, flag, super::a);
         }
 
@@ -86,7 +84,6 @@ public class LlamaController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -102,7 +99,6 @@ public class LlamaController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -123,7 +119,6 @@ public class LlamaController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -153,7 +148,6 @@ public class LlamaController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -162,7 +156,6 @@ public class LlamaController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -175,7 +168,6 @@ public class LlamaController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new LlamaNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -199,7 +191,6 @@ public class LlamaController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -213,15 +204,12 @@ public class LlamaController extends MobEntityController {
                 } else {
                     riding = false;
                 }
-
                 if (riding) {
                     c(4, true); // datawatcher method
                 }
-
                 NMS.setStepHeight(getBukkitEntity(), 1);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/MagmaCubeController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/MagmaCubeController.java
index a59638b27..282cef22b 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/MagmaCubeController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/MagmaCubeController.java
@@ -51,7 +51,6 @@ public class MagmaCubeController extends MobEntityController {
                 setSize(3, true);
                 this.moveController = new PlayerControllerMove(this);
             }
-
         }
 
         @Override
@@ -64,7 +63,6 @@ public class MagmaCubeController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -80,7 +78,6 @@ public class MagmaCubeController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -89,7 +86,6 @@ public class MagmaCubeController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -110,7 +106,6 @@ public class MagmaCubeController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -128,7 +123,6 @@ public class MagmaCubeController extends MobEntityController {
             if (npc == null) {
                 super.d(human);
             }
-
         }
 
         @Override
@@ -141,7 +135,6 @@ public class MagmaCubeController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -150,7 +143,6 @@ public class MagmaCubeController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -163,7 +155,6 @@ public class MagmaCubeController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new MagmaCubeNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -187,7 +178,6 @@ public class MagmaCubeController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -205,7 +195,6 @@ public class MagmaCubeController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
     }
 
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/MobEntityController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/MobEntityController.java
index f1ebfccfa..68fb585b6 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/MobEntityController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/MobEntityController.java
@@ -34,7 +34,6 @@ public abstract class MobEntityController extends AbstractEntityController {
         if (entity instanceof EntityInsentient) {
             NMSImpl.clearGoals(((EntityInsentient) entity).goalSelector, ((EntityInsentient) entity).targetSelector);
         }
-
         entity.setPositionRotation(at.getX(), at.getY(), at.getZ(), at.getYaw(), at.getPitch());
         if (npc != null) {
             // entity.onGround isn't updated right away - we approximate here so
@@ -43,19 +42,15 @@ public abstract class MobEntityController extends AbstractEntityController {
             if (beneath.isSolid()) {
                 entity.onGround = true;
             }
-
             try {
                 UUID_FIELD.invoke(entity, npc.getUniqueId());
             } catch (Throwable e) {
                 e.printStackTrace();
             }
-
             if (Setting.USE_SCOREBOARD_TEAMS.asBoolean()) {
                 npc.getOrAddTrait(ScoreboardTrait.class).createTeam(npc.getUniqueId().toString());
             }
-
         }
-
         return entity.getBukkitEntity();
     }
 
@@ -66,7 +61,6 @@ public abstract class MobEntityController extends AbstractEntityController {
             ex.printStackTrace();
             return null;
         }
-
     }
 
     private static Constructor<?> getConstructor(Class<?> clazz) {
@@ -79,7 +73,6 @@ public abstract class MobEntityController extends AbstractEntityController {
         } catch (Exception ex) {
             throw new IllegalStateException("unable to find an entity constructor");
         }
-
     }
 
     private static final Map<Class<?>, Constructor<?>> CONSTRUCTOR_CACHE = new WeakHashMap<>();
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/MushroomCowController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/MushroomCowController.java
index 108be1e09..17bf1f384 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/MushroomCowController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/MushroomCowController.java
@@ -60,7 +60,6 @@ public class MushroomCowController extends MobEntityController {
                 super.a(flag);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, flag, super::a);
         }
 
@@ -69,7 +68,6 @@ public class MushroomCowController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -92,7 +90,6 @@ public class MushroomCowController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -113,7 +110,6 @@ public class MushroomCowController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -136,7 +132,6 @@ public class MushroomCowController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -145,7 +140,6 @@ public class MushroomCowController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -158,7 +152,6 @@ public class MushroomCowController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new MushroomCowNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -182,7 +175,6 @@ public class MushroomCowController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -191,7 +183,6 @@ public class MushroomCowController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/OcelotController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/OcelotController.java
index 031c0e8ed..5fb6e3606 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/OcelotController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/OcelotController.java
@@ -58,7 +58,6 @@ public class OcelotController extends MobEntityController {
                 super.a(flag);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, flag, super::a);
         }
 
@@ -67,7 +66,6 @@ public class OcelotController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -83,7 +81,6 @@ public class OcelotController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -104,7 +101,6 @@ public class OcelotController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -127,7 +123,6 @@ public class OcelotController extends MobEntityController {
             if (npc == null) {
                 super.dm();
             }
-
         }
 
         @Override
@@ -135,7 +130,6 @@ public class OcelotController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -144,7 +138,6 @@ public class OcelotController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -157,7 +150,6 @@ public class OcelotController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new OcelotNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -181,7 +173,6 @@ public class OcelotController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -190,7 +181,6 @@ public class OcelotController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ParrotController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ParrotController.java
index 34fa913c0..7c4ebfccc 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ParrotController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ParrotController.java
@@ -84,7 +84,6 @@ public class ParrotController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -108,7 +107,6 @@ public class ParrotController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -121,7 +119,6 @@ public class ParrotController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new ParrotNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -145,7 +142,6 @@ public class ParrotController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -156,7 +152,6 @@ public class ParrotController extends MobEntityController {
                 NMSImpl.updateAI(this);
                 npc.update();
             }
-
         }
     }
 
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/PigController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/PigController.java
index 6e2f0b10d..5b8f721dc 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/PigController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/PigController.java
@@ -59,7 +59,6 @@ public class PigController extends MobEntityController {
                 super.a(flag);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, flag, super::a);
         }
 
@@ -68,7 +67,6 @@ public class PigController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -84,7 +82,6 @@ public class PigController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -105,7 +102,6 @@ public class PigController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -134,7 +130,6 @@ public class PigController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -143,7 +138,6 @@ public class PigController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -156,7 +150,6 @@ public class PigController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new PigNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -180,7 +173,6 @@ public class PigController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -189,7 +181,6 @@ public class PigController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -205,7 +196,6 @@ public class PigController extends MobEntityController {
             if (npc == null) {
                 super.onLightningStrike(entitylightning);
             }
-
         }
     }
 
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/PigZombieController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/PigZombieController.java
index a1f05b75c..8c8dcc6eb 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/PigZombieController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/PigZombieController.java
@@ -57,7 +57,6 @@ public class PigZombieController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -73,7 +72,6 @@ public class PigZombieController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -94,7 +92,6 @@ public class PigZombieController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -117,7 +114,6 @@ public class PigZombieController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -126,7 +122,6 @@ public class PigZombieController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -139,7 +134,6 @@ public class PigZombieController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new PigZombieNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -163,7 +157,6 @@ public class PigZombieController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -172,7 +165,6 @@ public class PigZombieController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/PolarBearController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/PolarBearController.java
index 52e5bfe52..58f7e221d 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/PolarBearController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/PolarBearController.java
@@ -56,7 +56,6 @@ public class PolarBearController extends MobEntityController {
                 super.a(flag);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, flag, super::a);
         }
 
@@ -84,7 +83,6 @@ public class PolarBearController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -108,7 +106,6 @@ public class PolarBearController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -121,7 +118,6 @@ public class PolarBearController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new PolarBearNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -145,7 +141,6 @@ public class PolarBearController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -154,7 +149,6 @@ public class PolarBearController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
     }
 
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/RabbitController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/RabbitController.java
index 74460b983..8eae5cf31 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/RabbitController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/RabbitController.java
@@ -59,7 +59,6 @@ public class RabbitController extends MobEntityController {
                 super.a(flag);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, flag, super::a);
         }
 
@@ -68,7 +67,6 @@ public class RabbitController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -84,7 +82,6 @@ public class RabbitController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -105,7 +102,6 @@ public class RabbitController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -128,7 +124,6 @@ public class RabbitController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -137,7 +132,6 @@ public class RabbitController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -150,7 +144,6 @@ public class RabbitController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new RabbitNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -179,7 +172,6 @@ public class RabbitController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -191,7 +183,6 @@ public class RabbitController extends MobEntityController {
             } else {
                 super.M();
             }
-
         }
 
         @Override
@@ -210,7 +201,6 @@ public class RabbitController extends MobEntityController {
                 this.datawatcher.set(NMSImpl.getRabbitTypeField(), i);
                 return;
             }
-
             super.setRabbitType(i);
         }
     }
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SheepController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SheepController.java
index 9a27b2570..9465217a1 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SheepController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SheepController.java
@@ -58,7 +58,6 @@ public class SheepController extends MobEntityController {
                 super.a(flag);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, flag, super::a);
         }
 
@@ -67,7 +66,6 @@ public class SheepController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -83,7 +81,6 @@ public class SheepController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -104,7 +101,6 @@ public class SheepController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -127,7 +123,6 @@ public class SheepController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -136,7 +131,6 @@ public class SheepController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -149,7 +143,6 @@ public class SheepController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SheepNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -173,7 +166,6 @@ public class SheepController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -182,7 +174,6 @@ public class SheepController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ShulkerController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ShulkerController.java
index 19a0f9070..1caaca15c 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ShulkerController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ShulkerController.java
@@ -58,7 +58,6 @@ public class ShulkerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -74,7 +73,6 @@ public class ShulkerController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -84,7 +82,6 @@ public class ShulkerController extends MobEntityController {
             } else {
                 super.B_();
             }
-
         }
 
         @Override
@@ -105,7 +102,6 @@ public class ShulkerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -128,7 +124,6 @@ public class ShulkerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -137,7 +132,6 @@ public class ShulkerController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -150,7 +144,6 @@ public class ShulkerController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new ShulkerNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -174,7 +167,6 @@ public class ShulkerController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -190,7 +182,6 @@ public class ShulkerController extends MobEntityController {
             if (npc == null) {
                 super.n();
             }
-
         }
 
         @Override
@@ -205,7 +196,6 @@ public class ShulkerController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
     }
 
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SilverfishController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SilverfishController.java
index d8cc8ab49..99fcb0d8c 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SilverfishController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SilverfishController.java
@@ -57,7 +57,6 @@ public class SilverfishController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -73,7 +72,6 @@ public class SilverfishController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -94,7 +92,6 @@ public class SilverfishController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -117,7 +114,6 @@ public class SilverfishController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -126,7 +122,6 @@ public class SilverfishController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -139,7 +134,6 @@ public class SilverfishController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SilverfishNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -163,7 +157,6 @@ public class SilverfishController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -172,7 +165,6 @@ public class SilverfishController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -190,7 +182,6 @@ public class SilverfishController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
     }
 
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SkeletonController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SkeletonController.java
index 5cb2a34fa..e7342d92f 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SkeletonController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SkeletonController.java
@@ -57,7 +57,6 @@ public class SkeletonController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -73,7 +72,6 @@ public class SkeletonController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -94,7 +92,6 @@ public class SkeletonController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -117,7 +114,6 @@ public class SkeletonController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -126,7 +122,6 @@ public class SkeletonController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -139,7 +134,6 @@ public class SkeletonController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SkeletonNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -163,7 +157,6 @@ public class SkeletonController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -172,7 +165,6 @@ public class SkeletonController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -190,7 +182,6 @@ public class SkeletonController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
     }
 
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SkeletonStrayController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SkeletonStrayController.java
index 94973ac28..6d42ed0da 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SkeletonStrayController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SkeletonStrayController.java
@@ -57,7 +57,6 @@ public class SkeletonStrayController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -73,7 +72,6 @@ public class SkeletonStrayController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -94,7 +92,6 @@ public class SkeletonStrayController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -117,7 +114,6 @@ public class SkeletonStrayController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -126,7 +122,6 @@ public class SkeletonStrayController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -139,7 +134,6 @@ public class SkeletonStrayController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new StrayNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -163,7 +157,6 @@ public class SkeletonStrayController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -172,7 +165,6 @@ public class SkeletonStrayController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -190,7 +182,6 @@ public class SkeletonStrayController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
     }
 
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SkeletonWitherController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SkeletonWitherController.java
index 04d38cbbc..e25a9611c 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SkeletonWitherController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SkeletonWitherController.java
@@ -57,7 +57,6 @@ public class SkeletonWitherController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -73,7 +72,6 @@ public class SkeletonWitherController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -94,7 +92,6 @@ public class SkeletonWitherController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -117,7 +114,6 @@ public class SkeletonWitherController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -126,7 +122,6 @@ public class SkeletonWitherController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -139,7 +134,6 @@ public class SkeletonWitherController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SkeletonWitherNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -163,7 +157,6 @@ public class SkeletonWitherController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -172,7 +165,6 @@ public class SkeletonWitherController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -190,7 +182,6 @@ public class SkeletonWitherController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
     }
 
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SlimeController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SlimeController.java
index 420bdc892..d786ba6a4 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SlimeController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SlimeController.java
@@ -51,7 +51,6 @@ public class SlimeController extends MobEntityController {
                 setSize(3, true);
                 this.moveController = new PlayerControllerMove(this);
             }
-
         }
 
         @Override
@@ -64,7 +63,6 @@ public class SlimeController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -80,7 +78,6 @@ public class SlimeController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -89,7 +86,6 @@ public class SlimeController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -110,7 +106,6 @@ public class SlimeController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -128,7 +123,6 @@ public class SlimeController extends MobEntityController {
             if (npc == null) {
                 super.d(human);
             }
-
         }
 
         @Override
@@ -141,7 +135,6 @@ public class SlimeController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -150,7 +143,6 @@ public class SlimeController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -163,7 +155,6 @@ public class SlimeController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SlimeNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -187,7 +178,6 @@ public class SlimeController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -205,7 +195,6 @@ public class SlimeController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
     }
 
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SnowmanController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SnowmanController.java
index 5fbfb5f96..14ff9ce21 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SnowmanController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SnowmanController.java
@@ -57,7 +57,6 @@ public class SnowmanController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -73,7 +72,6 @@ public class SnowmanController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -94,7 +92,6 @@ public class SnowmanController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -117,7 +114,6 @@ public class SnowmanController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -126,7 +122,6 @@ public class SnowmanController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -139,7 +134,6 @@ public class SnowmanController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SnowmanNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -163,7 +157,6 @@ public class SnowmanController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -172,7 +165,6 @@ public class SnowmanController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -190,7 +182,6 @@ public class SnowmanController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
     }
 
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SpiderController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SpiderController.java
index 0b074805a..b4ad056dd 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SpiderController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SpiderController.java
@@ -57,7 +57,6 @@ public class SpiderController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -73,7 +72,6 @@ public class SpiderController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -94,7 +92,6 @@ public class SpiderController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -117,7 +114,6 @@ public class SpiderController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -126,7 +122,6 @@ public class SpiderController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -139,7 +134,6 @@ public class SpiderController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SpiderNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -163,7 +157,6 @@ public class SpiderController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -172,7 +165,6 @@ public class SpiderController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -190,7 +182,6 @@ public class SpiderController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
     }
 
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SquidController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SquidController.java
index 823c631f7..657fef702 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SquidController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/SquidController.java
@@ -57,7 +57,6 @@ public class SquidController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -73,7 +72,6 @@ public class SquidController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -94,7 +92,6 @@ public class SquidController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -117,7 +114,6 @@ public class SquidController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -126,7 +122,6 @@ public class SquidController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -139,7 +134,6 @@ public class SquidController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SquidNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -163,7 +157,6 @@ public class SquidController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -180,7 +173,6 @@ public class SquidController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -190,7 +182,6 @@ public class SquidController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
     }
 
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/VexController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/VexController.java
index e7212ce01..6a19fac9c 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/VexController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/VexController.java
@@ -46,7 +46,6 @@ public class VexController extends MobEntityController {
             if (npc != null) {
                 setNoGravity(true);
             }
-
         }
 
         @Override
@@ -78,7 +77,6 @@ public class VexController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -102,7 +100,6 @@ public class VexController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -115,7 +112,6 @@ public class VexController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new VexNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -139,7 +135,6 @@ public class VexController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -148,7 +143,6 @@ public class VexController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
     }
 
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/VillagerController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/VillagerController.java
index 7b0964569..02cbb487e 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/VillagerController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/VillagerController.java
@@ -66,7 +66,6 @@ public class VillagerController extends MobEntityController {
                 super.a(flag);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, flag, super::a);
         }
 
@@ -75,7 +74,6 @@ public class VillagerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -92,9 +90,7 @@ public class VillagerController extends MobEntityController {
                 if (list != null) {
                     list.clear();
                 }
-
             }
-
             return super.a(entityhuman, enumhand);
         }
 
@@ -105,7 +101,6 @@ public class VillagerController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -126,7 +121,6 @@ public class VillagerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -150,7 +144,6 @@ public class VillagerController extends MobEntityController {
                 blockingATrade = false;
                 return true;
             }
-
             return super.do_();
         }
 
@@ -159,7 +152,6 @@ public class VillagerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -168,7 +160,6 @@ public class VillagerController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -181,7 +172,6 @@ public class VillagerController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new VillagerNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -205,7 +195,6 @@ public class VillagerController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -214,7 +203,6 @@ public class VillagerController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -230,7 +218,6 @@ public class VillagerController extends MobEntityController {
             if (npc == null) {
                 super.onLightningStrike(entitylightning);
             }
-
         }
     }
 
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/VindicatorController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/VindicatorController.java
index 53353295c..8a986746a 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/VindicatorController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/VindicatorController.java
@@ -58,7 +58,6 @@ public class VindicatorController extends MobEntityController {
                 super.a(flag);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, flag, super::a);
         }
 
@@ -67,7 +66,6 @@ public class VindicatorController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -83,7 +81,6 @@ public class VindicatorController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -104,7 +101,6 @@ public class VindicatorController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -127,7 +123,6 @@ public class VindicatorController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -136,7 +131,6 @@ public class VindicatorController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -149,7 +143,6 @@ public class VindicatorController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new VindicatorNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -173,7 +166,6 @@ public class VindicatorController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -182,7 +174,6 @@ public class VindicatorController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/WitchController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/WitchController.java
index 0cf3c2055..4a1e383a5 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/WitchController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/WitchController.java
@@ -57,7 +57,6 @@ public class WitchController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -73,7 +72,6 @@ public class WitchController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -94,7 +92,6 @@ public class WitchController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -117,7 +114,6 @@ public class WitchController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -126,7 +122,6 @@ public class WitchController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -139,7 +134,6 @@ public class WitchController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new WitchNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -163,7 +157,6 @@ public class WitchController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -172,7 +165,6 @@ public class WitchController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -190,7 +182,6 @@ public class WitchController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
     }
 
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/WitherController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/WitherController.java
index ff18bf65e..55e5a73df 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/WitherController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/WitherController.java
@@ -74,7 +74,6 @@ public class WitherController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -104,7 +103,6 @@ public class WitherController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -117,7 +115,6 @@ public class WitherController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new WitherNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -141,7 +138,6 @@ public class WitherController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -156,7 +152,6 @@ public class WitherController extends MobEntityController {
             } else {
                 npc.update();
             }
-
         }
     }
 
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/WolfController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/WolfController.java
index 68eeac9ed..8aaefc43a 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/WolfController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/WolfController.java
@@ -60,7 +60,6 @@ public class WolfController extends MobEntityController {
                 super.a(flag);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, flag, super::a);
         }
 
@@ -69,7 +68,6 @@ public class WolfController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -85,7 +83,6 @@ public class WolfController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -106,7 +103,6 @@ public class WolfController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -129,7 +125,6 @@ public class WolfController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -138,7 +133,6 @@ public class WolfController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -151,7 +145,6 @@ public class WolfController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new WolfNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -175,7 +168,6 @@ public class WolfController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -184,7 +176,6 @@ public class WolfController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ZombieController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ZombieController.java
index 657991e36..c3371c171 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ZombieController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ZombieController.java
@@ -57,7 +57,6 @@ public class ZombieController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -73,7 +72,6 @@ public class ZombieController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -94,7 +92,6 @@ public class ZombieController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -117,7 +114,6 @@ public class ZombieController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -126,7 +122,6 @@ public class ZombieController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -139,7 +134,6 @@ public class ZombieController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new ZombieNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -163,7 +157,6 @@ public class ZombieController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -172,7 +165,6 @@ public class ZombieController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ZombieHuskController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ZombieHuskController.java
index 77b0e5d7e..54aeb88ca 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ZombieHuskController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ZombieHuskController.java
@@ -57,7 +57,6 @@ public class ZombieHuskController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -73,7 +72,6 @@ public class ZombieHuskController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -94,7 +92,6 @@ public class ZombieHuskController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -117,7 +114,6 @@ public class ZombieHuskController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -126,7 +122,6 @@ public class ZombieHuskController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -139,7 +134,6 @@ public class ZombieHuskController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new ZombieHuskNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -163,7 +157,6 @@ public class ZombieHuskController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -172,7 +165,6 @@ public class ZombieHuskController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ZombieVillagerController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ZombieVillagerController.java
index 4c10b2974..ab75feaf8 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ZombieVillagerController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ZombieVillagerController.java
@@ -57,7 +57,6 @@ public class ZombieVillagerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -73,7 +72,6 @@ public class ZombieVillagerController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -94,7 +92,6 @@ public class ZombieVillagerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -117,7 +114,6 @@ public class ZombieVillagerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -126,7 +122,6 @@ public class ZombieVillagerController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -139,7 +134,6 @@ public class ZombieVillagerController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new ZombieVillagerNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -163,7 +157,6 @@ public class ZombieVillagerController extends MobEntityController {
             if (npc == null) {
                 super.L();
             }
-
         }
 
         @Override
@@ -172,7 +165,6 @@ public class ZombieVillagerController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/AreaEffectCloudController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/AreaEffectCloudController.java
index b8f15847f..86138623b 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/AreaEffectCloudController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/AreaEffectCloudController.java
@@ -67,7 +67,6 @@ public class AreaEffectCloudController extends MobEntityController {
             } else {
                 super.B_();
             }
-
         }
 
         @Override
@@ -78,7 +77,6 @@ public class AreaEffectCloudController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -92,7 +90,6 @@ public class AreaEffectCloudController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -100,7 +97,6 @@ public class AreaEffectCloudController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new AreaEffectCloudNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/BoatController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/BoatController.java
index 084a4a38e..026d63090 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/BoatController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/BoatController.java
@@ -68,7 +68,6 @@ public class BoatController extends MobEntityController {
             } else {
                 super.B_();
             }
-
         }
 
         @Override
@@ -79,7 +78,6 @@ public class BoatController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -93,7 +91,6 @@ public class BoatController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -101,7 +98,6 @@ public class BoatController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new BoatNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -122,7 +118,6 @@ public class BoatController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
     }
 }
\ No newline at end of file
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/DragonFireballController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/DragonFireballController.java
index 8cc08f1a9..c2ec529cd 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/DragonFireballController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/DragonFireballController.java
@@ -68,11 +68,9 @@ public class DragonFireballController extends MobEntityController {
                 if (!npc.isProtected()) {
                     super.B_();
                 }
-
             } else {
                 super.B_();
             }
-
         }
 
         @Override
@@ -83,7 +81,6 @@ public class DragonFireballController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -97,7 +94,6 @@ public class DragonFireballController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -105,7 +101,6 @@ public class DragonFireballController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new DragonFireballNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -126,7 +121,6 @@ public class DragonFireballController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
     }
 }
\ No newline at end of file
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/EggController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/EggController.java
index 0c909af26..465bd5116 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/EggController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/EggController.java
@@ -83,11 +83,9 @@ public class EggController extends AbstractEntityController {
                 if (!npc.isProtected()) {
                     super.B_();
                 }
-
             } else {
                 super.B_();
             }
-
         }
 
         @Override
@@ -98,7 +96,6 @@ public class EggController extends AbstractEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -112,7 +109,6 @@ public class EggController extends AbstractEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -120,7 +116,6 @@ public class EggController extends AbstractEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new EggNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/EnderCrystalController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/EnderCrystalController.java
index cf3305a05..8b565cfc2 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/EnderCrystalController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/EnderCrystalController.java
@@ -67,7 +67,6 @@ public class EnderCrystalController extends MobEntityController {
             } else {
                 super.B_();
             }
-
         }
 
         @Override
@@ -78,7 +77,6 @@ public class EnderCrystalController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -92,7 +90,6 @@ public class EnderCrystalController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -100,7 +97,6 @@ public class EnderCrystalController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new EnderCrystalNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/EnderPearlController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/EnderPearlController.java
index 82dd10d31..434401b75 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/EnderPearlController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/EnderPearlController.java
@@ -67,11 +67,9 @@ public class EnderPearlController extends MobEntityController {
                 if (!npc.isProtected()) {
                     super.B_();
                 }
-
             } else {
                 super.B_();
             }
-
         }
 
         @Override
@@ -82,7 +80,6 @@ public class EnderPearlController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -96,7 +93,6 @@ public class EnderPearlController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -104,7 +100,6 @@ public class EnderPearlController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new EnderPearlNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/EnderSignalController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/EnderSignalController.java
index a0e71b8ce..ff8a0587a 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/EnderSignalController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/EnderSignalController.java
@@ -67,7 +67,6 @@ public class EnderSignalController extends MobEntityController {
             } else {
                 super.B_();
             }
-
         }
 
         @Override
@@ -78,7 +77,6 @@ public class EnderSignalController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -92,7 +90,6 @@ public class EnderSignalController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -100,7 +97,6 @@ public class EnderSignalController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new EnderSignalNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/EvokerFangsController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/EvokerFangsController.java
index 1fc06cb45..f84a77664 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/EvokerFangsController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/EvokerFangsController.java
@@ -68,7 +68,6 @@ public class EvokerFangsController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -79,7 +78,6 @@ public class EvokerFangsController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -93,7 +91,6 @@ public class EvokerFangsController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -101,7 +98,6 @@ public class EvokerFangsController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new EvokerFangsNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/ExperienceOrbController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/ExperienceOrbController.java
index 30672b6ea..32ff9c159 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/ExperienceOrbController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/ExperienceOrbController.java
@@ -53,7 +53,6 @@ public class ExperienceOrbController extends MobEntityController {
             } else {
                 super.B_();
             }
-
         }
 
         @Override
@@ -64,7 +63,6 @@ public class ExperienceOrbController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -78,7 +76,6 @@ public class ExperienceOrbController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -86,7 +83,6 @@ public class ExperienceOrbController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new ExperienceOrbNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/FallingBlockController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/FallingBlockController.java
index 4e0d639be..d8815820e 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/FallingBlockController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/FallingBlockController.java
@@ -79,11 +79,9 @@ public class FallingBlockController extends AbstractEntityController {
                     motZ *= 0.98;
                     move(EnumMoveType.SELF, motX, motY, motZ);
                 }
-
             } else {
                 super.B_();
             }
-
         }
 
         @Override
@@ -94,7 +92,6 @@ public class FallingBlockController extends AbstractEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -108,7 +105,6 @@ public class FallingBlockController extends AbstractEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -116,7 +112,6 @@ public class FallingBlockController extends AbstractEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new FallingBlockNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -137,7 +132,6 @@ public class FallingBlockController extends AbstractEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
 
         private static final double EPSILON = 0.001;
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/FireworkController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/FireworkController.java
index 3e863cab0..3ddd71236 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/FireworkController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/FireworkController.java
@@ -53,7 +53,6 @@ public class FireworkController extends MobEntityController {
             } else {
                 super.B_();
             }
-
         }
 
         @Override
@@ -64,7 +63,6 @@ public class FireworkController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -78,7 +76,6 @@ public class FireworkController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -86,7 +83,6 @@ public class FireworkController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new FireworkNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/FishingHookController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/FishingHookController.java
index 01d2b9175..d9101be6f 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/FishingHookController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/FishingHookController.java
@@ -53,7 +53,6 @@ public class FishingHookController extends MobEntityController {
             } else {
                 super.B_();
             }
-
         }
 
         @Override
@@ -64,7 +63,6 @@ public class FishingHookController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -78,7 +76,6 @@ public class FishingHookController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -86,7 +83,6 @@ public class FishingHookController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new FishingHookNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/ItemController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/ItemController.java
index 14dc9f038..cdf69497a 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/ItemController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/ItemController.java
@@ -66,7 +66,6 @@ public class ItemController extends AbstractEntityController {
             } else {
                 super.B_();
             }
-
         }
 
         @Override
@@ -77,7 +76,6 @@ public class ItemController extends AbstractEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -85,7 +83,6 @@ public class ItemController extends AbstractEntityController {
             if (npc == null) {
                 super.d(entityhuman);
             }
-
         }
 
         @Override
@@ -99,7 +96,6 @@ public class ItemController extends AbstractEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -107,7 +103,6 @@ public class ItemController extends AbstractEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new ItemNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/ItemFrameController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/ItemFrameController.java
index 732945941..32f3c8634 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/ItemFrameController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/ItemFrameController.java
@@ -66,7 +66,6 @@ public class ItemFrameController extends MobEntityController {
             } else {
                 super.B_();
             }
-
         }
 
         @Override
@@ -77,7 +76,6 @@ public class ItemFrameController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -91,7 +89,6 @@ public class ItemFrameController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -99,7 +96,6 @@ public class ItemFrameController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new ItemFrameNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/LargeFireballController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/LargeFireballController.java
index f2b5dc71a..a10540344 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/LargeFireballController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/LargeFireballController.java
@@ -54,11 +54,9 @@ public class LargeFireballController extends MobEntityController {
                 if (!npc.isProtected()) {
                     super.B_();
                 }
-
             } else {
                 super.B_();
             }
-
         }
 
         @Override
@@ -69,7 +67,6 @@ public class LargeFireballController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -83,7 +80,6 @@ public class LargeFireballController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -91,7 +87,6 @@ public class LargeFireballController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new LargeFireballNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -112,7 +107,6 @@ public class LargeFireballController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
     }
 
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/LeashController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/LeashController.java
index 63cc41aa1..dfac5f3cc 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/LeashController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/LeashController.java
@@ -53,7 +53,6 @@ public class LeashController extends MobEntityController {
             } else {
                 super.B_();
             }
-
         }
 
         @Override
@@ -64,7 +63,6 @@ public class LeashController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -78,7 +76,6 @@ public class LeashController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -86,7 +83,6 @@ public class LeashController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new LeashNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/LlamaSpitController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/LlamaSpitController.java
index c9a5064f7..e6547ecc2 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/LlamaSpitController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/LlamaSpitController.java
@@ -71,11 +71,9 @@ public class LlamaSpitController extends AbstractEntityController {
                 if (!npc.isProtected()) {
                     super.B_();
                 }
-
             } else {
                 super.B_();
             }
-
         }
 
         @Override
@@ -86,7 +84,6 @@ public class LlamaSpitController extends AbstractEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -100,7 +97,6 @@ public class LlamaSpitController extends AbstractEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -108,7 +104,6 @@ public class LlamaSpitController extends AbstractEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new LlamaSpitNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartChestController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartChestController.java
index 5928ba1c6..28285fa16 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartChestController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartChestController.java
@@ -54,7 +54,6 @@ public class MinecartChestController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
 
         @Override
@@ -65,7 +64,6 @@ public class MinecartChestController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -79,7 +77,6 @@ public class MinecartChestController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -87,7 +84,6 @@ public class MinecartChestController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new MinecartChestNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartCommandController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartCommandController.java
index 333710a38..de5a99306 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartCommandController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartCommandController.java
@@ -54,7 +54,6 @@ public class MinecartCommandController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
 
         @Override
@@ -65,7 +64,6 @@ public class MinecartCommandController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -79,7 +77,6 @@ public class MinecartCommandController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -87,7 +84,6 @@ public class MinecartCommandController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new MinecartCommandNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartFurnaceController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartFurnaceController.java
index 44f77457c..e7a7569d7 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartFurnaceController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartFurnaceController.java
@@ -54,7 +54,6 @@ public class MinecartFurnaceController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
 
         @Override
@@ -65,7 +64,6 @@ public class MinecartFurnaceController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -79,7 +77,6 @@ public class MinecartFurnaceController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -87,7 +84,6 @@ public class MinecartFurnaceController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new MinecartFurnaceNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartHopperController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartHopperController.java
index 5e77ffa8d..71db073a7 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartHopperController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartHopperController.java
@@ -50,7 +50,6 @@ public class MinecartHopperController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
 
         @Override
@@ -61,7 +60,6 @@ public class MinecartHopperController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -75,7 +73,6 @@ public class MinecartHopperController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartRideableController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartRideableController.java
index ea436f062..191202dd9 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartRideableController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartRideableController.java
@@ -54,7 +54,6 @@ public class MinecartRideableController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
 
         @Override
@@ -65,7 +64,6 @@ public class MinecartRideableController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -79,7 +77,6 @@ public class MinecartRideableController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -87,7 +84,6 @@ public class MinecartRideableController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new MinecartRideableNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartSpawnerController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartSpawnerController.java
index 59ec3646a..83e99c911 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartSpawnerController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartSpawnerController.java
@@ -50,7 +50,6 @@ public class MinecartSpawnerController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
 
         @Override
@@ -61,7 +60,6 @@ public class MinecartSpawnerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -75,7 +73,6 @@ public class MinecartSpawnerController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartTNTController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartTNTController.java
index 7d80cf42d..c4e857ef2 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartTNTController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartTNTController.java
@@ -50,7 +50,6 @@ public class MinecartTNTController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
 
         @Override
@@ -61,7 +60,6 @@ public class MinecartTNTController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -75,7 +73,6 @@ public class MinecartTNTController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/PaintingController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/PaintingController.java
index 5cfdd2af8..adf849104 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/PaintingController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/PaintingController.java
@@ -53,7 +53,6 @@ public class PaintingController extends MobEntityController {
             } else {
                 super.B_();
             }
-
         }
 
         @Override
@@ -64,7 +63,6 @@ public class PaintingController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -78,7 +76,6 @@ public class PaintingController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -86,7 +83,6 @@ public class PaintingController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new PaintingNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/ShulkerBulletController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/ShulkerBulletController.java
index dee6937ce..d672a45cf 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/ShulkerBulletController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/ShulkerBulletController.java
@@ -53,7 +53,6 @@ public class ShulkerBulletController extends MobEntityController {
             } else {
                 super.B_();
             }
-
         }
 
         @Override
@@ -64,7 +63,6 @@ public class ShulkerBulletController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -78,7 +76,6 @@ public class ShulkerBulletController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -86,7 +83,6 @@ public class ShulkerBulletController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new ShulkerBulletNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/SmallFireballController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/SmallFireballController.java
index d37fb4c28..1efc4fb4b 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/SmallFireballController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/SmallFireballController.java
@@ -53,11 +53,9 @@ public class SmallFireballController extends MobEntityController {
                 if (!npc.isProtected()) {
                     super.B_();
                 }
-
             } else {
                 super.B_();
             }
-
         }
 
         @Override
@@ -68,7 +66,6 @@ public class SmallFireballController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -82,7 +79,6 @@ public class SmallFireballController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -90,7 +86,6 @@ public class SmallFireballController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SmallFireballNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/SnowballController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/SnowballController.java
index b331b6f81..29d423a2c 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/SnowballController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/SnowballController.java
@@ -53,7 +53,6 @@ public class SnowballController extends MobEntityController {
             } else {
                 super.B_();
             }
-
         }
 
         @Override
@@ -64,7 +63,6 @@ public class SnowballController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -78,7 +76,6 @@ public class SnowballController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -86,7 +83,6 @@ public class SnowballController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SnowballNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/SpectralArrowController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/SpectralArrowController.java
index 4b5c2ed01..59616fe82 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/SpectralArrowController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/SpectralArrowController.java
@@ -53,7 +53,6 @@ public class SpectralArrowController extends MobEntityController {
             } else {
                 super.B_();
             }
-
         }
 
         @Override
@@ -64,7 +63,6 @@ public class SpectralArrowController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -78,7 +76,6 @@ public class SpectralArrowController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -86,7 +83,6 @@ public class SpectralArrowController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SpectralArrowNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/TNTPrimedController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/TNTPrimedController.java
index 38b25a65f..a30f46d13 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/TNTPrimedController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/TNTPrimedController.java
@@ -53,7 +53,6 @@ public class TNTPrimedController extends MobEntityController {
             } else {
                 super.B_();
             }
-
         }
 
         @Override
@@ -64,7 +63,6 @@ public class TNTPrimedController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -78,7 +76,6 @@ public class TNTPrimedController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -86,7 +83,6 @@ public class TNTPrimedController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new TNTPrimedNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/ThrownExpBottleController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/ThrownExpBottleController.java
index 0f9bdc0d3..a2daf278b 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/ThrownExpBottleController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/ThrownExpBottleController.java
@@ -53,11 +53,9 @@ public class ThrownExpBottleController extends MobEntityController {
                 if (!npc.isProtected()) {
                     super.B_();
                 }
-
             } else {
                 super.B_();
             }
-
         }
 
         @Override
@@ -68,7 +66,6 @@ public class ThrownExpBottleController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -82,7 +79,6 @@ public class ThrownExpBottleController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -90,7 +86,6 @@ public class ThrownExpBottleController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new ThrownExpBottleNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/ThrownPotionController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/ThrownPotionController.java
index 84411ccc7..e9b70ba0c 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/ThrownPotionController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/ThrownPotionController.java
@@ -54,7 +54,6 @@ public class ThrownPotionController extends MobEntityController {
             } else {
                 super.B_();
             }
-
         }
 
         @Override
@@ -65,7 +64,6 @@ public class ThrownPotionController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -79,7 +77,6 @@ public class ThrownPotionController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -90,9 +87,7 @@ public class ThrownPotionController extends MobEntityController {
                 } else {
                     bukkitEntity = new SplashThrownPotionNPC(this);
                 }
-
             }
-
             return super.getBukkitEntity();
         }
 
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/TippedArrowController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/TippedArrowController.java
index d7f2ed646..89ce9edf8 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/TippedArrowController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/TippedArrowController.java
@@ -53,7 +53,6 @@ public class TippedArrowController extends MobEntityController {
             } else {
                 super.B_();
             }
-
         }
 
         @Override
@@ -64,7 +63,6 @@ public class TippedArrowController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -78,7 +76,6 @@ public class TippedArrowController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -86,7 +83,6 @@ public class TippedArrowController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new TippedArrowNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/WitherSkullController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/WitherSkullController.java
index 60de38c2f..7b07ac2c9 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/WitherSkullController.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/WitherSkullController.java
@@ -53,7 +53,6 @@ public class WitherSkullController extends MobEntityController {
             } else {
                 super.B_();
             }
-
         }
 
         @Override
@@ -64,7 +63,6 @@ public class WitherSkullController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -78,7 +76,6 @@ public class WitherSkullController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -86,7 +83,6 @@ public class WitherSkullController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new WitherSkullNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/CitizensBlockBreaker.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/CitizensBlockBreaker.java
index 115c54abc..f303ca03f 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/CitizensBlockBreaker.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/CitizensBlockBreaker.java
@@ -47,7 +47,6 @@ public class CitizensBlockBreaker extends AbstractBlockBreaker {
             ItemStack current = getCurrentItem();
             return current != null ? current.b(block) : false;
         }
-
     }
 
     @Override
@@ -65,13 +64,10 @@ public class CitizensBlockBreaker extends AbstractBlockBreaker {
                 if (i > 0) {
                     f += i * i + 1;
                 }
-
             }
-
             if (handle.hasEffect(MobEffects.FASTER_DIG)) {
                 f *= 1.0F + (handle.getEffect(MobEffects.FASTER_DIG).getAmplifier() + 1) * 0.2F;
             }
-
             if (handle.hasEffect(MobEffects.SLOWER_DIG)) {
                 float f1 = 1.0F;
                 switch (handle.getEffect(MobEffects.SLOWER_DIG).getAmplifier()) {
@@ -88,20 +84,15 @@ public class CitizensBlockBreaker extends AbstractBlockBreaker {
                     default:
                         f1 = 8.1E-4F;
                 }
-
                 f *= f1;
             }
-
             if (handle.a(Material.WATER) && !EnchantmentManager.i(handle)) {
                 f /= 5.0F;
             }
-
         }
-
         if (!getHandle().onGround) {
             f /= 5.0F;
         }
-
         return f;
     }
 }
\ No newline at end of file
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/EmptyAdvancementDataPlayer.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/EmptyAdvancementDataPlayer.java
index 198752d9a..e8a90db92 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/EmptyAdvancementDataPlayer.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/EmptyAdvancementDataPlayer.java
@@ -66,7 +66,6 @@ public class EmptyAdvancementDataPlayer extends AdvancementDataPlayer {
         } catch (IllegalAccessException e) {
             e.printStackTrace();
         }
-
     }
 
     private static final Field G = NMS.getField(AdvancementDataPlayer.class, "g");
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/NMSImpl.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/NMSImpl.java
index 92b1d36d4..b83b34363 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/NMSImpl.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/NMSImpl.java
@@ -300,7 +300,6 @@ public class NMSImpl implements NMSBridge {
         } else if (!handle.world.players.contains(handle)) {
             handle.world.players.add(handle);
         }
-
     }
 
     @Override
@@ -313,7 +312,6 @@ public class NMSImpl implements NMSBridge {
             PlayerAnimation.ARM_SWING.play(humanHandle.getBukkitEntity());
             return;
         }
-
         AttributeInstance attackDamage = handle.getAttributeInstance(GenericAttributes.ATTACK_DAMAGE);
         float f = (float) (attackDamage == null ? 1 : attackDamage.getValue());
         int i = 0;
@@ -321,7 +319,6 @@ public class NMSImpl implements NMSBridge {
             f += EnchantmentManager.a(handle.getItemInMainHand(), target.getMonsterType());
             i += EnchantmentManager.a(Enchantments.KNOCKBACK, handle);
         }
-
         boolean flag = target.damageEntity(DamageSource.mobAttack(handle), f);
         if (!flag)
             return;
@@ -331,12 +328,10 @@ public class NMSImpl implements NMSBridge {
             handle.motX *= 0.6D;
             handle.motZ *= 0.6D;
         }
-
         int fireAspectLevel = EnchantmentManager.getFireAspectEnchantmentLevel(handle);
         if (fireAspectLevel > 0) {
             target.setOnFire(fireAspectLevel * 4);
         }
-
     }
 
     @Override
@@ -348,11 +343,9 @@ public class NMSImpl implements NMSBridge {
             } catch (Throwable t) {
                 t.printStackTrace();
             }
-
         } else if (handle instanceof EntityHumanNPC) {
             ((EntityHumanNPC) handle).getControllerMove().f = false;
         }
-
     }
 
     @Override
@@ -385,19 +378,14 @@ public class NMSImpl implements NMSBridge {
                         if (!changed && !ItemStack.matches(old, curr)) {
                             changed = true;
                         }
-
                         equipment.put(slot, curr);
                     }
-
                     if (changed) {
                         for (EnumItemSlot slot : EnumItemSlot.values()) {
                             agg.send(new PacketPlayOutEntityEquipment(handle.getId(), slot, equipment.get(slot)));
                         }
-
                     }
-
                 }
-
                 tracker.track(Lists.newArrayList(tracker.trackedPlayers));
             }
 
@@ -417,9 +405,7 @@ public class NMSImpl implements NMSBridge {
                     if (callback != null) {
                         callback.accept(entity);
                     }
-
                 }
-
                 tracker.trackedPlayers.clear();
             }
         };
@@ -467,10 +453,8 @@ public class NMSImpl implements NMSBridge {
                 bserver = (BossBattleServer) ENDERDRAGON_BATTLE_BAR_FIELD
                         .get(ENDERDRAGON_BATTLE_FIELD.get(NMSImpl.getHandle(entity)));
             }
-
         } catch (Exception e) {
         }
-
         if (bserver == null)
             return null;
         BossBar ret = Bukkit.createBossBar("", BarColor.BLUE, BarStyle.SEGMENTED_10);
@@ -478,7 +462,6 @@ public class NMSImpl implements NMSBridge {
             CRAFT_BOSSBAR_HANDLE_FIELD.set(ret, bserver);
         } catch (Exception e) {
         }
-
         return ret;
     }
 
@@ -496,7 +479,6 @@ public class NMSImpl implements NMSBridge {
         if (aabb == null) {
             aabb = world.getType(pos).e(world, pos);
         }
-
         return new BoundingBox(aabb.a, aabb.b, aabb.c, aabb.d, aabb.e, aabb.f);
     }
 
@@ -596,15 +578,12 @@ public class NMSImpl implements NMSBridge {
             } catch (Exception e) {
                 return null;
             }
-
         }
-
         try {
             return (GameProfile) SKULL_PROFILE_FIELD.get(meta);
         } catch (Exception e) {
             return null;
         }
-
     }
 
     @Override
@@ -617,7 +596,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Exception e) {
             throw new CommandException(Messages.INVALID_SOUND);
         }
-
     }
 
     @Override
@@ -633,7 +611,6 @@ public class NMSImpl implements NMSBridge {
         EntityLiving handle = NMSImpl.getHandle((LivingEntity) npc.getEntity());
         if (handle == null) {
         }
-
         return DEFAULT_SPEED;
         // return (float)
         // handle.getAttributeInstance(GenericAttributes.d).getValue();
@@ -677,9 +654,7 @@ public class NMSImpl implements NMSBridge {
             } else {
                 ((EntityInsentient) raw).a(PathType.WATER, oldWater + 1F);
             }
-
         }
-
         navigation.r().b(params.hasExaminer(DoorExaminer.class));
         return new MCNavigator() {
             float lastSpeed;
@@ -692,7 +667,6 @@ public class NMSImpl implements NMSBridge {
                     PathPoint pp = navigation.l().a(i);
                     blocks.add(entity.getWorld().getBlockAt(pp.a, pp.b, pp.c));
                 }
-
                 return blocks;
             }
 
@@ -712,16 +686,13 @@ public class NMSImpl implements NMSBridge {
                     List<org.bukkit.block.Block> blocks = getBlocks(entity, navigation);
                     Util.sendBlockChanges(blocks, null);
                 }
-
                 if (oldWater >= 0) {
                     if (raw instanceof EntityPlayer) {
                         ((EntityHumanNPC) raw).a(PathType.WATER, oldWater);
                     } else {
                         ((EntityInsentient) raw).a(PathType.WATER, oldWater);
                     }
-
                 }
-
                 stopNavigation(navigation);
             }
 
@@ -733,20 +704,16 @@ public class NMSImpl implements NMSBridge {
                     if (handle instanceof EntityHorse) {
                         handle.width = Math.min(0.99f, oldWidth);
                     }
-
                     if (!function.apply(navigation)) {
                         reason = CancelReason.STUCK;
                     }
-
                     handle.width = oldWidth; // minecraft requires that an entity fit onto both blocks if width >= 1f,
                                              // but we'd prefer to make it just fit on 1 so hack around it a bit.
                     lastSpeed = params.speed();
                 }
-
                 if (params.debug() && !NMSImpl.isNavigationFinished(navigation)) {
                     Util.sendBlockChanges(getBlocks(entity, navigation), Material.YELLOW_FLOWER);
                 }
-
                 navigation.a(params.speed());
                 return NMSImpl.isNavigationFinished(navigation);
             }
@@ -931,37 +898,30 @@ public class NMSImpl implements NMSBridge {
             if (zDiff < 0.0) {
                 yaw += Math.abs(180 - yaw) * 2;
             }
-
             if (handle instanceof EntityEnderDragon) {
                 yaw = Util.getDragonYaw(handle.getBukkitEntity(), xDiff, zDiff);
             } else {
                 yaw = yaw - 90;
             }
-
             if (headOnly) {
                 setHeadYaw(entity, (float) yaw);
             } else {
                 look(entity, (float) yaw, (float) pitch);
             }
-
             return;
         }
-
         if (handle instanceof EntityInsentient) {
             ((EntityInsentient) handle).getControllerLook().a(to.getX(), to.getY(), to.getZ(),
                     ((EntityInsentient) handle).O(), ((EntityInsentient) handle).N());
             while (((EntityLiving) handle).aP >= 180F) {
                 ((EntityLiving) handle).aP -= 360F;
             }
-
             while (((EntityLiving) handle).aP < -180F) {
                 ((EntityLiving) handle).aP += 360F;
             }
-
         } else if (handle instanceof EntityHumanNPC) {
             ((EntityHumanNPC) handle).getNPC().getOrAddTrait(RotationTrait.class).getPhysicalSession().rotateToFace(to);
         }
-
     }
 
     @Override
@@ -975,22 +935,18 @@ public class NMSImpl implements NMSBridge {
             } else {
                 look(from, to.getLocation(), false, true);
             }
-
         } else if (handle instanceof EntityInsentient) {
             ((EntityInsentient) handle).getControllerLook().a(target, ((EntityInsentient) handle).O(),
                     ((EntityInsentient) handle).N());
             while (((EntityLiving) handle).aP >= 180F) {
                 ((EntityLiving) handle).aP -= 360F;
             }
-
             while (((EntityLiving) handle).aP < -180F) {
                 ((EntityLiving) handle).aP += 360F;
             }
-
         } else if (handle instanceof EntityHumanNPC) {
             ((EntityHumanNPC) handle).getNPC().getOrAddTrait(RotationTrait.class).getPhysicalSession().rotateToFace(to);
         }
-
     }
 
     @Override
@@ -1032,9 +988,7 @@ public class NMSImpl implements NMSBridge {
                         e.printStackTrace();
                         return super.getBukkitView();
                     }
-
                 }
-
                 return this.bukkitEntity;
             }
         };
@@ -1080,7 +1034,6 @@ public class NMSImpl implements NMSBridge {
                 if (entity1.dead || !entity1.w(entity)) {
                     entity.stopRiding();
                 }
-
             } else {
                 if (!entity.dead) {
                     try {
@@ -1091,22 +1044,17 @@ public class NMSImpl implements NMSBridge {
                         entity.appendEntityCrashDetails(crashreportsystemdetails);
                         throw new ReportedException(crashreport);
                     }
-
                 }
-
                 if (entity.dead) {
                     entity.world.removeEntity(entity);
                 } else if (!removeFromPlayerList) {
                     if (!entity.world.players.contains(entity)) {
                         entity.world.players.add(entity);
                     }
-
                 } else {
                     entity.world.players.remove(entity);
                 }
-
             }
-
         };
     }
 
@@ -1120,12 +1068,10 @@ public class NMSImpl implements NMSBridge {
             if (key == null) {
                 continue;
             }
-
             int code = ENTITY_REGISTRY.a(search);
             ENTITY_REGISTRY.put(code, key, (Class<? extends Entity>) clazz);
             return;
         }
-
         throw new IllegalArgumentException("unable to find valid entity superclass for class " + clazz.toString());
     }
 
@@ -1164,7 +1110,6 @@ public class NMSImpl implements NMSBridge {
             hook.hooked = null;
             hook.getBukkitEntity().remove();
         }
-
     }
 
     @Override
@@ -1186,13 +1131,10 @@ public class NMSImpl implements NMSBridge {
             } catch (IllegalAccessException e) {
                 e.printStackTrace();
             }
-
         }
-
         if (getHandle(entity) instanceof EntityHumanNPC) {
             ((EntityHumanNPC) getHandle(entity)).setTracked(replace);
         }
-
     }
 
     @Override
@@ -1202,11 +1144,9 @@ public class NMSImpl implements NMSBridge {
         if (bodyYaw == null) {
             bodyYaw = handle.yaw;
         }
-
         if (pitch == null) {
             pitch = handle.pitch;
         }
-
         List<Packet<?>> toSend = Lists.newArrayList();
         if (position) {
             EntityTrackerEntry entry = ((WorldServer) handle.world).getTracker().trackedEntities.get(handle.getId());
@@ -1219,18 +1159,15 @@ public class NMSImpl implements NMSBridge {
                 e.printStackTrace();
                 return;
             }
-
             toSend.add(new PacketPlayOutRelEntityMoveLook(handle.getId(), (short) dx, (short) dy, (short) dz,
                     (byte) (bodyYaw * 256.0F / 360.0F), (byte) (pitch * 256.0F / 360.0F), handle.onGround));
         } else {
             toSend.add(new PacketPlayOutEntityLook(handle.getId(), (byte) (bodyYaw * 256.0F / 360.0F),
                     (byte) (pitch * 256.0F / 360.0F), handle.onGround));
         }
-
         if (headYaw != null) {
             toSend.add(new PacketPlayOutEntityHeadRotation(handle, (byte) (headYaw * 256.0F / 360.0F)));
         }
-
         sendPacketsNearby(null, from.getLocation(), toSend, 64);
     }
 
@@ -1254,7 +1191,6 @@ public class NMSImpl implements NMSBridge {
             entities[i] = (EntityPlayer) skinnable;
             i++;
         }
-
         NMSImpl.sendPacket(recipient,
                 new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.REMOVE_PLAYER, entities));
     }
@@ -1275,14 +1211,12 @@ public class NMSImpl implements NMSBridge {
         if (TEAM_FIELD == null) {
             TEAM_FIELD = NMS.getGetter(team.getClass(), "team");
         }
-
         try {
             ScoreboardTeam nmsTeam = (ScoreboardTeam) TEAM_FIELD.invoke(team);
             sendPacket(recipient, new PacketPlayOutScoreboardTeam(nmsTeam, mode));
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     @Override
@@ -1310,7 +1244,6 @@ public class NMSImpl implements NMSBridge {
         } else if (handle instanceof EntityHumanNPC) {
             ((EntityHumanNPC) handle).setMoveDestination(x, y, z, speed);
         }
-
     }
 
     @Override
@@ -1335,7 +1268,6 @@ public class NMSImpl implements NMSBridge {
         if (!(handle instanceof EntityHuman)) {
             handle.aN = yaw;
         }
-
         handle.aP = yaw;
     }
 
@@ -1385,14 +1317,11 @@ public class NMSImpl implements NMSBridge {
             } catch (Exception e) {
                 return;
             }
-
         }
-
         try {
             SKULL_PROFILE_FIELD.set(meta, profile);
         } catch (Exception e) {
         }
-
     }
 
     @Override
@@ -1406,7 +1335,6 @@ public class NMSImpl implements NMSBridge {
         } else if (handle instanceof EntityHumanNPC) {
             ((EntityHumanNPC) handle).setShouldJump();
         }
-
     }
 
     @Override
@@ -1424,7 +1352,6 @@ public class NMSImpl implements NMSBridge {
         if (entity instanceof Player) {
             ((Player) entity).setSneaking(sneaking);
         }
-
     }
 
     @Override
@@ -1457,7 +1384,6 @@ public class NMSImpl implements NMSBridge {
         } catch (IllegalAccessException e) {
             e.printStackTrace();
         }
-
         return false;
     }
 
@@ -1470,7 +1396,6 @@ public class NMSImpl implements NMSBridge {
             setter.invoke(ENTITY_REGISTRY.get());
         } catch (Throwable e) {
         }
-
     }
 
     @Override
@@ -1503,7 +1428,6 @@ public class NMSImpl implements NMSBridge {
                     facingByte = (byte) 3;
                     break;
             }
-
             Location bedLoc = loc.clone().add(0, -loc.getY(), 0);
             PacketPlayOutBed bed = new PacketPlayOutBed(from,
                     new BlockPosition(bedLoc.getBlockX(), bedLoc.getBlockY(), bedLoc.getBlockZ()));
@@ -1522,7 +1446,6 @@ public class NMSImpl implements NMSBridge {
                 list.forEach(packet -> sendPacket(nearby, packet));
                 meta.set(nearby.getUniqueId(), entity.getUniqueId().toString(), System.currentTimeMillis());
             }
-
         } else {
             PacketPlayOutAnimation packet = new PacketPlayOutAnimation(from, 2);
             sendPacketNearby(entity, entity.getLocation(), packet, 64);
@@ -1530,11 +1453,8 @@ public class NMSImpl implements NMSBridge {
                 if (meta.remove(player.getUniqueId(), entity.getUniqueId().toString())) {
                     sendPacket(player, packet);
                 }
-
             }
-
         }
-
     }
 
     @Override
@@ -1550,7 +1470,6 @@ public class NMSImpl implements NMSBridge {
         if (RANDOM.nextFloat() <= 0.85F && (handle.aq() || handle.au())) {
             handle.motY += power;
         }
-
     }
 
     @Override
@@ -1578,7 +1497,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Exception e) {
             Messaging.logTr(Messages.ERROR_UPDATING_NAVIGATION_WORLD, e.getMessage());
         }
-
     }
 
     @Override
@@ -1590,10 +1508,8 @@ public class NMSImpl implements NMSBridge {
             if (en instanceof EntityHumanNPC) {
                 ((EntityHumanNPC) en).updatePathfindingRange(pathfindingRange);
             }
-
             return;
         }
-
         if (PATHFINDING_RANGE == null)
             return;
         EntityInsentient handle = (EntityInsentient) en;
@@ -1606,7 +1522,6 @@ public class NMSImpl implements NMSBridge {
         } catch (IllegalAccessException e) {
             e.printStackTrace();
         }
-
     }
 
     private static class CitizensInventoryAnvil extends CraftInventoryAnvil implements ForwardingInventory {
@@ -1715,7 +1630,6 @@ public class NMSImpl implements NMSBridge {
             living.setPosition(living.locX - 0.01, living.locY, living.locZ - 0.01);
             living.setPosition(living.locX + 0.01, living.locY, living.locZ + 0.01);
         }
-
     }
 
     public static void clearGoals(PathfinderGoalSelector... goalSelectors) {
@@ -1728,9 +1642,7 @@ public class NMSImpl implements NMSBridge {
             } catch (Exception e) {
                 Messaging.logTr(Messages.ERROR_CLEARING_GOALS, e.getLocalizedMessage());
             }
-
         }
-
     }
 
     private static CompoundTag convertNBT(net.minecraft.server.v1_12_R1.NBTTagCompound tag) {
@@ -1740,7 +1652,6 @@ public class NMSImpl implements NMSBridge {
         for (String key : tag.c()) {
             tags.put(key, convertNBT(key, tag.get(key)));
         }
-
         return new CompoundTag("", tags);
     }
 
@@ -1771,10 +1682,8 @@ public class NMSImpl implements NMSBridge {
                 for (int i = 0; i < list.size(); i++) {
                     converted.add(convertNBT("", list.get(i)));
                 }
-
                 return new ListTag(key, tagType, converted);
             }
-
         } else if (base instanceof net.minecraft.server.v1_12_R1.NBTTagCompound)
             return convertNBT((net.minecraft.server.v1_12_R1.NBTTagCompound) base);
         else if (base instanceof net.minecraft.server.v1_12_R1.NBTTagEnd)
@@ -1792,16 +1701,13 @@ public class NMSImpl implements NMSBridge {
                 if (f5 > 3.0F) {
                     f5 = 3.0F;
                 }
-
                 if (!entity.onGround) {
                     f5 *= 0.5F;
                 }
-
                 if (f5 > 0.0F) {
                     f4 += (0.54600006F - f4) * f5 / 3.0F;
                     f3 += (entity.cy() - f3) * f5 / 3.0F;
                 }
-
                 entity.b(f, f1, f2, f3);
                 entity.move(EnumMoveType.SELF, entity.motX, entity.motY, entity.motZ);
                 entity.motX *= f4;
@@ -1810,12 +1716,10 @@ public class NMSImpl implements NMSBridge {
                 if (!entity.isNoGravity()) {
                     entity.motY -= 0.02D;
                 }
-
                 if (entity.positionChanged
                         && entity.c(entity.motX, entity.motY + 0.6000000238418579D - entity.locY + d2, entity.motZ)) {
                     entity.motY = 0.30000001192092896D;
                 }
-
             } else if (entity.au()) {
                 double d2 = entity.locY;
                 entity.b(f, f1, f2, 0.02F);
@@ -1826,17 +1730,14 @@ public class NMSImpl implements NMSBridge {
                 if (!entity.isNoGravity()) {
                     entity.motY -= 0.02D;
                 }
-
                 if (entity.positionChanged
                         && entity.c(entity.motX, entity.motY + 0.6000000238418579D - entity.locY + d2, entity.motZ)) {
                     entity.motY = 0.30000001192092896D;
                 }
-
             } else if (entity.cP()) {
                 if (entity.motY > -0.5D) {
                     entity.fallDistance = 1.0F;
                 }
-
                 Vec3D vec3d = entity.aJ();
                 float f6 = entity.pitch * 0.017453292F;
                 double d0 = Math.sqrt(vec3d.x * vec3d.x + vec3d.z * vec3d.z);
@@ -1851,19 +1752,16 @@ public class NMSImpl implements NMSBridge {
                     entity.motX += vec3d.x * d4 / d0;
                     entity.motZ += vec3d.z * d4 / d0;
                 }
-
                 if (f6 < 0.0F) {
                     double d4 = d1 * -MathHelper.sin(f6) * 0.04D;
                     entity.motY += d4 * 3.2D;
                     entity.motX -= vec3d.x * d4 / d0;
                     entity.motZ -= vec3d.z * d4 / d0;
                 }
-
                 if (d0 > 0.0D) {
                     entity.motX += (vec3d.x / d0 * d1 - entity.motX) * 0.1D;
                     entity.motZ += (vec3d.z / d0 * d1 - entity.motZ) * 0.1D;
                 }
-
                 entity.motX *= 0.9900000095367432D;
                 entity.motY *= 0.9800000190734863D;
                 entity.motZ *= 0.9900000095367432D;
@@ -1876,14 +1774,11 @@ public class NMSImpl implements NMSBridge {
                         entity.a(f8 > 4 ? SoundEffects.bQ : SoundEffects.bY, 1.0F, 1.0F);
                         entity.damageEntity(DamageSource.FLY_INTO_WALL, f8);
                     }
-
                 }
-
                 if (entity.onGround && !entity.world.isClientSide && entity.getFlag(7)
                         && !CraftEventFactory.callToggleGlideEvent(entity, false).isCancelled()) {
                     entity.setFlag(7, false);
                 }
-
             } else {
                 float f9 = 0.91F;
                 BlockPosition.PooledBlockPosition blockposition_pooledblockposition = BlockPosition.PooledBlockPosition
@@ -1891,7 +1786,6 @@ public class NMSImpl implements NMSBridge {
                 if (entity.onGround) {
                     f9 = entity.world.getType(blockposition_pooledblockposition).getBlock().frictionFactor * 0.91F;
                 }
-
                 float f4 = 0.16277136F / (f9 * f9 * f9);
                 float f3;
                 if (entity.onGround) {
@@ -1899,14 +1793,12 @@ public class NMSImpl implements NMSBridge {
                 } else {
                     f3 = entity.aR;
                 }
-
                 entity.b(f, f1, f2, f3);
                 f9 = 0.91F;
                 if (entity.onGround) {
                     f9 = entity.world.getType(blockposition_pooledblockposition.e(entity.locX,
                             entity.getBoundingBox().b - 1.0D, entity.locZ)).getBlock().frictionFactor * 0.91F;
                 }
-
                 if (entity.m_()) {
                     entity.motX = MathHelper.a(entity.motX, -0.15000000596046448D, 0.15000000596046448D);
                     entity.motZ = MathHelper.a(entity.motZ, -0.15000000596046448D, 0.15000000596046448D);
@@ -1914,19 +1806,15 @@ public class NMSImpl implements NMSBridge {
                     if (entity.motY < -0.15D) {
                         entity.motY = -0.15D;
                     }
-
                     boolean flag = entity.isSneaking();
                     if (flag && entity.motY < 0.0D) {
                         entity.motY = 0.0D;
                     }
-
                 }
-
                 entity.move(EnumMoveType.SELF, entity.motX, entity.motY, entity.motZ);
                 if (entity.positionChanged && entity.m_()) {
                     entity.motY = 0.2D;
                 }
-
                 if (entity.hasEffect(MobEffects.LEVITATION)) {
                     entity.motY += (0.05D * (entity.getEffect(MobEffects.LEVITATION).getAmplifier() + 1) - entity.motY)
                             * 0.2D;
@@ -1939,21 +1827,16 @@ public class NMSImpl implements NMSBridge {
                         } else {
                             entity.motY = 0.0D;
                         }
-
                     } else if (!entity.isNoGravity()) {
                         entity.motY -= 0.08D;
                     }
-
                 }
-
                 entity.motY *= 0.9800000190734863D;
                 entity.motX *= f9;
                 entity.motZ *= f9;
                 blockposition_pooledblockposition.t();
             }
-
         }
-
         entity.aF = entity.aG;
         double d2 = entity.locX - entity.lastX;
         double d0 = entity.locZ - entity.lastZ;
@@ -1962,7 +1845,6 @@ public class NMSImpl implements NMSBridge {
         if (f10 > 1.0F) {
             f10 = 1.0F;
         }
-
         entity.aG += (f10 - entity.aG) * 0.4F;
         entity.aH += entity.aG;
     }
@@ -1993,7 +1875,6 @@ public class NMSImpl implements NMSBridge {
         } catch (IllegalAccessException e) {
             e.printStackTrace();
         }
-
         return null;
     }
 
@@ -2015,7 +1896,6 @@ public class NMSImpl implements NMSBridge {
         } catch (IllegalAccessException e) {
             e.printStackTrace();
         }
-
     }
 
     public static boolean isLeashed(NPC npc, Supplier<Boolean> isLeashed, EntityInsentient entity) {
@@ -2038,7 +1918,6 @@ public class NMSImpl implements NMSBridge {
         if (mat != null) {
             minecart.setDisplayBlock(Block.getById(mat.getId()).fromLegacyData(data));
         }
-
         minecart.setDisplayBlockOffset(offset);
     }
 
@@ -2066,13 +1945,10 @@ public class NMSImpl implements NMSBridge {
                     || location.distanceSquared(player.getLocation(PACKET_CACHE_LOCATION)) > radius) {
                 continue;
             }
-
             for (Packet<?> packet : packets) {
                 NMSImpl.sendPacket(player, packet);
             }
-
         }
-
     }
 
     public static void sendPacketsNearby(Player from, Location location, Packet<?>... packets) {
@@ -2085,7 +1961,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     public static void setSize(Entity entity, float f, float f1, boolean justCreated) {
@@ -2099,9 +1974,7 @@ public class NMSImpl implements NMSBridge {
             if (entity.width > f2 && !justCreated && !entity.world.isClientSide) {
                 entity.move(EnumMoveType.SELF, (f2 - entity.width) / 2, 0.0D, (f2 - entity.width) / 2);
             }
-
         }
-
     }
 
     public static void stopNavigation(NavigationAbstract navigation) {
@@ -2119,7 +1992,6 @@ public class NMSImpl implements NMSBridge {
         } else if (entity instanceof EntityHumanNPC) {
             ((EntityHumanNPC) entity).updateAI();
         }
-
     }
 
     public static void updateNavigation(NavigationAbstract navigation) {
@@ -2172,7 +2044,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             Messaging.logTr(Messages.ERROR_GETTING_ID_MAPPING, e.getMessage());
         }
-
         try {
             MAKE_REQUEST = YggdrasilAuthenticationService.class.getDeclaredMethod("makeRequest", URL.class,
                     Object.class, Class.class);
@@ -2180,7 +2051,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Exception ex) {
             ex.printStackTrace();
         }
-
         try {
             ENDERMAN_ANGRY = (DataWatcherObject<Boolean>) NMS.getField(EntityEnderman.class, "by").get(null);
         } catch (IllegalArgumentException e) {
@@ -2188,6 +2058,5 @@ public class NMSImpl implements NMSBridge {
         } catch (IllegalAccessException e) {
             e.printStackTrace();
         }
-
     }
 }
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/PlayerAnimationImpl.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/PlayerAnimationImpl.java
index 1ef2b2e21..129a72f92 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/PlayerAnimationImpl.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/PlayerAnimationImpl.java
@@ -21,7 +21,6 @@ public class PlayerAnimationImpl {
             playDefaultAnimation(player, to, DEFAULTS.get(animation));
             return;
         }
-
         switch (animation) {
             case SNEAK:
                 player.getBukkitEntity().setSneaking(true);
@@ -52,7 +51,6 @@ public class PlayerAnimationImpl {
             default:
                 throw new UnsupportedOperationException();
         }
-
     }
 
     protected static void playDefaultAnimation(EntityPlayer player, Iterable<Player> to, int code) {
@@ -64,7 +62,6 @@ public class PlayerAnimationImpl {
         for (Player player : to) {
             NMSImpl.sendPacket(player, packet);
         }
-
     }
 
     private static EnumMap<PlayerAnimation, Integer> DEFAULTS = Maps.newEnumMap(PlayerAnimation.class);
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/PlayerControllerMove.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/PlayerControllerMove.java
index 17e4a0c84..6faaec417 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/PlayerControllerMove.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/PlayerControllerMove.java
@@ -44,7 +44,6 @@ public class PlayerControllerMove extends ControllerMove {
                 this.a.bf = 0.0F;
                 return;
             }
-
             float f = (float) Math.toDegrees(Math.atan2(d1, d0)) - 90.0F;
             this.a.yaw = a(this.a.yaw, f, 90.0F);
             NMS.setHeadYaw(a.getBukkitEntity(), this.a.yaw);
@@ -62,11 +61,8 @@ public class PlayerControllerMove extends ControllerMove {
                 } else {
                     ((EntityInsentient) this.a).getControllerJump().a();
                 }
-
             }
-
         }
-
     }
 
     @Override
@@ -84,18 +80,15 @@ public class PlayerControllerMove extends ControllerMove {
         if (f3 > f2) {
             f3 = f2;
         }
-
         if (f3 < -f2) {
             f3 = -f2;
         }
-
         float f4 = f + f3;
         if (f4 < 0.0F) {
             f4 += 360.0F;
         } else if (f4 > 360.0F) {
             f4 -= 360.0F;
         }
-
         return f4;
     }
 
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/PlayerNavigation.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/PlayerNavigation.java
index ff71763c6..fc8e65255 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/PlayerNavigation.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/PlayerNavigation.java
@@ -114,11 +114,8 @@ public class PlayerNavigation extends NavigationAbstract {
                             || localPathType == PathType.DAMAGE_OTHER)
                         return false;
                 }
-
             }
-
         }
-
         return true;
     }
 
@@ -128,11 +125,9 @@ public class PlayerNavigation extends NavigationAbstract {
             this.c = null;
             return false;
         }
-
         if (!paramPathEntity.a(this.c)) {
             this.c = paramPathEntity;
         }
-
         q_();
         if (this.c.d() <= 0)
             return false;
@@ -149,11 +144,9 @@ public class PlayerNavigation extends NavigationAbstract {
             if (paramVec3D.distanceSquared(this.k) < 2.25D) {
                 p();
             }
-
             this.j = this.e;
             this.k = paramVec3D;
         }
-
         if (this.c != null && !this.c.b()) {
             Vec3D localVec3D = this.c.f();
             if (localVec3D.equals(this.l)) {
@@ -163,17 +156,14 @@ public class PlayerNavigation extends NavigationAbstract {
                 double d1 = paramVec3D.f(this.l);
                 this.o = this.a.cy() > 0.0F ? d1 / this.a.cy() * 1000.0D : 0.0D;
             }
-
             if (this.o > 0.0D && this.m > this.o * 3.0D) {
                 this.l = Vec3D.a;
                 this.m = 0L;
                 this.o = 0.0D;
                 p();
             }
-
             this.n = System.currentTimeMillis();
         }
-
     }
 
     @Override
@@ -201,11 +191,9 @@ public class PlayerNavigation extends NavigationAbstract {
         if (d1 >= 0.0D) {
             d7 += 1.0D;
         }
-
         if (d2 >= 0.0D) {
             d8 += 1.0D;
         }
-
         d7 /= d1;
         d8 /= d2;
         int m = d1 < 0.0D ? -1 : 1;
@@ -224,11 +212,9 @@ public class PlayerNavigation extends NavigationAbstract {
                 k += n;
                 i4 = i2 - k;
             }
-
             if (!a(j, (int) paramVec3D1.y, k, paramInt1, paramInt2, paramInt3, paramVec3D1, d1, d2))
                 return false;
         }
-
         return true;
     }
 
@@ -245,27 +231,22 @@ public class PlayerNavigation extends NavigationAbstract {
             while (localBlockPosition.getY() > 0 && this.b.getType(localBlockPosition).getMaterial() == Material.AIR) {
                 localBlockPosition = localBlockPosition.down();
             }
-
             if (localBlockPosition.getY() > 0)
                 return b2(localBlockPosition.up());
             while (localBlockPosition.getY() < this.b.getHeight()
                     && this.b.getType(localBlockPosition).getMaterial() == Material.AIR) {
                 localBlockPosition = localBlockPosition.up();
             }
-
             paramBlockPosition = localBlockPosition;
         }
-
         if (this.b.getType(paramBlockPosition).getMaterial().isBuildable()) {
             localBlockPosition = paramBlockPosition.up();
             while (localBlockPosition.getY() < this.b.getHeight()
                     && this.b.getType(localBlockPosition).getMaterial().isBuildable()) {
                 localBlockPosition = localBlockPosition.up();
             }
-
             return b2(localBlockPosition);
         }
-
         return b2(paramBlockPosition);
     }
 
@@ -284,9 +265,7 @@ public class PlayerNavigation extends NavigationAbstract {
                 if (!localBlock.b(this.b, localBlockPosition))
                     return false;
             }
-
         }
-
         return true;
     }
 
@@ -322,7 +301,6 @@ public class PlayerNavigation extends NavigationAbstract {
         if (this.g) {
             k();
         }
-
         if (o())
             return;
         if (b()) {
@@ -335,9 +313,7 @@ public class PlayerNavigation extends NavigationAbstract {
                     && MathHelper.floor(localVec3D.z) == MathHelper.floor(localObject.z)) {
                 this.c.c(this.c.e() + 1);
             }
-
         }
-
         m();
         if (o())
             return;
@@ -380,11 +356,9 @@ public class PlayerNavigation extends NavigationAbstract {
                 this.p = this.b.getTime();
                 this.g = false;
             }
-
         } else {
             this.g = true;
         }
-
     }
 
     @Override
@@ -405,9 +379,7 @@ public class PlayerNavigation extends NavigationAbstract {
                 i1 = i2;
                 break;
             }
-
         }
-
         this.f = this.a.width > 0.75F ? this.a.width / 2.0F : 0.75F - this.a.width / 2.0F;
         Vec3D localVec3D2 = this.c.f();
         if (MathHelper.e((float) (this.a.locX - (localVec3D2.x + 0.5D))) < this.f
@@ -415,7 +387,6 @@ public class PlayerNavigation extends NavigationAbstract {
                 && Math.abs(this.a.locY - localVec3D2.y) < 1.0D) {
             this.c.c(this.c.e() + 1);
         }
-
         int i3 = MathHelper.f(this.a.width);
         int i4 = MathHelper.f(this.a.length);
         int i5 = i3;
@@ -424,9 +395,7 @@ public class PlayerNavigation extends NavigationAbstract {
                 this.c.c(i6);
                 break;
             }
-
         }
-
         a(localVec3D1);
     }
 
@@ -458,11 +427,8 @@ public class PlayerNavigation extends NavigationAbstract {
                     this.c.b(j - 1);
                     return;
                 }
-
             }
-
         }
-
     }
 
     @Override
@@ -486,7 +452,6 @@ public class PlayerNavigation extends NavigationAbstract {
             if (k > 16)
                 return (int) this.a.getBoundingBox().b;
         }
-
         return j;
     }
 
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/PlayerPathfinder.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/PlayerPathfinder.java
index 00e23bbed..2648aa536 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/PlayerPathfinder.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/PlayerPathfinder.java
@@ -54,7 +54,6 @@ public class PlayerPathfinder extends Pathfinder {
             i++;
             localPathPoint = localPathPoint.h;
         }
-
         PathPoint[] arrayOfPathPoint = new PathPoint[i];
         localPathPoint = paramPathPoint2;
         arrayOfPathPoint[--i] = localPathPoint;
@@ -62,7 +61,6 @@ public class PlayerPathfinder extends Pathfinder {
             localPathPoint = localPathPoint.h;
             arrayOfPathPoint[--i] = localPathPoint;
         }
-
         return new PathEntity(arrayOfPathPoint);
     }
 
@@ -80,17 +78,14 @@ public class PlayerPathfinder extends Pathfinder {
             if (i >= 200) {
                 break;
             }
-
             PathPoint localObject2 = this.a.c();
             if (localObject2.equals(paramPathPoint2)) {
                 localObject1 = paramPathPoint2;
                 break;
             }
-
             if (localObject2.c(paramPathPoint2) < ((PathPoint) localObject1).c(paramPathPoint2)) {
                 localObject1 = localObject2;
             }
-
             localObject2.i = true;
             int j = this.d.a(this.c, localObject2, paramPathPoint2, paramFloat);
             for (int k = 0; k < j; k++) {
@@ -109,13 +104,9 @@ public class PlayerPathfinder extends Pathfinder {
                         localPathPoint.g = localPathPoint.e + localPathPoint.f;
                         this.a.a(localPathPoint);
                     }
-
                 }
-
             }
-
         }
-
         if (localObject1 == paramPathPoint1)
             return null;
         Object localObject2 = pa(paramPathPoint1, (PathPoint) localObject1);
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/PlayerPathfinderAbstract.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/PlayerPathfinderAbstract.java
index 33d576c6d..9197b7367 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/PlayerPathfinderAbstract.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/PlayerPathfinderAbstract.java
@@ -40,7 +40,6 @@ public abstract class PlayerPathfinderAbstract extends PathfinderAbstract {
             localPathPoint = new PathPoint(paramInt1, paramInt2, paramInt3);
             this.c.a(j, localPathPoint);
         }
-
         return localPathPoint;
     }
 
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/PlayerPathfinderNormal.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/PlayerPathfinderNormal.java
index aa41eee88..be5f5600f 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/PlayerPathfinderNormal.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/PlayerPathfinderNormal.java
@@ -59,13 +59,10 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
             if (localPathType2 == PathType.DAMAGE_FIRE || localBlock == Blocks.df) {
                 localPathType1 = PathType.DAMAGE_FIRE;
             }
-
             if (localPathType2 == PathType.DAMAGE_CACTUS) {
                 localPathType1 = PathType.DAMAGE_CACTUS;
             }
-
         }
-
         localPathType1 = a(paramIBlockAccess, paramInt1, paramInt2, paramInt3, localPathType1);
         return localPathType1;
     }
@@ -87,9 +84,7 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
             if (paramEntityInsentient.a(localPathType2) >= paramEntityInsentient.a((PathType) localObject)) {
                 localObject = localPathType2;
             }
-
         }
-
         if (localPathType1 == PathType.OPEN && paramEntityInsentient.a((PathType) localObject) == 0.0F)
             return PathType.OPEN;
         return (PathType) localObject;
@@ -113,9 +108,7 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
             if (paramEntityInsentient.a(localPathType2) >= paramEntityInsentient.a((PathType) localObject)) {
                 localObject = localPathType2;
             }
-
         }
-
         if (localPathType1 == PathType.OPEN && paramEntityInsentient.a((PathType) localObject) == 0.0F)
             return PathType.OPEN;
         return (PathType) localObject;
@@ -134,11 +127,9 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                     if (localPathType == PathType.DOOR_WOOD_CLOSED && paramBoolean1 && paramBoolean2) {
                         localPathType = PathType.WALKABLE;
                     }
-
                     if (localPathType == PathType.DOOR_OPEN && !paramBoolean2) {
                         localPathType = PathType.BLOCKED;
                     }
-
                     if (localPathType == PathType.RAIL
                             && !(paramIBlockAccess.getType(paramBlockPosition)
                                     .getBlock() instanceof BlockMinecartTrackAbstract)
@@ -146,18 +137,13 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                                     .getBlock() instanceof BlockMinecartTrackAbstract)) {
                         localPathType = PathType.FENCE;
                     }
-
                     if (i == 0 && k == 0 && m == 0) {
                         paramPathType = localPathType;
                     }
-
                     paramEnumSet.add(localPathType);
                 }
-
             }
-
         }
-
         return paramPathType;
     }
 
@@ -176,15 +162,10 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                         } else if (localBlock == Blocks.FIRE) {
                             paramPathType = PathType.DANGER_FIRE;
                         }
-
                     }
-
                 }
-
             }
-
         }
-
         localPooledBlockPosition.t();
         return paramPathType;
     }
@@ -198,7 +179,6 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
         if (this.b.a(localPathType) >= 0.0F) {
             k = MathHelper.d(Math.max(1.0F, this.b.P));
         }
-
         BlockPosition localBlockPosition = new BlockPosition(paramPathPoint1.a, paramPathPoint1.b, paramPathPoint1.c)
                 .down();
         double d = paramPathPoint1.b - (1.0D - this.a.getType(localBlockPosition).e(this.a, localBlockPosition).e);
@@ -213,19 +193,15 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
         if (localPathPoint1 != null && !localPathPoint1.i && localPathPoint1.a(paramPathPoint2) < paramFloat) {
             paramArrayOfPathPoint[i++] = localPathPoint1;
         }
-
         if (localPathPoint2 != null && !localPathPoint2.i && localPathPoint2.a(paramPathPoint2) < paramFloat) {
             paramArrayOfPathPoint[i++] = localPathPoint2;
         }
-
         if (localPathPoint3 != null && !localPathPoint3.i && localPathPoint3.a(paramPathPoint2) < paramFloat) {
             paramArrayOfPathPoint[i++] = localPathPoint3;
         }
-
         if (localPathPoint4 != null && !localPathPoint4.i && localPathPoint4.a(paramPathPoint2) < paramFloat) {
             paramArrayOfPathPoint[i++] = localPathPoint4;
         }
-
         int m = localPathPoint4 == null || localPathPoint4.m == PathType.OPEN || localPathPoint4.l != 0.0F ? 1 : 0;
         int n = localPathPoint1 == null || localPathPoint1.m == PathType.OPEN || localPathPoint1.l != 0.0F ? 1 : 0;
         int i1 = localPathPoint3 == null || localPathPoint3.m == PathType.OPEN || localPathPoint3.l != 0.0F ? 1 : 0;
@@ -237,36 +213,28 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
             if (localPathPoint5 != null && !localPathPoint5.i && localPathPoint5.a(paramPathPoint2) < paramFloat) {
                 paramArrayOfPathPoint[i++] = localPathPoint5;
             }
-
         }
-
         if (m != 0 && i1 != 0) {
             localPathPoint5 = pa(paramPathPoint1.a + 1, paramPathPoint1.b, paramPathPoint1.c - 1, k, d,
                     EnumDirection.NORTH);
             if (localPathPoint5 != null && !localPathPoint5.i && localPathPoint5.a(paramPathPoint2) < paramFloat) {
                 paramArrayOfPathPoint[i++] = localPathPoint5;
             }
-
         }
-
         if (n != 0 && i2 != 0) {
             localPathPoint5 = pa(paramPathPoint1.a - 1, paramPathPoint1.b, paramPathPoint1.c + 1, k, d,
                     EnumDirection.SOUTH);
             if (localPathPoint5 != null && !localPathPoint5.i && localPathPoint5.a(paramPathPoint2) < paramFloat) {
                 paramArrayOfPathPoint[i++] = localPathPoint5;
             }
-
         }
-
         if (n != 0 && i1 != 0) {
             localPathPoint5 = pa(paramPathPoint1.a + 1, paramPathPoint1.b, paramPathPoint1.c + 1, k, d,
                     EnumDirection.SOUTH);
             if (localPathPoint5 != null && !localPathPoint5.i && localPathPoint5.a(paramPathPoint2) < paramFloat) {
                 paramArrayOfPathPoint[i++] = localPathPoint5;
             }
-
         }
-
         return i;
     }
 
@@ -285,7 +253,6 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                         MathHelper.floor(this.b.locZ));
                 localObject2 = this.a.getType(localObject1).getBlock();
             }
-
         } else if (this.b.onGround) {
             i = MathHelper.floor(this.b.getBoundingBox().b + 0.5D);
         } else {
@@ -294,10 +261,8 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                     || this.a.getType(localObject1).getBlock().b(this.a, localObject1)) && localObject1.getY() > 0) {
                 localObject1 = localObject1.down();
             }
-
             i = localObject1.up().getY();
         }
-
         localObject1 = new BlockPosition(this.b);
         Object localObject2 = pa(this.b, localObject1.getX(), i, localObject1.getZ());
         if (this.b.a((PathType) localObject2) < 0.0F) {
@@ -311,9 +276,7 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                 if (this.b.a(localPathType) >= 0.0F)
                     return a(localBlockPosition.getX(), localBlockPosition.getY(), localBlockPosition.getZ());
             }
-
         }
-
         return a(localObject1.getX(), i, localObject1.getZ());
     }
 
@@ -342,7 +305,6 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
             localPathPoint.m = localPathType1;
             localPathPoint.l = Math.max(localPathPoint.l, f);
         }
-
         if (localPathType1 == PathType.WALKABLE)
             return localPathPoint;
         if (localPathPoint == null && paramInt4 > 0 && localPathType1 != PathType.FENCE
@@ -359,11 +321,8 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                 if (this.b.world.a(localAxisAlignedBB3)) {
                     localPathPoint = null;
                 }
-
             }
-
         }
-
         if (localPathType1 == PathType.OPEN) {
             AxisAlignedBB localAxisAlignedBB4 = new AxisAlignedBB(paramInt1 - d2 + 0.5D, paramInt2 + 0.001D,
                     paramInt3 - d2 + 0.5D, paramInt1 + d2 + 0.5D, paramInt2 + this.b.length, paramInt3 + d2 + 0.5D);
@@ -377,9 +336,7 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                     localPathPoint.l = Math.max(localPathPoint.l, f);
                     return localPathPoint;
                 }
-
             }
-
             int i = 0;
             while (paramInt2 > 0 && localPathType1 == PathType.OPEN) {
                 paramInt2--;
@@ -393,11 +350,8 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                     localPathPoint.l = Math.max(localPathPoint.l, f);
                 } else if (f < 0.0F)
                     return null;
-
             }
-
         }
-
         return localPathPoint;
     }
 
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/PlayerlistTrackerEntry.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/PlayerlistTrackerEntry.java
index 57d45199c..a10f571c2 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/PlayerlistTrackerEntry.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/PlayerlistTrackerEntry.java
@@ -43,14 +43,12 @@ public class PlayerlistTrackerEntry extends EntityTrackerEntry {
                         if (res == null) {
                             updateLastPlayer(player);
                         }
-
                         return res;
                     }
                 });
             } catch (Throwable e) {
                 e.printStackTrace();
             }
-
         } else {
             try {
                 Set<EntityPlayer> delegate = super.trackedPlayers;
@@ -61,7 +59,6 @@ public class PlayerlistTrackerEntry extends EntityTrackerEntry {
                         if (res) {
                             updateLastPlayer(player);
                         }
-
                         return res;
                     }
 
@@ -73,9 +70,7 @@ public class PlayerlistTrackerEntry extends EntityTrackerEntry {
             } catch (Throwable e) {
                 e.printStackTrace();
             }
-
         }
-
     }
 
     public PlayerlistTrackerEntry(EntityTrackerEntry entry) {
@@ -91,7 +86,6 @@ public class PlayerlistTrackerEntry extends EntityTrackerEntry {
             Bukkit.getPluginManager().callEvent(
                     new NPCLinkToPlayerEvent(((NPCHolder) tracker).getNPC(), lastUpdatedPlayer.getBukkitEntity()));
         }
-
     }
 
     @Override
@@ -115,11 +109,8 @@ public class PlayerlistTrackerEntry extends EntityTrackerEntry {
                 } catch (Throwable e) {
                     e.printStackTrace();
                 }
-
             }
-
         }
-
         super.updatePlayer(entityplayer);
     }
 
@@ -131,7 +122,6 @@ public class PlayerlistTrackerEntry extends EntityTrackerEntry {
         } catch (IllegalAccessException e) {
             e.printStackTrace();
         }
-
         return 0;
     }
 
@@ -143,7 +133,6 @@ public class PlayerlistTrackerEntry extends EntityTrackerEntry {
         } catch (IllegalAccessException e) {
             e.printStackTrace();
         }
-
         return 0;
     }
 
@@ -155,7 +144,6 @@ public class PlayerlistTrackerEntry extends EntityTrackerEntry {
         } catch (IllegalAccessException e) {
             e.printStackTrace();
         }
-
         return 0;
     }
 
@@ -167,7 +155,6 @@ public class PlayerlistTrackerEntry extends EntityTrackerEntry {
         } catch (IllegalAccessException e) {
             e.printStackTrace();
         }
-
         return null;
     }
 
@@ -179,7 +166,6 @@ public class PlayerlistTrackerEntry extends EntityTrackerEntry {
         } catch (IllegalAccessException e) {
             e.printStackTrace();
         }
-
         return false;
     }
 
@@ -201,9 +187,7 @@ public class PlayerlistTrackerEntry extends EntityTrackerEntry {
                 TRACKING_MAP_SETTER = NMS.getFirstSetter(EntityTrackerEntry.class, Map.class);
                 TRACKING_MAP_GETTER = NMS.getFirstGetter(EntityTrackerEntry.class, Map.class);
             }
-
         } catch (Exception e) {
         }
-
     }
 }
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ArmorStandController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ArmorStandController.java
index 11bfc9163..8e70625b1 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ArmorStandController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ArmorStandController.java
@@ -90,7 +90,6 @@ public class ArmorStandController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -102,7 +101,6 @@ public class ArmorStandController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -116,7 +114,6 @@ public class ArmorStandController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -124,7 +121,6 @@ public class ArmorStandController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new ArmorStandNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -144,7 +140,6 @@ public class ArmorStandController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
     }
 }
\ No newline at end of file
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/BatController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/BatController.java
index c09d1d432..992524804 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/BatController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/BatController.java
@@ -64,7 +64,6 @@ public class BatController extends MobEntityController {
             if (npc != null) {
                 setAsleep(false);
             }
-
         }
 
         @Override
@@ -91,7 +90,6 @@ public class BatController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -113,7 +111,6 @@ public class BatController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -142,7 +139,6 @@ public class BatController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -150,7 +146,6 @@ public class BatController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new BatNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -169,7 +164,6 @@ public class BatController extends MobEntityController {
             if (npc == null) {
                 super.I();
             }
-
         }
 
         @Override
@@ -185,7 +179,6 @@ public class BatController extends MobEntityController {
                 NMSImpl.updateAI(this);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/BlazeController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/BlazeController.java
index e91fa8eb7..08e49e9e3 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/BlazeController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/BlazeController.java
@@ -87,7 +87,6 @@ public class BlazeController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -109,7 +108,6 @@ public class BlazeController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -138,7 +136,6 @@ public class BlazeController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -146,7 +143,6 @@ public class BlazeController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new BlazeNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -165,7 +161,6 @@ public class BlazeController extends MobEntityController {
             if (npc == null) {
                 super.I();
             }
-
         }
 
         @Override
@@ -178,7 +173,6 @@ public class BlazeController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CaveSpiderController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CaveSpiderController.java
index f419ef72d..f8447639a 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CaveSpiderController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CaveSpiderController.java
@@ -75,7 +75,6 @@ public class CaveSpiderController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -91,7 +90,6 @@ public class CaveSpiderController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -107,7 +105,6 @@ public class CaveSpiderController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -121,7 +118,6 @@ public class CaveSpiderController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.c(f, f1);
             }
-
         }
 
         @Override
@@ -137,7 +133,6 @@ public class CaveSpiderController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -166,7 +161,6 @@ public class CaveSpiderController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -174,7 +168,6 @@ public class CaveSpiderController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new CaveSpiderNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -193,7 +186,6 @@ public class CaveSpiderController extends MobEntityController {
             if (npc == null) {
                 super.I();
             }
-
         }
 
         @Override
@@ -207,7 +199,6 @@ public class CaveSpiderController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -224,7 +215,6 @@ public class CaveSpiderController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
 
         @Override
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ChickenController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ChickenController.java
index 77a60760e..a45ae317d 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ChickenController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ChickenController.java
@@ -78,7 +78,6 @@ public class ChickenController extends MobEntityController {
                 super.a(flag);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, flag, super::a);
         }
 
@@ -87,7 +86,6 @@ public class ChickenController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -103,7 +101,6 @@ public class ChickenController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -119,7 +116,6 @@ public class ChickenController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -133,7 +129,6 @@ public class ChickenController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.c(f, f1);
             }
-
         }
 
         @Override
@@ -149,7 +144,6 @@ public class ChickenController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -178,7 +172,6 @@ public class ChickenController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -186,7 +179,6 @@ public class ChickenController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new ChickenNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -205,7 +197,6 @@ public class ChickenController extends MobEntityController {
             if (npc == null) {
                 super.I();
             }
-
         }
 
         @Override
@@ -219,7 +210,6 @@ public class ChickenController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -227,7 +217,6 @@ public class ChickenController extends MobEntityController {
             if (npc != null) {
                 this.bI = 100; // egg timer
             }
-
             try {
                 super.movementTick();
             } catch (NoSuchMethodError ex) {
@@ -236,9 +225,7 @@ public class ChickenController extends MobEntityController {
                 } catch (Throwable ex2) {
                     ex2.printStackTrace();
                 }
-
             }
-
         }
 
         @Override
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CodController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CodController.java
index 9a96d68ce..83888c45a 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CodController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CodController.java
@@ -71,7 +71,6 @@ public class CodController extends MobEntityController {
             if (npc != null) {
                 this.moveController = new ControllerMove(this);
             }
-
         }
 
         @Override
@@ -84,7 +83,6 @@ public class CodController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -109,11 +107,9 @@ public class CodController extends MobEntityController {
                 if (!NMSImpl.moveFish(npc, this, f, f1, f2)) {
                     super.a(f, f1, f2);
                 }
-
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -129,7 +125,6 @@ public class CodController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -143,7 +138,6 @@ public class CodController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.c(f, f1);
             }
-
         }
 
         @Override
@@ -159,7 +153,6 @@ public class CodController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -188,7 +181,6 @@ public class CodController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -196,7 +188,6 @@ public class CodController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new CodNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -215,7 +206,6 @@ public class CodController extends MobEntityController {
             if (npc == null) {
                 super.I();
             }
-
         }
 
         @Override
@@ -228,12 +218,10 @@ public class CodController extends MobEntityController {
             if (npc != null) {
                 NMSImpl.setNotInSchool(this);
             }
-
             super.mobTick();
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -242,12 +230,10 @@ public class CodController extends MobEntityController {
             if (npc != null) {
                 this.C = false;
             }
-
             super.movementTick();
             if (npc != null) {
                 this.C = lastInWater;
             }
-
         }
 
         @Override
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CowController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CowController.java
index df0f9c6fd..71bb093e2 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CowController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CowController.java
@@ -80,7 +80,6 @@ public class CowController extends MobEntityController {
                 super.a(flag);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, flag, super::a);
         }
 
@@ -89,7 +88,6 @@ public class CowController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -115,7 +113,6 @@ public class CowController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -131,7 +128,6 @@ public class CowController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -145,7 +141,6 @@ public class CowController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.c(f, f1);
             }
-
         }
 
         @Override
@@ -161,7 +156,6 @@ public class CowController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -190,7 +184,6 @@ public class CowController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -198,7 +191,6 @@ public class CowController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new CowNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -217,7 +209,6 @@ public class CowController extends MobEntityController {
             if (npc == null) {
                 super.I();
             }
-
         }
 
         @Override
@@ -231,7 +222,6 @@ public class CowController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CreeperController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CreeperController.java
index 4cf193206..5e456be52 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CreeperController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/CreeperController.java
@@ -78,7 +78,6 @@ public class CreeperController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -94,7 +93,6 @@ public class CreeperController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -110,7 +108,6 @@ public class CreeperController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -124,7 +121,6 @@ public class CreeperController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.c(f, f1);
             }
-
         }
 
         @Override
@@ -140,7 +136,6 @@ public class CreeperController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -168,7 +163,6 @@ public class CreeperController extends MobEntityController {
             if (npc == null || !npc.isProtected()) {
                 super.dB();
             }
-
         }
 
         @Override
@@ -177,7 +171,6 @@ public class CreeperController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -185,7 +178,6 @@ public class CreeperController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new CreeperNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -204,7 +196,6 @@ public class CreeperController extends MobEntityController {
             if (npc == null) {
                 super.I();
             }
-
         }
 
         @Override
@@ -218,7 +209,6 @@ public class CreeperController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -233,7 +223,6 @@ public class CreeperController extends MobEntityController {
             if (npc == null || allowPowered) {
                 super.onLightningStrike(entitylightning);
             }
-
         }
 
         public void setAllowPowered(boolean allowPowered) {
@@ -247,7 +236,6 @@ public class CreeperController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
 
         @Override
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/DolphinController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/DolphinController.java
index 429d88a97..986ceb6ca 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/DolphinController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/DolphinController.java
@@ -71,7 +71,6 @@ public class DolphinController extends MobEntityController {
                 this.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED)
                         .setValue(this.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED).getValue() / 10);
             }
-
         }
 
         @Override
@@ -84,7 +83,6 @@ public class DolphinController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -99,11 +97,9 @@ public class DolphinController extends MobEntityController {
                 if (!NMSImpl.moveFish(npc, this, f, f1, f2, cK())) {
                     super.a(f, f1, f2);
                 }
-
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -124,7 +120,6 @@ public class DolphinController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -138,7 +133,6 @@ public class DolphinController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.c(f, f1);
             }
-
         }
 
         @Override
@@ -154,7 +148,6 @@ public class DolphinController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -183,7 +176,6 @@ public class DolphinController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -191,7 +183,6 @@ public class DolphinController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new DolphinNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -210,7 +201,6 @@ public class DolphinController extends MobEntityController {
             if (npc == null) {
                 super.I();
             }
-
         }
 
         @Override
@@ -230,13 +220,11 @@ public class DolphinController extends MobEntityController {
             if (npc != null && npc.isProtected()) {
                 inProtectedTick = true;
             }
-
             super.tick();
             inProtectedTick = false;
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/DrownedController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/DrownedController.java
index 7d5ea72b7..73132890c 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/DrownedController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/DrownedController.java
@@ -75,7 +75,6 @@ public class DrownedController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -91,7 +90,6 @@ public class DrownedController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -107,7 +105,6 @@ public class DrownedController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -121,7 +118,6 @@ public class DrownedController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.c(f, f1);
             }
-
         }
 
         @Override
@@ -137,7 +133,6 @@ public class DrownedController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -166,7 +161,6 @@ public class DrownedController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -174,7 +168,6 @@ public class DrownedController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new DrownedNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -193,7 +186,6 @@ public class DrownedController extends MobEntityController {
             if (npc == null) {
                 super.I();
             }
-
         }
 
         @Override
@@ -207,7 +199,6 @@ public class DrownedController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EnderDragonController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EnderDragonController.java
index fc7915ae3..42afa5994 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EnderDragonController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EnderDragonController.java
@@ -94,7 +94,6 @@ public class EnderDragonController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -116,7 +115,6 @@ public class EnderDragonController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -151,7 +149,6 @@ public class EnderDragonController extends MobEntityController {
                 motY = old.y;
                 motZ = old.z;
             }
-
             return res;
         }
 
@@ -161,7 +158,6 @@ public class EnderDragonController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -169,7 +165,6 @@ public class EnderDragonController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new EnderDragonNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -188,7 +183,6 @@ public class EnderDragonController extends MobEntityController {
             if (npc == null) {
                 super.I();
             }
-
         }
 
         @Override
@@ -201,25 +195,20 @@ public class EnderDragonController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
             if (npc != null) {
                 if (getDragonControllerManager().a().getControllerPhase() == DragonControllerPhase.DYING) {
                     setHealth(0F);
                     return;
                 }
-
                 if (this.c < 0) {
                     for (int i = 0; i < this.b.length; ++i) {
                         this.b[i][0] = this.yaw;
                         this.b[i][1] = this.locY;
                     }
-
                 }
-
                 if (++this.c == this.b.length) {
                     this.c = 0;
                 }
-
                 this.b[this.c][0] = this.yaw;
                 this.b[this.c][1] = this.locY;
 
@@ -232,11 +221,9 @@ public class EnderDragonController extends MobEntityController {
                     children[j].lastY = vec3.y;
                     children[j].lastZ = vec3.z;
                 }
-
                 if (getBukkitEntity().getPassenger() != null) {
                     yaw = getBukkitEntity().getPassenger().getLocation().getYaw() - 180;
                 }
-
                 if (motX != 0 || motY != 0 || motZ != 0) {
                     motX *= 0.98;
                     motY *= 0.98;
@@ -244,10 +231,8 @@ public class EnderDragonController extends MobEntityController {
                     if (getBukkitEntity().getPassenger() == null) {
                         yaw = Util.getDragonYaw(getBukkitEntity(), motX, motZ);
                     }
-
                     setPosition(locX + motX, locY + motY, locZ + motZ);
                 }
-
                 if (npc.hasTrait(EnderDragonTrait.class) && npc.getOrAddTrait(EnderDragonTrait.class).isDestroyWalls()
                         && NMSImpl.ENDERDRAGON_CHECK_WALLS != null) {
                     for (int i = 0; i < 3; i++) {
@@ -257,11 +242,8 @@ public class EnderDragonController extends MobEntityController {
                         } catch (Throwable e) {
                             e.printStackTrace();
                         }
-
                     }
-
                 }
-
                 if (npc.data().get(NPC.Metadata.COLLIDABLE, false)) {
                     try {
                         KNOCKBACK.invoke(this, this.world.getEntities(this,
@@ -275,9 +257,7 @@ public class EnderDragonController extends MobEntityController {
                     } catch (Throwable t) {
                         t.printStackTrace();
                     }
-
                 }
-
             } else {
                 try {
                     super.movementTick();
@@ -287,11 +267,8 @@ public class EnderDragonController extends MobEntityController {
                     } catch (Throwable ex2) {
                         ex2.printStackTrace();
                     }
-
                 }
-
             }
-
         }
 
         @Override
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EndermanController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EndermanController.java
index 0251fcb01..4f052a256 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EndermanController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EndermanController.java
@@ -75,7 +75,6 @@ public class EndermanController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -91,7 +90,6 @@ public class EndermanController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -107,7 +105,6 @@ public class EndermanController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -121,7 +118,6 @@ public class EndermanController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.c(f, f1);
             }
-
         }
 
         @Override
@@ -137,7 +133,6 @@ public class EndermanController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -166,7 +161,6 @@ public class EndermanController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -174,7 +168,6 @@ public class EndermanController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new EndermanNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -193,7 +186,6 @@ public class EndermanController extends MobEntityController {
             if (npc == null) {
                 super.I();
             }
-
         }
 
         @Override
@@ -214,7 +206,6 @@ public class EndermanController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -231,7 +222,6 @@ public class EndermanController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
 
         @Override
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EndermiteController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EndermiteController.java
index 68c8d9ee2..6140bd2ab 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EndermiteController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EndermiteController.java
@@ -75,7 +75,6 @@ public class EndermiteController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -91,7 +90,6 @@ public class EndermiteController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -107,7 +105,6 @@ public class EndermiteController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -121,7 +118,6 @@ public class EndermiteController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.c(f, f1);
             }
-
         }
 
         @Override
@@ -137,7 +133,6 @@ public class EndermiteController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -166,7 +161,6 @@ public class EndermiteController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -174,7 +168,6 @@ public class EndermiteController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new EndermiteNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -193,7 +186,6 @@ public class EndermiteController extends MobEntityController {
             if (npc == null) {
                 super.I();
             }
-
         }
 
         @Override
@@ -207,7 +199,6 @@ public class EndermiteController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -224,7 +215,6 @@ public class EndermiteController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
 
         @Override
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EntityHumanNPC.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EntityHumanNPC.java
index 615551fb7..89e74f203 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EntityHumanNPC.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EntityHumanNPC.java
@@ -90,7 +90,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         } else {
             skinTracker = null;
         }
-
     }
 
     @Override
@@ -98,7 +97,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         if (npc == null || !npc.isFlyable()) {
             super.a(d0, flag, block, blockposition);
         }
-
     }
 
     @Override
@@ -115,7 +113,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         } else {
             NMSImpl.flyingMoveLogic(this, f, f1, f2);
         }
-
     }
 
     public float a(PathType pathtype) {
@@ -131,7 +128,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         if (npc == null || !npc.isFlyable()) {
             super.c(f, f1);
         }
-
     }
 
     @Override
@@ -142,7 +138,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         if (npc != null) {
             Util.callCollisionEvent(npc, entity.getBukkitEntity());
         }
-
     }
 
     @Override
@@ -166,7 +161,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
             Bukkit.getScheduler().runTask(CitizensAPI.getPlugin(),
                     (Runnable) () -> EntityHumanNPC.this.velocityChanged = true);
         }
-
         return damaged;
     }
 
@@ -194,7 +188,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         if (vector != null) {
             super.f(vector.getX(), vector.getY(), vector.getZ());
         }
-
     }
 
     @Override
@@ -202,7 +195,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
             bukkitEntity = new PlayerNPC(this);
         }
-
         return super.getBukkitEntity();
     }
 
@@ -236,7 +228,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         if (skinName == null) {
             skinName = npc.getName();
         }
-
         return skinName.toLowerCase();
     }
 
@@ -259,12 +250,10 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
             conn.setPacketListener(playerConnection);
         } catch (IOException e) {
         }
-
         AttributeInstance range = getAttributeInstance(GenericAttributes.FOLLOW_RANGE);
         if (range == null) {
             range = getAttributeMap().b(GenericAttributes.FOLLOW_RANGE);
         }
-
         range.setValue(Setting.DEFAULT_PATHFINDING_RANGE.asDouble());
         controllerJump = new PlayerControllerJump(this);
         controllerMove = new PlayerControllerMove(this);
@@ -279,7 +268,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     @Override
@@ -299,11 +287,9 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
                 cH();
                 jumpTicks = 10;
             }
-
         } else {
             jumpTicks = 0;
         }
-
         bh *= 0.98F;
         bj *= 0.98F;
         bk *= 0.9F;
@@ -312,7 +298,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         if (jumpTicks > 0) {
             jumpTicks--;
         }
-
     }
 
     private void moveWithFallDamage(float mx, float my, float mz) {
@@ -321,7 +306,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         if (!npc.isProtected()) {
             a(this.locY - y, onGround);
         }
-
     }
 
     @Override
@@ -330,7 +314,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
             super.playerTick();
             return;
         }
-
         W();
         boolean navigating = npc.getNavigator().isNavigating() || controllerMove.b();
         if (!navigating && getBukkitEntity() != null
@@ -339,19 +322,15 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
                 && (!npc.isProtected() || SpigotUtil.checkYSafe(locY, getBukkitEntity().getWorld()))) {
             moveWithFallDamage(0, 0, 0);
         }
-
         if (Math.abs(motX) < EPSILON && Math.abs(motY) < EPSILON && Math.abs(motZ) < EPSILON) {
             motX = motY = motZ = 0;
         }
-
         if (navigating) {
             if (!NMSImpl.isNavigationFinished(navigation)) {
                 NMSImpl.updateNavigation(navigation);
             }
-
             moveOnCurrentHeading();
         }
-
         updateAI();
         cN();
         if (npc.data().get(NPC.Metadata.PICKUP_ITEMS, false)) {
@@ -361,16 +340,12 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
             } else {
                 axisalignedbb = this.getBoundingBox().grow(1.0, 0.5, 1.0);
             }
-
             for (Entity entity : this.world.getEntities(this, axisalignedbb)) {
                 if (!entity.dead) {
                     entity.d(this);
                 }
-
             }
-
         }
-
     }
 
     public void setMoveDestination(double x, double y, double z, double speed) {
@@ -438,16 +413,12 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
                 if (cache != null && !cache.isEmpty()) {
                     this.getAttributeMap().a(cache.a(slot));
                 }
-
                 if (equipment != null && !equipment.isEmpty()) {
                     this.getAttributeMap().b(equipment.a(slot));
                 }
-
             }
-
             equipmentCache.put(slot, equipment);
         }
-
         if (!itemChanged)
             return;
         Location current = getBukkitEntity().getLocation(packetLocationCache);
@@ -456,7 +427,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         for (EnumItemSlot slot : EnumItemSlot.values()) {
             packets[i++] = new PacketPlayOutEntityEquipment(getId(), slot, getEquipment(slot));
         }
-
         NMSImpl.sendPacketsNearby(getBukkitEntity(), current, packets);
     }
 
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EvokerController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EvokerController.java
index 562c65ee0..f435c91a9 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EvokerController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/EvokerController.java
@@ -61,7 +61,6 @@ public class EvokerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -77,7 +76,6 @@ public class EvokerController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -93,7 +91,6 @@ public class EvokerController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -107,7 +104,6 @@ public class EvokerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.c(f, f1);
             }
-
         }
 
         @Override
@@ -123,7 +119,6 @@ public class EvokerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -152,7 +147,6 @@ public class EvokerController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -160,7 +154,6 @@ public class EvokerController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new EvokerNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -179,7 +172,6 @@ public class EvokerController extends MobEntityController {
             if (npc == null) {
                 super.I();
             }
-
         }
 
         @Override
@@ -193,7 +185,6 @@ public class EvokerController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GhastController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GhastController.java
index 6618a84ce..9830708ec 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GhastController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GhastController.java
@@ -73,7 +73,6 @@ public class GhastController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -95,7 +94,6 @@ public class GhastController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -124,7 +122,6 @@ public class GhastController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -132,7 +129,6 @@ public class GhastController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new GhastNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -151,7 +147,6 @@ public class GhastController extends MobEntityController {
             if (npc == null) {
                 super.I();
             }
-
         }
 
         @Override
@@ -169,7 +164,6 @@ public class GhastController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
             super.mobTick();
         }
 
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GiantController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GiantController.java
index c3e82c0de..7b11d485d 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GiantController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GiantController.java
@@ -61,7 +61,6 @@ public class GiantController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -77,7 +76,6 @@ public class GiantController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -93,7 +91,6 @@ public class GiantController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -107,7 +104,6 @@ public class GiantController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.c(f, f1);
             }
-
         }
 
         @Override
@@ -123,7 +119,6 @@ public class GiantController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -152,7 +147,6 @@ public class GiantController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -160,7 +154,6 @@ public class GiantController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new GiantNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -179,7 +172,6 @@ public class GiantController extends MobEntityController {
             if (npc == null) {
                 super.I();
             }
-
         }
 
         @Override
@@ -193,7 +185,6 @@ public class GiantController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -210,7 +201,6 @@ public class GiantController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
 
         @Override
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GuardianController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GuardianController.java
index 6eb2c11cc..df36233bb 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GuardianController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GuardianController.java
@@ -63,7 +63,6 @@ public class GuardianController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -79,7 +78,6 @@ public class GuardianController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -95,7 +93,6 @@ public class GuardianController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -109,7 +106,6 @@ public class GuardianController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.c(f, f1);
             }
-
         }
 
         @Override
@@ -125,7 +121,6 @@ public class GuardianController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -154,7 +149,6 @@ public class GuardianController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -162,7 +156,6 @@ public class GuardianController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new GuardianNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -181,7 +174,6 @@ public class GuardianController extends MobEntityController {
             if (npc == null) {
                 super.I();
             }
-
         }
 
         @Override
@@ -200,14 +192,11 @@ public class GuardianController extends MobEntityController {
                     } catch (Throwable ex2) {
                         ex2.printStackTrace();
                     }
-
                 }
-
             } else {
                 NMSImpl.updateAI(this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -224,7 +213,6 @@ public class GuardianController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
 
         @Override
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GuardianElderController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GuardianElderController.java
index 4f7ea679b..e1ed97b55 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GuardianElderController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/GuardianElderController.java
@@ -63,7 +63,6 @@ public class GuardianElderController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -79,7 +78,6 @@ public class GuardianElderController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -95,7 +93,6 @@ public class GuardianElderController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -109,7 +106,6 @@ public class GuardianElderController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.c(f, f1);
             }
-
         }
 
         @Override
@@ -125,7 +121,6 @@ public class GuardianElderController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -154,7 +149,6 @@ public class GuardianElderController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -162,7 +156,6 @@ public class GuardianElderController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new GuardianElderNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -181,7 +174,6 @@ public class GuardianElderController extends MobEntityController {
             if (npc == null) {
                 super.I();
             }
-
         }
 
         @Override
@@ -200,14 +192,11 @@ public class GuardianElderController extends MobEntityController {
                     } catch (Throwable ex2) {
                         ex2.printStackTrace();
                     }
-
                 }
-
             } else {
                 NMSImpl.updateAI(this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -224,7 +213,6 @@ public class GuardianElderController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
 
         @Override
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseController.java
index 05283bfcb..e9e9a6dcf 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseController.java
@@ -67,7 +67,6 @@ public class HorseController extends MobEntityController {
                 ((Horse) getBukkitEntity()).setDomestication(((Horse) getBukkitEntity()).getMaxDomestication());
                 baseMovementSpeed = this.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED).getValue();
             }
-
         }
 
         @Override
@@ -81,7 +80,6 @@ public class HorseController extends MobEntityController {
                 super.a(flag);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, flag, super::a);
         }
 
@@ -90,7 +88,6 @@ public class HorseController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -106,7 +103,6 @@ public class HorseController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -122,7 +118,6 @@ public class HorseController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -143,7 +138,6 @@ public class HorseController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.c(f, f1);
             }
-
         }
 
         @Override
@@ -159,7 +153,6 @@ public class HorseController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -188,7 +181,6 @@ public class HorseController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -196,7 +188,6 @@ public class HorseController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new HorseNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -215,7 +206,6 @@ public class HorseController extends MobEntityController {
             if (npc == null) {
                 super.I();
             }
-
         }
 
         @Override
@@ -234,15 +224,12 @@ public class HorseController extends MobEntityController {
                 } else {
                     riding = false;
                 }
-
                 if (riding) {
                     d(4, true); // datawatcher method
                 }
-
                 NMS.setStepHeight(getBukkitEntity(), 1);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseDonkeyController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseDonkeyController.java
index 18b5dd699..808aa791a 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseDonkeyController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseDonkeyController.java
@@ -67,7 +67,6 @@ public class HorseDonkeyController extends MobEntityController {
                 ((Donkey) getBukkitEntity()).setDomestication(((Donkey) getBukkitEntity()).getMaxDomestication());
                 baseMovementSpeed = this.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED).getValue();
             }
-
         }
 
         @Override
@@ -81,7 +80,6 @@ public class HorseDonkeyController extends MobEntityController {
                 super.a(flag);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, flag, super::a);
         }
 
@@ -90,7 +88,6 @@ public class HorseDonkeyController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -106,7 +103,6 @@ public class HorseDonkeyController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -122,7 +118,6 @@ public class HorseDonkeyController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -143,7 +138,6 @@ public class HorseDonkeyController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.c(f, f1);
             }
-
         }
 
         @Override
@@ -159,7 +153,6 @@ public class HorseDonkeyController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -188,7 +181,6 @@ public class HorseDonkeyController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -196,7 +188,6 @@ public class HorseDonkeyController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new HorseDonkeyNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -215,7 +206,6 @@ public class HorseDonkeyController extends MobEntityController {
             if (npc == null) {
                 super.I();
             }
-
         }
 
         @Override
@@ -234,15 +224,12 @@ public class HorseDonkeyController extends MobEntityController {
                 } else {
                     riding = false;
                 }
-
                 if (riding) {
                     d(4, true); // datawatcher method
                 }
-
                 NMS.setStepHeight(getBukkitEntity(), 1);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseMuleController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseMuleController.java
index 0efebddd0..bcbd945ed 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseMuleController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseMuleController.java
@@ -67,7 +67,6 @@ public class HorseMuleController extends MobEntityController {
                 ((Mule) getBukkitEntity()).setDomestication(((Mule) getBukkitEntity()).getMaxDomestication());
                 baseMovementSpeed = this.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED).getValue();
             }
-
         }
 
         @Override
@@ -81,7 +80,6 @@ public class HorseMuleController extends MobEntityController {
                 super.a(flag);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, flag, super::a);
         }
 
@@ -90,7 +88,6 @@ public class HorseMuleController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -106,7 +103,6 @@ public class HorseMuleController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -122,7 +118,6 @@ public class HorseMuleController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -143,7 +138,6 @@ public class HorseMuleController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.c(f, f1);
             }
-
         }
 
         @Override
@@ -159,7 +153,6 @@ public class HorseMuleController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -188,7 +181,6 @@ public class HorseMuleController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -196,7 +188,6 @@ public class HorseMuleController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new HorseMuleNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -215,7 +206,6 @@ public class HorseMuleController extends MobEntityController {
             if (npc == null) {
                 super.I();
             }
-
         }
 
         @Override
@@ -234,15 +224,12 @@ public class HorseMuleController extends MobEntityController {
                 } else {
                     riding = false;
                 }
-
                 if (riding) {
                     d(4, true); // datawatcher method
                 }
-
                 NMS.setStepHeight(getBukkitEntity(), 1);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseSkeletonController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseSkeletonController.java
index ed074a4c8..82b1b79b8 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseSkeletonController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseSkeletonController.java
@@ -68,7 +68,6 @@ public class HorseSkeletonController extends MobEntityController {
                         .setDomestication(((SkeletonHorse) getBukkitEntity()).getMaxDomestication());
                 baseMovementSpeed = this.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED).getValue();
             }
-
         }
 
         @Override
@@ -82,7 +81,6 @@ public class HorseSkeletonController extends MobEntityController {
                 super.a(flag);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, flag, super::a);
         }
 
@@ -91,7 +89,6 @@ public class HorseSkeletonController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -107,7 +104,6 @@ public class HorseSkeletonController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -123,7 +119,6 @@ public class HorseSkeletonController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -144,7 +139,6 @@ public class HorseSkeletonController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.c(f, f1);
             }
-
         }
 
         @Override
@@ -160,7 +154,6 @@ public class HorseSkeletonController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -189,7 +182,6 @@ public class HorseSkeletonController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -197,7 +189,6 @@ public class HorseSkeletonController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new HorseSkeletonNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -216,7 +207,6 @@ public class HorseSkeletonController extends MobEntityController {
             if (npc == null) {
                 super.I();
             }
-
         }
 
         @Override
@@ -235,15 +225,12 @@ public class HorseSkeletonController extends MobEntityController {
                 } else {
                     riding = false;
                 }
-
                 if (riding) {
                     d(4, true); // datawatcher method
                 }
-
                 NMS.setStepHeight(getBukkitEntity(), 1);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseZombieController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseZombieController.java
index e37bcb848..35d114aeb 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseZombieController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HorseZombieController.java
@@ -68,7 +68,6 @@ public class HorseZombieController extends MobEntityController {
                         .setDomestication(((ZombieHorse) getBukkitEntity()).getMaxDomestication());
                 baseMovementSpeed = this.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED).getValue();
             }
-
         }
 
         @Override
@@ -82,7 +81,6 @@ public class HorseZombieController extends MobEntityController {
                 super.a(flag);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, flag, super::a);
         }
 
@@ -91,7 +89,6 @@ public class HorseZombieController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -107,7 +104,6 @@ public class HorseZombieController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -123,7 +119,6 @@ public class HorseZombieController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -144,7 +139,6 @@ public class HorseZombieController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.c(f, f1);
             }
-
         }
 
         @Override
@@ -160,7 +154,6 @@ public class HorseZombieController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -189,7 +182,6 @@ public class HorseZombieController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -197,7 +189,6 @@ public class HorseZombieController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new HorseZombieNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -216,7 +207,6 @@ public class HorseZombieController extends MobEntityController {
             if (npc == null) {
                 super.I();
             }
-
         }
 
         @Override
@@ -235,15 +225,12 @@ public class HorseZombieController extends MobEntityController {
                 } else {
                     riding = false;
                 }
-
                 if (riding) {
                     d(4, true); // datawatcher method
                 }
-
                 NMS.setStepHeight(getBukkitEntity(), 1);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HumanController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HumanController.java
index af1d5ae63..afdea3aca 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HumanController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/HumanController.java
@@ -35,11 +35,9 @@ public class HumanController extends AbstractEntityController {
         if (npc.requiresNameHologram()) {
             name = teamName;
         }
-
         if (Setting.USE_SCOREBOARD_TEAMS.asBoolean()) {
             npc.getOrAddTrait(ScoreboardTrait.class).createTeam(name);
         }
-
         final GameProfile profile = new GameProfile(uuid, name);
         final EntityHumanNPC handle = new EntityHumanNPC(nmsWorld.getServer().getServer(), nmsWorld, profile,
                 new PlayerInteractManager(nmsWorld), npc);
@@ -47,7 +45,6 @@ public class HumanController extends AbstractEntityController {
         if (skin != null) {
             skin.apply(handle);
         }
-
         Bukkit.getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(), () -> {
             if (getBukkitEntity() == null || !getBukkitEntity().isValid()
                     || getBukkitEntity() != handle.getBukkitEntity())
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/IllusionerController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/IllusionerController.java
index 98b023c6e..d8b546468 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/IllusionerController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/IllusionerController.java
@@ -61,7 +61,6 @@ public class IllusionerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -77,7 +76,6 @@ public class IllusionerController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -93,7 +91,6 @@ public class IllusionerController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -107,7 +104,6 @@ public class IllusionerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.c(f, f1);
             }
-
         }
 
         @Override
@@ -123,7 +119,6 @@ public class IllusionerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -152,7 +147,6 @@ public class IllusionerController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -160,7 +154,6 @@ public class IllusionerController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new IllusionerNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -179,7 +172,6 @@ public class IllusionerController extends MobEntityController {
             if (npc == null) {
                 super.I();
             }
-
         }
 
         @Override
@@ -193,7 +185,6 @@ public class IllusionerController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/IronGolemController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/IronGolemController.java
index d1c631505..5fac05aa3 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/IronGolemController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/IronGolemController.java
@@ -61,7 +61,6 @@ public class IronGolemController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -77,7 +76,6 @@ public class IronGolemController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -93,7 +91,6 @@ public class IronGolemController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -107,7 +104,6 @@ public class IronGolemController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.c(f, f1);
             }
-
         }
 
         @Override
@@ -123,7 +119,6 @@ public class IronGolemController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -152,7 +147,6 @@ public class IronGolemController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -160,7 +154,6 @@ public class IronGolemController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new IronGolemNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -179,7 +172,6 @@ public class IronGolemController extends MobEntityController {
             if (npc == null) {
                 super.I();
             }
-
         }
 
         @Override
@@ -193,7 +185,6 @@ public class IronGolemController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -210,7 +201,6 @@ public class IronGolemController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
 
         @Override
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/LlamaController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/LlamaController.java
index a62630492..1bb57e1d0 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/LlamaController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/LlamaController.java
@@ -67,7 +67,6 @@ public class LlamaController extends MobEntityController {
                 ((Llama) getBukkitEntity()).setDomestication(((Llama) getBukkitEntity()).getMaxDomestication());
                 baseMovementSpeed = this.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED).getValue();
             }
-
         }
 
         @Override
@@ -81,7 +80,6 @@ public class LlamaController extends MobEntityController {
                 super.a(flag);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, flag, super::a);
         }
 
@@ -90,7 +88,6 @@ public class LlamaController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -106,7 +103,6 @@ public class LlamaController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -122,7 +118,6 @@ public class LlamaController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -143,7 +138,6 @@ public class LlamaController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.c(f, f1);
             }
-
         }
 
         @Override
@@ -159,7 +153,6 @@ public class LlamaController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -188,7 +181,6 @@ public class LlamaController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -196,7 +188,6 @@ public class LlamaController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new LlamaNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -215,7 +206,6 @@ public class LlamaController extends MobEntityController {
             if (npc == null) {
                 super.I();
             }
-
         }
 
         @Override
@@ -234,15 +224,12 @@ public class LlamaController extends MobEntityController {
                 } else {
                     riding = false;
                 }
-
                 if (riding) {
                     d(4, true); // datawatcher method
                 }
-
                 NMS.setStepHeight(getBukkitEntity(), 1);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/MagmaCubeController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/MagmaCubeController.java
index 6fe4ad7fd..7707c8dbe 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/MagmaCubeController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/MagmaCubeController.java
@@ -55,7 +55,6 @@ public class MagmaCubeController extends MobEntityController {
                 setSize(3, true);
                 this.moveController = new PlayerControllerMove(this);
             }
-
         }
 
         @Override
@@ -68,7 +67,6 @@ public class MagmaCubeController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -84,7 +82,6 @@ public class MagmaCubeController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -100,7 +97,6 @@ public class MagmaCubeController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -114,7 +110,6 @@ public class MagmaCubeController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.c(f, f1);
             }
-
         }
 
         @Override
@@ -130,7 +125,6 @@ public class MagmaCubeController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -148,7 +142,6 @@ public class MagmaCubeController extends MobEntityController {
             if (npc == null) {
                 super.d(human);
             }
-
         }
 
         @Override
@@ -167,7 +160,6 @@ public class MagmaCubeController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -175,7 +167,6 @@ public class MagmaCubeController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new MagmaCubeNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -194,7 +185,6 @@ public class MagmaCubeController extends MobEntityController {
             if (npc == null) {
                 super.I();
             }
-
         }
 
         @Override
@@ -216,7 +206,6 @@ public class MagmaCubeController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
 
         @Override
@@ -225,7 +214,6 @@ public class MagmaCubeController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/MobEntityController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/MobEntityController.java
index 13ca9c336..11ee8c777 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/MobEntityController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/MobEntityController.java
@@ -34,7 +34,6 @@ public abstract class MobEntityController extends AbstractEntityController {
         if (entity instanceof EntityInsentient) {
             NMSImpl.clearGoals(((EntityInsentient) entity).goalSelector, ((EntityInsentient) entity).targetSelector);
         }
-
         entity.setPositionRotation(at.getX(), at.getY(), at.getZ(), at.getYaw(), at.getPitch());
         if (npc != null) {
             // entity.onGround isn't updated right away - we approximate here so
@@ -43,19 +42,15 @@ public abstract class MobEntityController extends AbstractEntityController {
             if (beneath.isSolid()) {
                 entity.onGround = true;
             }
-
             try {
                 UUID_FIELD.invoke(entity, npc.getUniqueId());
             } catch (Throwable e) {
                 e.printStackTrace();
             }
-
             if (Setting.USE_SCOREBOARD_TEAMS.asBoolean()) {
                 npc.getOrAddTrait(ScoreboardTrait.class).createTeam(npc.getUniqueId().toString());
             }
-
         }
-
         return entity.getBukkitEntity();
     }
 
@@ -66,7 +61,6 @@ public abstract class MobEntityController extends AbstractEntityController {
             ex.printStackTrace();
             return null;
         }
-
     }
 
     private static Constructor<?> getConstructor(Class<?> clazz) {
@@ -79,7 +73,6 @@ public abstract class MobEntityController extends AbstractEntityController {
         } catch (Exception ex) {
             throw new IllegalStateException("unable to find an entity constructor");
         }
-
     }
 
     private static final Map<Class<?>, Constructor<?>> CONSTRUCTOR_CACHE = new WeakHashMap<>();
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/MushroomCowController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/MushroomCowController.java
index cded389a2..dc64a109c 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/MushroomCowController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/MushroomCowController.java
@@ -64,7 +64,6 @@ public class MushroomCowController extends MobEntityController {
                 super.a(flag);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, flag, super::a);
         }
 
@@ -73,7 +72,6 @@ public class MushroomCowController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -96,7 +94,6 @@ public class MushroomCowController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -112,7 +109,6 @@ public class MushroomCowController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -126,7 +122,6 @@ public class MushroomCowController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.c(f, f1);
             }
-
         }
 
         @Override
@@ -142,7 +137,6 @@ public class MushroomCowController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -171,7 +165,6 @@ public class MushroomCowController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -179,7 +172,6 @@ public class MushroomCowController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new MushroomCowNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -198,7 +190,6 @@ public class MushroomCowController extends MobEntityController {
             if (npc == null) {
                 super.I();
             }
-
         }
 
         @Override
@@ -212,7 +203,6 @@ public class MushroomCowController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/OcelotController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/OcelotController.java
index e127ce249..c33c2970e 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/OcelotController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/OcelotController.java
@@ -62,7 +62,6 @@ public class OcelotController extends MobEntityController {
                 super.a(flag);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, flag, super::a);
         }
 
@@ -71,7 +70,6 @@ public class OcelotController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -87,7 +85,6 @@ public class OcelotController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -103,7 +100,6 @@ public class OcelotController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -117,7 +113,6 @@ public class OcelotController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.c(f, f1);
             }
-
         }
 
         @Override
@@ -133,7 +128,6 @@ public class OcelotController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -161,7 +155,6 @@ public class OcelotController extends MobEntityController {
             if (npc == null) {
                 super.dz();
             }
-
         }
 
         @Override
@@ -170,7 +163,6 @@ public class OcelotController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -178,7 +170,6 @@ public class OcelotController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new OcelotNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -197,7 +188,6 @@ public class OcelotController extends MobEntityController {
             if (npc == null) {
                 super.I();
             }
-
         }
 
         @Override
@@ -211,7 +201,6 @@ public class OcelotController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ParrotController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ParrotController.java
index b10a3effb..d217a87ef 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ParrotController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ParrotController.java
@@ -83,7 +83,6 @@ public class ParrotController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -105,7 +104,6 @@ public class ParrotController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -134,7 +132,6 @@ public class ParrotController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -142,7 +139,6 @@ public class ParrotController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new ParrotNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -161,7 +157,6 @@ public class ParrotController extends MobEntityController {
             if (npc == null) {
                 super.I();
             }
-
         }
 
         @Override
@@ -177,7 +172,6 @@ public class ParrotController extends MobEntityController {
                 NMSImpl.updateAI(this);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PhantomController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PhantomController.java
index cd52a00b2..db2f7cdd2 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PhantomController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PhantomController.java
@@ -60,7 +60,6 @@ public class PhantomController extends MobEntityController {
                 this.lookController = new ControllerLook(this);
                 // TODO: phantom pitch reversed
             }
-
         }
 
         @Override
@@ -73,7 +72,6 @@ public class PhantomController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -89,7 +87,6 @@ public class PhantomController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -105,7 +102,6 @@ public class PhantomController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -119,7 +115,6 @@ public class PhantomController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.c(f, f1);
             }
-
         }
 
         @Override
@@ -135,7 +130,6 @@ public class PhantomController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -171,7 +165,6 @@ public class PhantomController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -179,7 +172,6 @@ public class PhantomController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new PhantomNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -198,7 +190,6 @@ public class PhantomController extends MobEntityController {
             if (npc == null) {
                 super.I();
             }
-
         }
 
         @Override
@@ -216,17 +207,13 @@ public class PhantomController extends MobEntityController {
                 } catch (Throwable ex2) {
                     ex2.printStackTrace();
                 }
-
             }
-
             if (npc != null) {
                 if (npc.isProtected()) {
                     this.setOnFire(0);
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
@@ -243,12 +230,10 @@ public class PhantomController extends MobEntityController {
             if (npc != null && resetDifficulty) {
                 this.world.getWorldData().setDifficulty(EnumDifficulty.NORMAL);
             }
-
             super.tick();
             if (npc != null && resetDifficulty) {
                 this.world.getWorldData().setDifficulty(EnumDifficulty.PEACEFUL);
             }
-
         }
 
         @Override
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PigController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PigController.java
index 3f783c975..956bfa874 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PigController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PigController.java
@@ -63,7 +63,6 @@ public class PigController extends MobEntityController {
                 super.a(flag);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, flag, super::a);
         }
 
@@ -72,7 +71,6 @@ public class PigController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -88,7 +86,6 @@ public class PigController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -104,7 +101,6 @@ public class PigController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -118,7 +114,6 @@ public class PigController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.c(f, f1);
             }
-
         }
 
         @Override
@@ -134,7 +129,6 @@ public class PigController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -169,7 +163,6 @@ public class PigController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -177,7 +170,6 @@ public class PigController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new PigNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -196,7 +188,6 @@ public class PigController extends MobEntityController {
             if (npc == null) {
                 super.I();
             }
-
         }
 
         @Override
@@ -210,7 +201,6 @@ public class PigController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -225,7 +215,6 @@ public class PigController extends MobEntityController {
             if (npc == null) {
                 super.onLightningStrike(entitylightning);
             }
-
         }
 
         @Override
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PigZombieController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PigZombieController.java
index 6ff392981..ddc70b4dd 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PigZombieController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PigZombieController.java
@@ -61,7 +61,6 @@ public class PigZombieController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -77,7 +76,6 @@ public class PigZombieController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -93,7 +91,6 @@ public class PigZombieController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -107,7 +104,6 @@ public class PigZombieController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.c(f, f1);
             }
-
         }
 
         @Override
@@ -123,7 +119,6 @@ public class PigZombieController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -152,7 +147,6 @@ public class PigZombieController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -160,7 +154,6 @@ public class PigZombieController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new PigZombieNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -179,7 +172,6 @@ public class PigZombieController extends MobEntityController {
             if (npc == null) {
                 super.I();
             }
-
         }
 
         @Override
@@ -193,7 +185,6 @@ public class PigZombieController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PolarBearController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PolarBearController.java
index de7aa9ffb..064278ecb 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PolarBearController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PolarBearController.java
@@ -60,7 +60,6 @@ public class PolarBearController extends MobEntityController {
                 super.a(flag);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, flag, super::a);
         }
 
@@ -83,7 +82,6 @@ public class PolarBearController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -105,7 +103,6 @@ public class PolarBearController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -134,7 +131,6 @@ public class PolarBearController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -142,7 +138,6 @@ public class PolarBearController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new PolarBearNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -161,7 +156,6 @@ public class PolarBearController extends MobEntityController {
             if (npc == null) {
                 super.I();
             }
-
         }
 
         @Override
@@ -175,7 +169,6 @@ public class PolarBearController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PufferFishController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PufferFishController.java
index 18acbb6bc..560d31067 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PufferFishController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/PufferFishController.java
@@ -58,7 +58,6 @@ public class PufferFishController extends MobEntityController {
             if (npc != null) {
                 this.moveController = new ControllerMove(this);
             }
-
         }
 
         @Override
@@ -71,7 +70,6 @@ public class PufferFishController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -96,11 +94,9 @@ public class PufferFishController extends MobEntityController {
                 if (!NMSImpl.moveFish(npc, this, f, f1, f2)) {
                     super.a(f, f1, f2);
                 }
-
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -116,7 +112,6 @@ public class PufferFishController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -130,7 +125,6 @@ public class PufferFishController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.c(f, f1);
             }
-
         }
 
         @Override
@@ -146,7 +140,6 @@ public class PufferFishController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -175,7 +168,6 @@ public class PufferFishController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -183,7 +175,6 @@ public class PufferFishController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new PufferFishNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -202,7 +193,6 @@ public class PufferFishController extends MobEntityController {
             if (npc == null) {
                 super.I();
             }
-
         }
 
         @Override
@@ -218,9 +208,7 @@ public class PufferFishController extends MobEntityController {
                 if (npc.hasTrait(PufferFishTrait.class)) {
                     setPuffState(npc.getOrAddTrait(PufferFishTrait.class).getPuffState());
                 }
-
             }
-
         }
 
         @Override
@@ -229,12 +217,10 @@ public class PufferFishController extends MobEntityController {
             if (npc != null) {
                 this.C = false;
             }
-
             super.movementTick();
             if (npc != null) {
                 this.C = lastInWater;
             }
-
         }
 
         @Override
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/RabbitController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/RabbitController.java
index 3000abba7..f8df37ca7 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/RabbitController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/RabbitController.java
@@ -63,7 +63,6 @@ public class RabbitController extends MobEntityController {
                 super.a(flag);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, flag, super::a);
         }
 
@@ -72,7 +71,6 @@ public class RabbitController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -88,7 +86,6 @@ public class RabbitController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -104,7 +101,6 @@ public class RabbitController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -118,7 +114,6 @@ public class RabbitController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.c(f, f1);
             }
-
         }
 
         @Override
@@ -134,7 +129,6 @@ public class RabbitController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -163,7 +157,6 @@ public class RabbitController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -171,7 +164,6 @@ public class RabbitController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new RabbitNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -195,7 +187,6 @@ public class RabbitController extends MobEntityController {
             if (npc == null) {
                 super.I();
             }
-
         }
 
         @Override
@@ -210,12 +201,10 @@ public class RabbitController extends MobEntityController {
                 if (npc.getNavigator().isNavigating()) {
                     NMS.setShouldJump(getBukkitEntity());
                 }
-
                 npc.update();
             } else {
                 super.mobTick();
             }
-
         }
 
         @Override
@@ -233,7 +222,6 @@ public class RabbitController extends MobEntityController {
                 this.datawatcher.set(NMSImpl.getRabbitTypeField(), i);
                 return;
             }
-
             super.setRabbitType(i);
         }
 
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SalmonController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SalmonController.java
index 4d3bb5f21..1735bb506 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SalmonController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SalmonController.java
@@ -57,7 +57,6 @@ public class SalmonController extends MobEntityController {
             if (npc != null) {
                 this.moveController = new ControllerMove(this);
             }
-
         }
 
         @Override
@@ -70,7 +69,6 @@ public class SalmonController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -95,11 +93,9 @@ public class SalmonController extends MobEntityController {
                 if (!NMSImpl.moveFish(npc, this, f, f1, f2)) {
                     super.a(f, f1, f2);
                 }
-
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -115,7 +111,6 @@ public class SalmonController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -129,7 +124,6 @@ public class SalmonController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.c(f, f1);
             }
-
         }
 
         @Override
@@ -145,7 +139,6 @@ public class SalmonController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -174,7 +167,6 @@ public class SalmonController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -182,7 +174,6 @@ public class SalmonController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SalmonNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -201,7 +192,6 @@ public class SalmonController extends MobEntityController {
             if (npc == null) {
                 super.I();
             }
-
         }
 
         @Override
@@ -214,12 +204,10 @@ public class SalmonController extends MobEntityController {
             if (npc != null) {
                 NMSImpl.setNotInSchool(this);
             }
-
             super.mobTick();
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -228,12 +216,10 @@ public class SalmonController extends MobEntityController {
             if (npc != null) {
                 this.C = false;
             }
-
             super.movementTick();
             if (npc != null) {
                 this.C = lastInWater;
             }
-
         }
 
         @Override
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SheepController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SheepController.java
index 74609204d..b1598c929 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SheepController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SheepController.java
@@ -62,7 +62,6 @@ public class SheepController extends MobEntityController {
                 super.a(flag);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, flag, super::a);
         }
 
@@ -71,7 +70,6 @@ public class SheepController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -87,7 +85,6 @@ public class SheepController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -103,7 +100,6 @@ public class SheepController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -117,7 +113,6 @@ public class SheepController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.c(f, f1);
             }
-
         }
 
         @Override
@@ -133,7 +128,6 @@ public class SheepController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -162,7 +156,6 @@ public class SheepController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -170,7 +163,6 @@ public class SheepController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SheepNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -189,7 +181,6 @@ public class SheepController extends MobEntityController {
             if (npc == null) {
                 super.I();
             }
-
         }
 
         @Override
@@ -203,7 +194,6 @@ public class SheepController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ShulkerController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ShulkerController.java
index 17d27bead..7934c0102 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ShulkerController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ShulkerController.java
@@ -64,7 +64,6 @@ public class ShulkerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -80,7 +79,6 @@ public class ShulkerController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -96,7 +94,6 @@ public class ShulkerController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -110,7 +107,6 @@ public class ShulkerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.c(f, f1);
             }
-
         }
 
         @Override
@@ -126,7 +122,6 @@ public class ShulkerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -155,7 +150,6 @@ public class ShulkerController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -163,7 +157,6 @@ public class ShulkerController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new ShulkerNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -182,7 +175,6 @@ public class ShulkerController extends MobEntityController {
             if (npc == null) {
                 super.I();
             }
-
         }
 
         @Override
@@ -201,11 +193,8 @@ public class ShulkerController extends MobEntityController {
                     } catch (Throwable ex2) {
                         ex2.printStackTrace();
                     }
-
                 }
-
             }
-
         }
 
         @Override
@@ -227,7 +216,6 @@ public class ShulkerController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
 
         @Override
@@ -237,7 +225,6 @@ public class ShulkerController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SilverfishController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SilverfishController.java
index 81be94089..0a9be55f2 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SilverfishController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SilverfishController.java
@@ -61,7 +61,6 @@ public class SilverfishController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -77,7 +76,6 @@ public class SilverfishController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -93,7 +91,6 @@ public class SilverfishController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -107,7 +104,6 @@ public class SilverfishController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.c(f, f1);
             }
-
         }
 
         @Override
@@ -123,7 +119,6 @@ public class SilverfishController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -152,7 +147,6 @@ public class SilverfishController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -160,7 +154,6 @@ public class SilverfishController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SilverfishNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -179,7 +172,6 @@ public class SilverfishController extends MobEntityController {
             if (npc == null) {
                 super.I();
             }
-
         }
 
         @Override
@@ -193,7 +185,6 @@ public class SilverfishController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -210,7 +201,6 @@ public class SilverfishController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
 
         @Override
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SkeletonController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SkeletonController.java
index 9d5c73775..f354e62df 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SkeletonController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SkeletonController.java
@@ -61,7 +61,6 @@ public class SkeletonController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -77,7 +76,6 @@ public class SkeletonController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -93,7 +91,6 @@ public class SkeletonController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -107,7 +104,6 @@ public class SkeletonController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.c(f, f1);
             }
-
         }
 
         @Override
@@ -123,7 +119,6 @@ public class SkeletonController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -152,7 +147,6 @@ public class SkeletonController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -160,7 +154,6 @@ public class SkeletonController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SkeletonNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -179,7 +172,6 @@ public class SkeletonController extends MobEntityController {
             if (npc == null) {
                 super.I();
             }
-
         }
 
         @Override
@@ -193,7 +185,6 @@ public class SkeletonController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -210,7 +201,6 @@ public class SkeletonController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
 
         @Override
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SkeletonStrayController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SkeletonStrayController.java
index ce2cf5150..7337aa73a 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SkeletonStrayController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SkeletonStrayController.java
@@ -61,7 +61,6 @@ public class SkeletonStrayController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -77,7 +76,6 @@ public class SkeletonStrayController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -93,7 +91,6 @@ public class SkeletonStrayController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -107,7 +104,6 @@ public class SkeletonStrayController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.c(f, f1);
             }
-
         }
 
         @Override
@@ -123,7 +119,6 @@ public class SkeletonStrayController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -152,7 +147,6 @@ public class SkeletonStrayController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -160,7 +154,6 @@ public class SkeletonStrayController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new StrayNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -179,7 +172,6 @@ public class SkeletonStrayController extends MobEntityController {
             if (npc == null) {
                 super.I();
             }
-
         }
 
         @Override
@@ -193,7 +185,6 @@ public class SkeletonStrayController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -210,7 +201,6 @@ public class SkeletonStrayController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
 
         @Override
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SkeletonWitherController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SkeletonWitherController.java
index 8bffc70bc..1d5590f3f 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SkeletonWitherController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SkeletonWitherController.java
@@ -61,7 +61,6 @@ public class SkeletonWitherController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -77,7 +76,6 @@ public class SkeletonWitherController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -93,7 +91,6 @@ public class SkeletonWitherController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -107,7 +104,6 @@ public class SkeletonWitherController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.c(f, f1);
             }
-
         }
 
         @Override
@@ -123,7 +119,6 @@ public class SkeletonWitherController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -152,7 +147,6 @@ public class SkeletonWitherController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -160,7 +154,6 @@ public class SkeletonWitherController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SkeletonWitherNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -179,7 +172,6 @@ public class SkeletonWitherController extends MobEntityController {
             if (npc == null) {
                 super.I();
             }
-
         }
 
         @Override
@@ -193,7 +185,6 @@ public class SkeletonWitherController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -210,7 +201,6 @@ public class SkeletonWitherController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
 
         @Override
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SlimeController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SlimeController.java
index f91a3734b..19ae276aa 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SlimeController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SlimeController.java
@@ -55,7 +55,6 @@ public class SlimeController extends MobEntityController {
                 setSize(3, true);
                 this.moveController = new PlayerControllerMove(this);
             }
-
         }
 
         @Override
@@ -68,7 +67,6 @@ public class SlimeController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -84,7 +82,6 @@ public class SlimeController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -100,7 +97,6 @@ public class SlimeController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -114,7 +110,6 @@ public class SlimeController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.c(f, f1);
             }
-
         }
 
         @Override
@@ -130,7 +125,6 @@ public class SlimeController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -148,7 +142,6 @@ public class SlimeController extends MobEntityController {
             if (npc == null) {
                 super.d(human);
             }
-
         }
 
         @Override
@@ -167,7 +160,6 @@ public class SlimeController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -175,7 +167,6 @@ public class SlimeController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SlimeNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -194,7 +185,6 @@ public class SlimeController extends MobEntityController {
             if (npc == null) {
                 super.I();
             }
-
         }
 
         @Override
@@ -216,7 +206,6 @@ public class SlimeController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
 
         @Override
@@ -225,7 +214,6 @@ public class SlimeController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SnowmanController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SnowmanController.java
index 3f719cb54..aec5ac19d 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SnowmanController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SnowmanController.java
@@ -61,7 +61,6 @@ public class SnowmanController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -77,7 +76,6 @@ public class SnowmanController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -93,7 +91,6 @@ public class SnowmanController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -107,7 +104,6 @@ public class SnowmanController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.c(f, f1);
             }
-
         }
 
         @Override
@@ -123,7 +119,6 @@ public class SnowmanController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -152,7 +147,6 @@ public class SnowmanController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -160,7 +154,6 @@ public class SnowmanController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SnowmanNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -179,7 +172,6 @@ public class SnowmanController extends MobEntityController {
             if (npc == null) {
                 super.I();
             }
-
         }
 
         @Override
@@ -193,7 +185,6 @@ public class SnowmanController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -210,7 +201,6 @@ public class SnowmanController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
 
         @Override
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SpiderController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SpiderController.java
index a61161986..ffd2854bf 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SpiderController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SpiderController.java
@@ -61,7 +61,6 @@ public class SpiderController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -77,7 +76,6 @@ public class SpiderController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -93,7 +91,6 @@ public class SpiderController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -107,7 +104,6 @@ public class SpiderController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.c(f, f1);
             }
-
         }
 
         @Override
@@ -123,7 +119,6 @@ public class SpiderController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -152,7 +147,6 @@ public class SpiderController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -160,7 +154,6 @@ public class SpiderController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SpiderNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -179,7 +172,6 @@ public class SpiderController extends MobEntityController {
             if (npc == null) {
                 super.I();
             }
-
         }
 
         @Override
@@ -193,7 +185,6 @@ public class SpiderController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -210,7 +201,6 @@ public class SpiderController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
 
         @Override
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SquidController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SquidController.java
index a39f2a4df..62c6d95b6 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SquidController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/SquidController.java
@@ -61,7 +61,6 @@ public class SquidController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -77,7 +76,6 @@ public class SquidController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -93,7 +91,6 @@ public class SquidController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -107,7 +104,6 @@ public class SquidController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.c(f, f1);
             }
-
         }
 
         @Override
@@ -123,7 +119,6 @@ public class SquidController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -152,7 +147,6 @@ public class SquidController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -160,7 +154,6 @@ public class SquidController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SquidNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -179,7 +172,6 @@ public class SquidController extends MobEntityController {
             if (npc == null) {
                 super.I();
             }
-
         }
 
         @Override
@@ -193,7 +185,6 @@ public class SquidController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -210,7 +201,6 @@ public class SquidController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
 
         @Override
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/TropicalFishController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/TropicalFishController.java
index b8cd09cc6..d097988da 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/TropicalFishController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/TropicalFishController.java
@@ -57,7 +57,6 @@ public class TropicalFishController extends MobEntityController {
             if (npc != null) {
                 this.moveController = new ControllerMove(this);
             }
-
         }
 
         @Override
@@ -70,7 +69,6 @@ public class TropicalFishController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -95,11 +93,9 @@ public class TropicalFishController extends MobEntityController {
                 if (!NMSImpl.moveFish(npc, this, f, f1, f2)) {
                     super.a(f, f1, f2);
                 }
-
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -115,7 +111,6 @@ public class TropicalFishController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -129,7 +124,6 @@ public class TropicalFishController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.c(f, f1);
             }
-
         }
 
         @Override
@@ -145,7 +139,6 @@ public class TropicalFishController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -174,7 +167,6 @@ public class TropicalFishController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -182,7 +174,6 @@ public class TropicalFishController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new TropicalFishNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -201,7 +192,6 @@ public class TropicalFishController extends MobEntityController {
             if (npc == null) {
                 super.I();
             }
-
         }
 
         @Override
@@ -214,12 +204,10 @@ public class TropicalFishController extends MobEntityController {
             if (npc != null) {
                 NMSImpl.setNotInSchool(this);
             }
-
             super.mobTick();
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -228,12 +216,10 @@ public class TropicalFishController extends MobEntityController {
             if (npc != null) {
                 this.C = false;
             }
-
             super.movementTick();
             if (npc != null) {
                 this.C = lastInWater;
             }
-
         }
 
         @Override
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/TurtleController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/TurtleController.java
index 2b8c6a5b6..347986690 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/TurtleController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/TurtleController.java
@@ -56,7 +56,6 @@ public class TurtleController extends MobEntityController {
                 this.moveController = new ControllerMove(this);
                 this.h = new EmptyControllerJump(this);
             }
-
         }
 
         @Override
@@ -69,7 +68,6 @@ public class TurtleController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -84,11 +82,9 @@ public class TurtleController extends MobEntityController {
                 if (!NMSImpl.moveFish(npc, this, f, f1, f2)) {
                     super.a(f, f1, f2);
                 }
-
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -104,7 +100,6 @@ public class TurtleController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -118,7 +113,6 @@ public class TurtleController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.c(f, f1);
             }
-
         }
 
         @Override
@@ -134,7 +128,6 @@ public class TurtleController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -163,7 +156,6 @@ public class TurtleController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -171,7 +163,6 @@ public class TurtleController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new TurtleNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -190,7 +181,6 @@ public class TurtleController extends MobEntityController {
             if (npc == null) {
                 super.I();
             }
-
         }
 
         @Override
@@ -204,7 +194,6 @@ public class TurtleController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/VexController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/VexController.java
index 4f5abf90f..e51049ddb 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/VexController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/VexController.java
@@ -50,7 +50,6 @@ public class VexController extends MobEntityController {
             if (npc != null) {
                 setNoGravity(true);
             }
-
         }
 
         @Override
@@ -77,7 +76,6 @@ public class VexController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -99,7 +97,6 @@ public class VexController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -128,7 +125,6 @@ public class VexController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -136,7 +132,6 @@ public class VexController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new VexNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -155,7 +150,6 @@ public class VexController extends MobEntityController {
             if (npc == null) {
                 super.I();
             }
-
         }
 
         @Override
@@ -169,7 +163,6 @@ public class VexController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/VillagerController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/VillagerController.java
index 9bc1cf4ad..cc89d8cbb 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/VillagerController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/VillagerController.java
@@ -70,7 +70,6 @@ public class VillagerController extends MobEntityController {
                 super.a(flag);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, flag, super::a);
         }
 
@@ -79,7 +78,6 @@ public class VillagerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -96,9 +94,7 @@ public class VillagerController extends MobEntityController {
                 if (list != null) {
                     list.clear();
                 }
-
             }
-
             return super.a(entityhuman, enumhand);
         }
 
@@ -109,7 +105,6 @@ public class VillagerController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -125,7 +120,6 @@ public class VillagerController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -139,7 +133,6 @@ public class VillagerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.c(f, f1);
             }
-
         }
 
         @Override
@@ -155,7 +148,6 @@ public class VillagerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -184,7 +176,6 @@ public class VillagerController extends MobEntityController {
                 blockingATrade = false;
                 return true;
             }
-
             return super.dB();
         }
 
@@ -194,7 +185,6 @@ public class VillagerController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -202,7 +192,6 @@ public class VillagerController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new VillagerNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -221,7 +210,6 @@ public class VillagerController extends MobEntityController {
             if (npc == null) {
                 super.I();
             }
-
         }
 
         @Override
@@ -235,7 +223,6 @@ public class VillagerController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -250,7 +237,6 @@ public class VillagerController extends MobEntityController {
             if (npc == null) {
                 super.onLightningStrike(entitylightning);
             }
-
         }
 
         @Override
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/VindicatorController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/VindicatorController.java
index f5dcf4fc0..53ac2a31f 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/VindicatorController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/VindicatorController.java
@@ -62,7 +62,6 @@ public class VindicatorController extends MobEntityController {
                 super.a(flag);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, flag, super::a);
         }
 
@@ -71,7 +70,6 @@ public class VindicatorController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -87,7 +85,6 @@ public class VindicatorController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -103,7 +100,6 @@ public class VindicatorController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -117,7 +113,6 @@ public class VindicatorController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.c(f, f1);
             }
-
         }
 
         @Override
@@ -133,7 +128,6 @@ public class VindicatorController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -162,7 +156,6 @@ public class VindicatorController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -170,7 +163,6 @@ public class VindicatorController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new VindicatorNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -189,7 +181,6 @@ public class VindicatorController extends MobEntityController {
             if (npc == null) {
                 super.I();
             }
-
         }
 
         @Override
@@ -203,7 +194,6 @@ public class VindicatorController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/WitchController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/WitchController.java
index 51fa2f4d3..cc106aa38 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/WitchController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/WitchController.java
@@ -61,7 +61,6 @@ public class WitchController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -77,7 +76,6 @@ public class WitchController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -93,7 +91,6 @@ public class WitchController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -107,7 +104,6 @@ public class WitchController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.c(f, f1);
             }
-
         }
 
         @Override
@@ -123,7 +119,6 @@ public class WitchController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -152,7 +147,6 @@ public class WitchController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -160,7 +154,6 @@ public class WitchController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new WitchNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -179,7 +172,6 @@ public class WitchController extends MobEntityController {
             if (npc == null) {
                 super.I();
             }
-
         }
 
         @Override
@@ -193,7 +185,6 @@ public class WitchController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -210,7 +201,6 @@ public class WitchController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
 
         @Override
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/WitherController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/WitherController.java
index 950b8b75b..3e4dafd39 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/WitherController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/WitherController.java
@@ -73,7 +73,6 @@ public class WitherController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -95,7 +94,6 @@ public class WitherController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -130,7 +128,6 @@ public class WitherController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -138,7 +135,6 @@ public class WitherController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new WitherNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -157,7 +153,6 @@ public class WitherController extends MobEntityController {
             if (npc == null) {
                 super.I();
             }
-
         }
 
         @Override
@@ -177,7 +172,6 @@ public class WitherController extends MobEntityController {
             } else {
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/WolfController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/WolfController.java
index ef56c2e2a..bc0d9d74d 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/WolfController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/WolfController.java
@@ -64,7 +64,6 @@ public class WolfController extends MobEntityController {
                 super.a(flag);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, flag, super::a);
         }
 
@@ -73,7 +72,6 @@ public class WolfController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -89,7 +87,6 @@ public class WolfController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -105,7 +102,6 @@ public class WolfController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -119,7 +115,6 @@ public class WolfController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.c(f, f1);
             }
-
         }
 
         @Override
@@ -135,7 +130,6 @@ public class WolfController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -164,7 +158,6 @@ public class WolfController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -172,7 +165,6 @@ public class WolfController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new WolfNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -191,7 +183,6 @@ public class WolfController extends MobEntityController {
             if (npc == null) {
                 super.I();
             }
-
         }
 
         @Override
@@ -205,7 +196,6 @@ public class WolfController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ZombieController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ZombieController.java
index 462ec22be..26a892864 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ZombieController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ZombieController.java
@@ -61,7 +61,6 @@ public class ZombieController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -77,7 +76,6 @@ public class ZombieController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -93,7 +91,6 @@ public class ZombieController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -107,7 +104,6 @@ public class ZombieController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.c(f, f1);
             }
-
         }
 
         @Override
@@ -123,7 +119,6 @@ public class ZombieController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -152,7 +147,6 @@ public class ZombieController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -160,7 +154,6 @@ public class ZombieController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new ZombieNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -179,7 +172,6 @@ public class ZombieController extends MobEntityController {
             if (npc == null) {
                 super.I();
             }
-
         }
 
         @Override
@@ -193,7 +185,6 @@ public class ZombieController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ZombieHuskController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ZombieHuskController.java
index 05b169297..522d52414 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ZombieHuskController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ZombieHuskController.java
@@ -61,7 +61,6 @@ public class ZombieHuskController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -77,7 +76,6 @@ public class ZombieHuskController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -93,7 +91,6 @@ public class ZombieHuskController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -107,7 +104,6 @@ public class ZombieHuskController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.c(f, f1);
             }
-
         }
 
         @Override
@@ -123,7 +119,6 @@ public class ZombieHuskController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -152,7 +147,6 @@ public class ZombieHuskController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -160,7 +154,6 @@ public class ZombieHuskController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new ZombieHuskNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -179,7 +172,6 @@ public class ZombieHuskController extends MobEntityController {
             if (npc == null) {
                 super.I();
             }
-
         }
 
         @Override
@@ -193,7 +185,6 @@ public class ZombieHuskController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ZombieVillagerController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ZombieVillagerController.java
index 490c0b8bc..29b09d14c 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ZombieVillagerController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ZombieVillagerController.java
@@ -61,7 +61,6 @@ public class ZombieVillagerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -77,7 +76,6 @@ public class ZombieVillagerController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1, f2);
             }
-
         }
 
         @Override
@@ -93,7 +91,6 @@ public class ZombieVillagerController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -107,7 +104,6 @@ public class ZombieVillagerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.c(f, f1);
             }
-
         }
 
         @Override
@@ -123,7 +119,6 @@ public class ZombieVillagerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -152,7 +147,6 @@ public class ZombieVillagerController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -160,7 +154,6 @@ public class ZombieVillagerController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new ZombieVillagerNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -179,7 +172,6 @@ public class ZombieVillagerController extends MobEntityController {
             if (npc == null) {
                 super.I();
             }
-
         }
 
         @Override
@@ -193,7 +185,6 @@ public class ZombieVillagerController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/AreaEffectCloudController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/AreaEffectCloudController.java
index 3ac9ea4e8..9189b7e54 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/AreaEffectCloudController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/AreaEffectCloudController.java
@@ -75,7 +75,6 @@ public class AreaEffectCloudController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -87,7 +86,6 @@ public class AreaEffectCloudController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -101,7 +99,6 @@ public class AreaEffectCloudController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -109,7 +106,6 @@ public class AreaEffectCloudController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new AreaEffectCloudNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -130,7 +126,6 @@ public class AreaEffectCloudController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
     }
 }
\ No newline at end of file
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/BoatController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/BoatController.java
index e7dcf0ac2..307879dba 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/BoatController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/BoatController.java
@@ -76,7 +76,6 @@ public class BoatController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -88,7 +87,6 @@ public class BoatController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -102,7 +100,6 @@ public class BoatController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -110,7 +107,6 @@ public class BoatController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new BoatNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -131,7 +127,6 @@ public class BoatController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
 
         @Override
@@ -141,7 +136,6 @@ public class BoatController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
     }
 }
\ No newline at end of file
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/DragonFireballController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/DragonFireballController.java
index ed80a4830..78c9e51b6 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/DragonFireballController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/DragonFireballController.java
@@ -76,7 +76,6 @@ public class DragonFireballController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -88,7 +87,6 @@ public class DragonFireballController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -102,7 +100,6 @@ public class DragonFireballController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -110,7 +107,6 @@ public class DragonFireballController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new DragonFireballNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -131,7 +127,6 @@ public class DragonFireballController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
 
         @Override
@@ -141,11 +136,9 @@ public class DragonFireballController extends MobEntityController {
                 if (!npc.isProtected()) {
                     super.tick();
                 }
-
             } else {
                 super.tick();
             }
-
         }
     }
 }
\ No newline at end of file
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/EggController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/EggController.java
index 4283d58a1..4a21d449e 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/EggController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/EggController.java
@@ -91,7 +91,6 @@ public class EggController extends AbstractEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -103,7 +102,6 @@ public class EggController extends AbstractEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -117,7 +115,6 @@ public class EggController extends AbstractEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -125,7 +122,6 @@ public class EggController extends AbstractEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new EggNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -146,11 +142,9 @@ public class EggController extends AbstractEntityController {
                 if (!npc.isProtected()) {
                     super.tick();
                 }
-
             } else {
                 super.tick();
             }
-
         }
     }
 }
\ No newline at end of file
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/EnderCrystalController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/EnderCrystalController.java
index 980422c37..b03041c91 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/EnderCrystalController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/EnderCrystalController.java
@@ -75,7 +75,6 @@ public class EnderCrystalController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -87,7 +86,6 @@ public class EnderCrystalController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -101,7 +99,6 @@ public class EnderCrystalController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -109,7 +106,6 @@ public class EnderCrystalController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new EnderCrystalNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -130,7 +126,6 @@ public class EnderCrystalController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
     }
 }
\ No newline at end of file
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/EnderPearlController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/EnderPearlController.java
index 708e41542..27cb51e1d 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/EnderPearlController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/EnderPearlController.java
@@ -75,7 +75,6 @@ public class EnderPearlController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -87,7 +86,6 @@ public class EnderPearlController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -101,7 +99,6 @@ public class EnderPearlController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -109,7 +106,6 @@ public class EnderPearlController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new EnderPearlNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -130,11 +126,9 @@ public class EnderPearlController extends MobEntityController {
                 if (!npc.isProtected()) {
                     super.tick();
                 }
-
             } else {
                 super.tick();
             }
-
         }
     }
 }
\ No newline at end of file
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/EnderSignalController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/EnderSignalController.java
index f09882011..567ab17c4 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/EnderSignalController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/EnderSignalController.java
@@ -75,7 +75,6 @@ public class EnderSignalController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -87,7 +86,6 @@ public class EnderSignalController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -101,7 +99,6 @@ public class EnderSignalController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -109,7 +106,6 @@ public class EnderSignalController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new EnderSignalNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -130,7 +126,6 @@ public class EnderSignalController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
     }
 }
\ No newline at end of file
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/EvokerFangsController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/EvokerFangsController.java
index 4c68683e3..9731c22e8 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/EvokerFangsController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/EvokerFangsController.java
@@ -77,7 +77,6 @@ public class EvokerFangsController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -89,7 +88,6 @@ public class EvokerFangsController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -103,7 +101,6 @@ public class EvokerFangsController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -111,7 +108,6 @@ public class EvokerFangsController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new EvokerFangsNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -131,7 +127,6 @@ public class EvokerFangsController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
     }
 
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ExperienceOrbController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ExperienceOrbController.java
index 46c64ecf6..ed5fd569c 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ExperienceOrbController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ExperienceOrbController.java
@@ -61,7 +61,6 @@ public class ExperienceOrbController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -73,7 +72,6 @@ public class ExperienceOrbController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -87,7 +85,6 @@ public class ExperienceOrbController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -95,7 +92,6 @@ public class ExperienceOrbController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new ExperienceOrbNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -116,7 +112,6 @@ public class ExperienceOrbController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
     }
 
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/FallingBlockController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/FallingBlockController.java
index 8206c51ba..e7f3df52c 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/FallingBlockController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/FallingBlockController.java
@@ -84,7 +84,6 @@ public class FallingBlockController extends AbstractEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -96,7 +95,6 @@ public class FallingBlockController extends AbstractEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -110,7 +108,6 @@ public class FallingBlockController extends AbstractEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -118,7 +115,6 @@ public class FallingBlockController extends AbstractEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new FallingBlockNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -139,7 +135,6 @@ public class FallingBlockController extends AbstractEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
 
         @Override
@@ -152,11 +147,9 @@ public class FallingBlockController extends AbstractEntityController {
                     motZ *= 0.98;
                     move(EnumMoveType.SELF, motX, motY, motZ);
                 }
-
             } else {
                 super.tick();
             }
-
         }
 
         private static final double EPSILON = 0.001;
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/FireworkController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/FireworkController.java
index e3bd6c7da..89df02d76 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/FireworkController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/FireworkController.java
@@ -61,7 +61,6 @@ public class FireworkController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -73,7 +72,6 @@ public class FireworkController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -87,7 +85,6 @@ public class FireworkController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -95,7 +92,6 @@ public class FireworkController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new FireworkNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -116,7 +112,6 @@ public class FireworkController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
     }
 
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/FishingHookController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/FishingHookController.java
index 8a8631e5e..dfc988d1f 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/FishingHookController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/FishingHookController.java
@@ -70,7 +70,6 @@ public class FishingHookController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -82,7 +81,6 @@ public class FishingHookController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -96,7 +94,6 @@ public class FishingHookController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -104,7 +101,6 @@ public class FishingHookController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new FishingHookNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -125,7 +121,6 @@ public class FishingHookController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
     }
 
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ItemController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ItemController.java
index 7a18636d9..cb11d5864 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ItemController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ItemController.java
@@ -74,7 +74,6 @@ public class ItemController extends AbstractEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -86,7 +85,6 @@ public class ItemController extends AbstractEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -94,7 +92,6 @@ public class ItemController extends AbstractEntityController {
             if (npc == null) {
                 super.d(entityhuman);
             }
-
         }
 
         @Override
@@ -108,7 +105,6 @@ public class ItemController extends AbstractEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -116,7 +112,6 @@ public class ItemController extends AbstractEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new ItemNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -137,7 +132,6 @@ public class ItemController extends AbstractEntityController {
             } else {
                 super.tick();
             }
-
         }
     }
 
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ItemFrameController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ItemFrameController.java
index b37291086..41f250596 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ItemFrameController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ItemFrameController.java
@@ -74,7 +74,6 @@ public class ItemFrameController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -86,7 +85,6 @@ public class ItemFrameController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -100,7 +98,6 @@ public class ItemFrameController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -108,7 +105,6 @@ public class ItemFrameController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new ItemFrameNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -134,7 +130,6 @@ public class ItemFrameController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
     }
 
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/LargeFireballController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/LargeFireballController.java
index f05595a08..301ea6c55 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/LargeFireballController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/LargeFireballController.java
@@ -62,7 +62,6 @@ public class LargeFireballController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -74,7 +73,6 @@ public class LargeFireballController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -88,7 +86,6 @@ public class LargeFireballController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -96,7 +93,6 @@ public class LargeFireballController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new LargeFireballNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -117,7 +113,6 @@ public class LargeFireballController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
 
         @Override
@@ -127,11 +122,9 @@ public class LargeFireballController extends MobEntityController {
                 if (!npc.isProtected()) {
                     super.tick();
                 }
-
             } else {
                 super.tick();
             }
-
         }
     }
 
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/LeashController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/LeashController.java
index e06e8e04d..2fe75a5c7 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/LeashController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/LeashController.java
@@ -61,7 +61,6 @@ public class LeashController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -73,7 +72,6 @@ public class LeashController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -87,7 +85,6 @@ public class LeashController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -95,7 +92,6 @@ public class LeashController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new LeashNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -121,7 +117,6 @@ public class LeashController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
     }
 
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/LlamaSpitController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/LlamaSpitController.java
index a467899c3..e2cb1cab6 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/LlamaSpitController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/LlamaSpitController.java
@@ -79,7 +79,6 @@ public class LlamaSpitController extends AbstractEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -91,7 +90,6 @@ public class LlamaSpitController extends AbstractEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -105,7 +103,6 @@ public class LlamaSpitController extends AbstractEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -113,7 +110,6 @@ public class LlamaSpitController extends AbstractEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new LlamaSpitNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -134,11 +130,9 @@ public class LlamaSpitController extends AbstractEntityController {
                 if (!npc.isProtected()) {
                     super.tick();
                 }
-
             } else {
                 super.tick();
             }
-
         }
     }
 
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartChestController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartChestController.java
index 8ae618479..565177843 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartChestController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartChestController.java
@@ -62,7 +62,6 @@ public class MinecartChestController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -74,7 +73,6 @@ public class MinecartChestController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -88,7 +86,6 @@ public class MinecartChestController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -96,7 +93,6 @@ public class MinecartChestController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new MinecartChestNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -117,7 +113,6 @@ public class MinecartChestController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
     }
 
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartCommandController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartCommandController.java
index eee2c5196..70399a7bf 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartCommandController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartCommandController.java
@@ -62,7 +62,6 @@ public class MinecartCommandController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -74,7 +73,6 @@ public class MinecartCommandController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -88,7 +86,6 @@ public class MinecartCommandController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -96,7 +93,6 @@ public class MinecartCommandController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new MinecartCommandNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -117,7 +113,6 @@ public class MinecartCommandController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
     }
 
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartFurnaceController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartFurnaceController.java
index 1c559eabc..bd157a8f5 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartFurnaceController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartFurnaceController.java
@@ -62,7 +62,6 @@ public class MinecartFurnaceController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -74,7 +73,6 @@ public class MinecartFurnaceController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -88,7 +86,6 @@ public class MinecartFurnaceController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -96,7 +93,6 @@ public class MinecartFurnaceController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new MinecartFurnaceNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -117,7 +113,6 @@ public class MinecartFurnaceController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
     }
 
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartHopperController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartHopperController.java
index e5bcf2a78..dad2c9cdd 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartHopperController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartHopperController.java
@@ -58,7 +58,6 @@ public class MinecartHopperController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -70,7 +69,6 @@ public class MinecartHopperController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -84,7 +82,6 @@ public class MinecartHopperController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -104,7 +101,6 @@ public class MinecartHopperController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
     }
 }
\ No newline at end of file
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartRideableController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartRideableController.java
index aef871672..182ef50df 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartRideableController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartRideableController.java
@@ -62,7 +62,6 @@ public class MinecartRideableController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -74,7 +73,6 @@ public class MinecartRideableController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -88,7 +86,6 @@ public class MinecartRideableController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -96,7 +93,6 @@ public class MinecartRideableController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new MinecartRideableNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -117,7 +113,6 @@ public class MinecartRideableController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
     }
 
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartSpawnerController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartSpawnerController.java
index 15c72940d..db7b07545 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartSpawnerController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartSpawnerController.java
@@ -58,7 +58,6 @@ public class MinecartSpawnerController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -70,7 +69,6 @@ public class MinecartSpawnerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -84,7 +82,6 @@ public class MinecartSpawnerController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -104,7 +101,6 @@ public class MinecartSpawnerController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
     }
 }
\ No newline at end of file
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartTNTController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartTNTController.java
index 7c66fae5e..969d6887c 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartTNTController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/MinecartTNTController.java
@@ -58,7 +58,6 @@ public class MinecartTNTController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -70,7 +69,6 @@ public class MinecartTNTController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -84,7 +82,6 @@ public class MinecartTNTController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -104,7 +101,6 @@ public class MinecartTNTController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
     }
 }
\ No newline at end of file
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/PaintingController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/PaintingController.java
index de27f2ffd..28e03d795 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/PaintingController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/PaintingController.java
@@ -61,7 +61,6 @@ public class PaintingController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -73,7 +72,6 @@ public class PaintingController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -87,7 +85,6 @@ public class PaintingController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -95,7 +92,6 @@ public class PaintingController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new PaintingNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -121,7 +117,6 @@ public class PaintingController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
     }
 
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ShulkerBulletController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ShulkerBulletController.java
index d888ab3be..3338734ba 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ShulkerBulletController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ShulkerBulletController.java
@@ -61,7 +61,6 @@ public class ShulkerBulletController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -73,7 +72,6 @@ public class ShulkerBulletController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -87,7 +85,6 @@ public class ShulkerBulletController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -95,7 +92,6 @@ public class ShulkerBulletController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new ShulkerBulletNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -116,7 +112,6 @@ public class ShulkerBulletController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
     }
 
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/SmallFireballController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/SmallFireballController.java
index 320fe2112..d1f68a1c6 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/SmallFireballController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/SmallFireballController.java
@@ -61,7 +61,6 @@ public class SmallFireballController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -73,7 +72,6 @@ public class SmallFireballController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -87,7 +85,6 @@ public class SmallFireballController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -95,7 +92,6 @@ public class SmallFireballController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SmallFireballNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -116,11 +112,9 @@ public class SmallFireballController extends MobEntityController {
                 if (!npc.isProtected()) {
                     super.tick();
                 }
-
             } else {
                 super.tick();
             }
-
         }
     }
 
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/SnowballController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/SnowballController.java
index 0941c8a1f..1edb285e7 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/SnowballController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/SnowballController.java
@@ -61,7 +61,6 @@ public class SnowballController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -73,7 +72,6 @@ public class SnowballController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -87,7 +85,6 @@ public class SnowballController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -95,7 +92,6 @@ public class SnowballController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SnowballNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -116,7 +112,6 @@ public class SnowballController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
     }
 
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/SpectralArrowController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/SpectralArrowController.java
index 84cbb4a70..0203b7a4b 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/SpectralArrowController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/SpectralArrowController.java
@@ -61,7 +61,6 @@ public class SpectralArrowController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -73,7 +72,6 @@ public class SpectralArrowController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -87,7 +85,6 @@ public class SpectralArrowController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -95,7 +92,6 @@ public class SpectralArrowController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SpectralArrowNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -116,7 +112,6 @@ public class SpectralArrowController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
     }
 
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/TNTPrimedController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/TNTPrimedController.java
index e0232fa6f..ab3d89bf3 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/TNTPrimedController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/TNTPrimedController.java
@@ -61,7 +61,6 @@ public class TNTPrimedController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -73,7 +72,6 @@ public class TNTPrimedController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -87,7 +85,6 @@ public class TNTPrimedController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -95,7 +92,6 @@ public class TNTPrimedController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new TNTPrimedNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -116,7 +112,6 @@ public class TNTPrimedController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
     }
 
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ThrownExpBottleController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ThrownExpBottleController.java
index 7b80b9364..d6e749d17 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ThrownExpBottleController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ThrownExpBottleController.java
@@ -61,7 +61,6 @@ public class ThrownExpBottleController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -73,7 +72,6 @@ public class ThrownExpBottleController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -87,7 +85,6 @@ public class ThrownExpBottleController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -95,7 +92,6 @@ public class ThrownExpBottleController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new ThrownExpBottleNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -116,11 +112,9 @@ public class ThrownExpBottleController extends MobEntityController {
                 if (!npc.isProtected()) {
                     super.tick();
                 }
-
             } else {
                 super.tick();
             }
-
         }
     }
 
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ThrownPotionController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ThrownPotionController.java
index ffe2cefbe..8513268d0 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ThrownPotionController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ThrownPotionController.java
@@ -62,7 +62,6 @@ public class ThrownPotionController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -74,7 +73,6 @@ public class ThrownPotionController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -88,7 +86,6 @@ public class ThrownPotionController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -99,9 +96,7 @@ public class ThrownPotionController extends MobEntityController {
                 } else {
                     bukkitEntity = new SplashThrownPotionNPC(this);
                 }
-
             }
-
             return super.getBukkitEntity();
         }
 
@@ -122,7 +117,6 @@ public class ThrownPotionController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
     }
 
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ThrownTridentController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ThrownTridentController.java
index 39cc4b26e..2d716eeeb 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ThrownTridentController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/ThrownTridentController.java
@@ -61,7 +61,6 @@ public class ThrownTridentController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -73,7 +72,6 @@ public class ThrownTridentController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -87,7 +85,6 @@ public class ThrownTridentController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -95,7 +92,6 @@ public class ThrownTridentController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new ThrownTridentNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -116,7 +112,6 @@ public class ThrownTridentController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
     }
 
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/TippedArrowController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/TippedArrowController.java
index f24f96648..f61c0c44a 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/TippedArrowController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/TippedArrowController.java
@@ -61,7 +61,6 @@ public class TippedArrowController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -73,7 +72,6 @@ public class TippedArrowController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -87,7 +85,6 @@ public class TippedArrowController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -95,7 +92,6 @@ public class TippedArrowController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new TippedArrowNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -116,7 +112,6 @@ public class TippedArrowController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
     }
 
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/WitherSkullController.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/WitherSkullController.java
index 411bc569e..06a5d2db1 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/WitherSkullController.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/nonliving/WitherSkullController.java
@@ -61,7 +61,6 @@ public class WitherSkullController extends MobEntityController {
                 motY = my;
                 motZ = mz;
             }
-
             return res;
         }
 
@@ -73,7 +72,6 @@ public class WitherSkullController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -87,7 +85,6 @@ public class WitherSkullController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -95,7 +92,6 @@ public class WitherSkullController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new WitherSkullNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -116,7 +112,6 @@ public class WitherSkullController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
     }
 
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/CitizensBlockBreaker.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/CitizensBlockBreaker.java
index 6266fcee1..6a6a9b4ad 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/CitizensBlockBreaker.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/CitizensBlockBreaker.java
@@ -47,7 +47,6 @@ public class CitizensBlockBreaker extends AbstractBlockBreaker {
             ItemStack current = getCurrentItem();
             return current != null ? current.b(block) : false;
         }
-
     }
 
     @Override
@@ -65,13 +64,10 @@ public class CitizensBlockBreaker extends AbstractBlockBreaker {
                 if (i > 0) {
                     f += i * i + 1;
                 }
-
             }
-
             if (handle.hasEffect(MobEffects.FASTER_DIG)) {
                 f *= 1.0F + (handle.getEffect(MobEffects.FASTER_DIG).getAmplifier() + 1) * 0.2F;
             }
-
             if (handle.hasEffect(MobEffects.SLOWER_DIG)) {
                 float f1 = 1.0F;
                 switch (handle.getEffect(MobEffects.SLOWER_DIG).getAmplifier()) {
@@ -88,20 +84,15 @@ public class CitizensBlockBreaker extends AbstractBlockBreaker {
                     default:
                         f1 = 8.1E-4F;
                 }
-
                 f *= f1;
             }
-
             if (handle.a(TagsFluid.WATER) && !EnchantmentManager.h(handle)) {
                 f /= 5.0F;
             }
-
         }
-
         if (!getHandle().onGround) {
             f /= 5.0F;
         }
-
         return f;
     }
 }
\ No newline at end of file
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/CustomEntityRegistry.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/CustomEntityRegistry.java
index 72b977220..f9bdc82f6 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/CustomEntityRegistry.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/CustomEntityRegistry.java
@@ -47,7 +47,6 @@ public class CustomEntityRegistry extends RegistryMaterials implements Supplier<
             if (((EntityTypes) type).c() == search)
                 return (EntityTypes) type;
         }
-
         return null;
     }
 
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/EmptyAdvancementDataPlayer.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/EmptyAdvancementDataPlayer.java
index 3e7db0ca5..f59fe8ffc 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/EmptyAdvancementDataPlayer.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/EmptyAdvancementDataPlayer.java
@@ -66,7 +66,6 @@ public class EmptyAdvancementDataPlayer extends AdvancementDataPlayer {
         } catch (IllegalAccessException e) {
             e.printStackTrace();
         }
-
     }
 
     private static final Field G = NMS.getField(AdvancementDataPlayer.class, "g");
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/NMSBoundingBox.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/NMSBoundingBox.java
index 0bc791ad3..5bb074cae 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/NMSBoundingBox.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/NMSBoundingBox.java
@@ -41,9 +41,7 @@ public class NMSBoundingBox {
             } catch (Exception ex2) {
                 ex.printStackTrace();
             }
-
         }
-
         return new BoundingBox(minX, minY, minZ, maxX, maxY, maxZ);
     }
 
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/NMSImpl.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/NMSImpl.java
index 43294a740..20ee4eacd 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/NMSImpl.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/NMSImpl.java
@@ -319,7 +319,6 @@ public class NMSImpl implements NMSBridge {
         } else if (!handle.world.players.contains(handle)) {
             handle.world.players.add(handle);
         }
-
     }
 
     @Override
@@ -332,7 +331,6 @@ public class NMSImpl implements NMSBridge {
             PlayerAnimation.ARM_SWING.play(humanHandle.getBukkitEntity());
             return;
         }
-
         AttributeInstance attackDamage = handle.getAttributeInstance(GenericAttributes.ATTACK_DAMAGE);
         float f = (float) (attackDamage == null ? 1 : attackDamage.getValue());
         int i = 0;
@@ -340,7 +338,6 @@ public class NMSImpl implements NMSBridge {
             f += EnchantmentManager.a(handle.getItemInMainHand(), target.getMonsterType());
             i += EnchantmentManager.a(Enchantments.KNOCKBACK, handle);
         }
-
         boolean flag = target.damageEntity(DamageSource.mobAttack(handle), f);
         if (!flag)
             return;
@@ -350,12 +347,10 @@ public class NMSImpl implements NMSBridge {
             handle.motX *= 0.6D;
             handle.motZ *= 0.6D;
         }
-
         int fireAspectLevel = EnchantmentManager.getFireAspectEnchantmentLevel(handle);
         if (fireAspectLevel > 0) {
             target.setOnFire(fireAspectLevel * 4);
         }
-
     }
 
     @Override
@@ -367,11 +362,9 @@ public class NMSImpl implements NMSBridge {
             } catch (Throwable t) {
                 t.printStackTrace();
             }
-
         } else if (handle instanceof EntityHumanNPC) {
             ((EntityHumanNPC) handle).getControllerMove().f = false;
         }
-
     }
 
     @Override
@@ -405,19 +398,14 @@ public class NMSImpl implements NMSBridge {
                         if (!changed && !ItemStack.matches(old, curr)) {
                             changed = true;
                         }
-
                         equipment.put(slot, curr);
                     }
-
                     if (changed) {
                         for (EnumItemSlot slot : EnumItemSlot.values()) {
                             agg.send(new PacketPlayOutEntityEquipment(handle.getId(), slot, equipment.get(slot)));
                         }
-
                     }
-
                 }
-
                 tracker.track(Lists.newArrayList(tracker.trackedPlayers));
             }
 
@@ -437,9 +425,7 @@ public class NMSImpl implements NMSBridge {
                     if (callback != null) {
                         callback.accept(entity);
                     }
-
                 }
-
                 tracker.trackedPlayers.clear();
             }
         };
@@ -487,7 +473,6 @@ public class NMSImpl implements NMSBridge {
                 } catch (NoSuchFieldError ex) {
                     bserver = (BossBattleServer) WITHER_BOSS_BAR_FIELD.get(NMSImpl.getHandle(entity));
                 }
-
             } else if (entity.getType() == EntityType.ENDER_DRAGON) {
                 try {
                     bserver = ((EnderDragonBattle) ENDERDRAGON_BATTLE_FIELD.get(NMSImpl.getHandle(entity))).bossBattle;
@@ -495,12 +480,9 @@ public class NMSImpl implements NMSBridge {
                     bserver = (BossBattleServer) ENDERDRAGON_BATTLE_BAR_FIELD
                             .get(ENDERDRAGON_BATTLE_FIELD.get(NMSImpl.getHandle(entity)));
                 }
-
             }
-
         } catch (Exception e) {
         }
-
         if (bserver == null)
             return null;
         BossBar ret = Bukkit.createBossBar("", BarColor.BLUE, BarStyle.SEGMENTED_10);
@@ -508,7 +490,6 @@ public class NMSImpl implements NMSBridge {
             CRAFT_BOSSBAR_HANDLE_FIELD.set(ret, bserver);
         } catch (Exception e) {
         }
-
         return ret;
     }
 
@@ -620,15 +601,12 @@ public class NMSImpl implements NMSBridge {
             } catch (Exception e) {
                 return null;
             }
-
         }
-
         try {
             return (GameProfile) SKULL_PROFILE_FIELD.get(meta);
         } catch (Exception e) {
             return null;
         }
-
     }
 
     @Override
@@ -641,7 +619,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Exception e) {
             throw new CommandException(Messages.INVALID_SOUND);
         }
-
     }
 
     @Override
@@ -657,7 +634,6 @@ public class NMSImpl implements NMSBridge {
         EntityLiving handle = NMSImpl.getHandle((LivingEntity) npc.getEntity());
         if (handle == null) {
         }
-
         return DEFAULT_SPEED;
         // return (float)
         // handle.getAttributeInstance(GenericAttributes.d).getValue();
@@ -701,9 +677,7 @@ public class NMSImpl implements NMSBridge {
             } else {
                 ((EntityInsentient) raw).a(PathType.WATER, oldWater + 1F);
             }
-
         }
-
         navigation.s().b(params.hasExaminer(DoorExaminer.class));
         return new MCNavigator() {
             float lastSpeed;
@@ -716,7 +690,6 @@ public class NMSImpl implements NMSBridge {
                     PathPoint pp = navigation.m().a(i);
                     blocks.add(entity.getWorld().getBlockAt(pp.a, pp.b, pp.c));
                 }
-
                 return blocks;
             }
 
@@ -736,16 +709,13 @@ public class NMSImpl implements NMSBridge {
                     List<org.bukkit.block.Block> blocks = getBlocks(entity, navigation);
                     Util.sendBlockChanges(blocks, null);
                 }
-
                 if (oldWater >= 0) {
                     if (raw instanceof EntityPlayer) {
                         ((EntityHumanNPC) raw).a(PathType.WATER, oldWater);
                     } else {
                         ((EntityInsentient) raw).a(PathType.WATER, oldWater);
                     }
-
                 }
-
                 stopNavigation(navigation);
             }
 
@@ -757,20 +727,16 @@ public class NMSImpl implements NMSBridge {
                     if (handle instanceof EntityHorse) {
                         handle.width = Math.min(0.99f, oldWidth);
                     }
-
                     if (!function.apply(navigation)) {
                         reason = CancelReason.STUCK;
                     }
-
                     handle.width = oldWidth; // minecraft requires that an entity fit onto both blocks if width >= 1f,
                                              // but we'd prefer to make it just fit on 1 so hack around it a bit.
                     lastSpeed = params.speed();
                 }
-
                 if (params.debug() && !NMSImpl.isNavigationFinished(navigation)) {
                     Util.sendBlockChanges(getBlocks(entity, navigation), Material.DANDELION);
                 }
-
                 navigation.a(params.speed());
                 return NMSImpl.isNavigationFinished(navigation);
             }
@@ -969,37 +935,30 @@ public class NMSImpl implements NMSBridge {
             if (zDiff < 0.0) {
                 yaw += Math.abs(180 - yaw) * 2;
             }
-
             if (handle instanceof EntityEnderDragon) {
                 yaw = Util.getDragonYaw(handle.getBukkitEntity(), xDiff, zDiff);
             } else {
                 yaw = yaw - 90;
             }
-
             if (headOnly) {
                 setHeadYaw(entity, (float) yaw);
             } else {
                 look(entity, (float) yaw, (float) pitch);
             }
-
             return;
         }
-
         if (handle instanceof EntityInsentient) {
             ((EntityInsentient) handle).getControllerLook().a(to.getX(), to.getY(), to.getZ(),
                     ((EntityInsentient) handle).L(), ((EntityInsentient) handle).K());
             while (((EntityLiving) handle).aS >= 180F) {
                 ((EntityLiving) handle).aS -= 360F;
             }
-
             while (((EntityLiving) handle).aS < -180F) {
                 ((EntityLiving) handle).aS += 360F;
             }
-
         } else if (handle instanceof EntityHumanNPC) {
             ((EntityHumanNPC) handle).getNPC().getOrAddTrait(RotationTrait.class).getPhysicalSession().rotateToFace(to);
         }
-
     }
 
     @Override
@@ -1012,22 +971,18 @@ public class NMSImpl implements NMSBridge {
             } else {
                 look(from, to.getLocation(), false, true);
             }
-
         } else if (handle instanceof EntityInsentient) {
             ((EntityInsentient) handle).getControllerLook().a(target, ((EntityInsentient) handle).L(),
                     ((EntityInsentient) handle).K());
             while (((EntityLiving) handle).aS >= 180F) {
                 ((EntityLiving) handle).aS -= 360F;
             }
-
             while (((EntityLiving) handle).aS < -180F) {
                 ((EntityLiving) handle).aS += 360F;
             }
-
         } else if (handle instanceof EntityHumanNPC) {
             ((EntityHumanNPC) handle).getNPC().getOrAddTrait(RotationTrait.class).getPhysicalSession().rotateToFace(to);
         }
-
     }
 
     @Override
@@ -1069,9 +1024,7 @@ public class NMSImpl implements NMSBridge {
                         e.printStackTrace();
                         return super.getBukkitView();
                     }
-
                 }
-
                 return this.bukkitEntity;
             }
         };
@@ -1117,7 +1070,6 @@ public class NMSImpl implements NMSBridge {
                 if (entity1.dead || !entity1.w(entity)) {
                     entity.stopRiding();
                 }
-
             } else {
                 if (!entity.dead) {
                     try {
@@ -1128,22 +1080,17 @@ public class NMSImpl implements NMSBridge {
                         entity.appendEntityCrashDetails(crashreportsystemdetails);
                         throw new ReportedException(crashreport);
                     }
-
                 }
-
                 if (entity.dead) {
                     entity.world.removeEntity(entity);
                 } else if (!removeFromPlayerList) {
                     if (!entity.world.players.contains(entity)) {
                         entity.world.players.add(entity);
                     }
-
                 } else {
                     entity.world.players.remove(entity);
                 }
-
             }
-
         };
     }
 
@@ -1158,12 +1105,10 @@ public class NMSImpl implements NMSBridge {
             if (key == null) {
                 continue;
             }
-
             int code = ENTITY_REGISTRY.a(type);
             ENTITY_REGISTRY.put(code, key, type);
             return;
         }
-
         throw new IllegalArgumentException("unable to find valid entity superclass for class " + clazz.toString());
     }
 
@@ -1202,7 +1147,6 @@ public class NMSImpl implements NMSBridge {
             hook.hooked = null;
             hook.getBukkitEntity().remove();
         }
-
     }
 
     @Override
@@ -1224,13 +1168,10 @@ public class NMSImpl implements NMSBridge {
             } catch (IllegalAccessException e) {
                 e.printStackTrace();
             }
-
         }
-
         if (getHandle(entity) instanceof EntityHumanNPC) {
             ((EntityHumanNPC) getHandle(entity)).setTracked(replace);
         }
-
     }
 
     @Override
@@ -1240,11 +1181,9 @@ public class NMSImpl implements NMSBridge {
         if (bodyYaw == null) {
             bodyYaw = handle.yaw;
         }
-
         if (pitch == null) {
             pitch = handle.pitch;
         }
-
         List<Packet<?>> toSend = Lists.newArrayList();
         if (position) {
             EntityTrackerEntry entry = ((WorldServer) handle.world).getTracker().trackedEntities.get(handle.getId());
@@ -1257,18 +1196,15 @@ public class NMSImpl implements NMSBridge {
                 e.printStackTrace();
                 return;
             }
-
             toSend.add(new PacketPlayOutRelEntityMoveLook(handle.getId(), (short) dx, (short) dy, (short) dz,
                     (byte) (bodyYaw * 256.0F / 360.0F), (byte) (pitch * 256.0F / 360.0F), handle.onGround));
         } else {
             toSend.add(new PacketPlayOutEntityLook(handle.getId(), (byte) (bodyYaw * 256.0F / 360.0F),
                     (byte) (pitch * 256.0F / 360.0F), handle.onGround));
         }
-
         if (headYaw != null) {
             toSend.add(new PacketPlayOutEntityHeadRotation(handle, (byte) (headYaw * 256.0F / 360.0F)));
         }
-
         sendPacketsNearby(null, from.getLocation(), toSend, 64);
     }
 
@@ -1292,7 +1228,6 @@ public class NMSImpl implements NMSBridge {
             entities[i] = (EntityPlayer) skinnable;
             i++;
         }
-
         NMSImpl.sendPacket(recipient,
                 new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.REMOVE_PLAYER, entities));
     }
@@ -1313,14 +1248,12 @@ public class NMSImpl implements NMSBridge {
         if (TEAM_FIELD == null) {
             TEAM_FIELD = NMS.getGetter(team.getClass(), "team");
         }
-
         try {
             ScoreboardTeam nmsTeam = (ScoreboardTeam) TEAM_FIELD.invoke(team);
             sendPacket(recipient, new PacketPlayOutScoreboardTeam(nmsTeam, mode));
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     @Override
@@ -1348,7 +1281,6 @@ public class NMSImpl implements NMSBridge {
         } else if (handle instanceof EntityHumanNPC) {
             ((EntityHumanNPC) handle).setMoveDestination(x, y, z, speed);
         }
-
     }
 
     @Override
@@ -1373,7 +1305,6 @@ public class NMSImpl implements NMSBridge {
         if (!(handle instanceof EntityHuman)) {
             handle.aQ = yaw;
         }
-
         handle.aS = yaw;
     }
 
@@ -1423,14 +1354,11 @@ public class NMSImpl implements NMSBridge {
             } catch (Exception e) {
                 return;
             }
-
         }
-
         try {
             SKULL_PROFILE_FIELD.set(meta, profile);
         } catch (Exception e) {
         }
-
     }
 
     @Override
@@ -1444,7 +1372,6 @@ public class NMSImpl implements NMSBridge {
         } else if (handle instanceof EntityHumanNPC) {
             ((EntityHumanNPC) handle).setShouldJump();
         }
-
     }
 
     @Override
@@ -1462,7 +1389,6 @@ public class NMSImpl implements NMSBridge {
         if (entity instanceof Player) {
             ((Player) entity).setSneaking(sneaking);
         }
-
     }
 
     @Override
@@ -1495,7 +1421,6 @@ public class NMSImpl implements NMSBridge {
         } catch (IllegalAccessException e) {
             e.printStackTrace();
         }
-
         return false;
     }
 
@@ -1507,12 +1432,10 @@ public class NMSImpl implements NMSBridge {
         if (field == null) {
             field = NMS.getFinalSetter(IRegistry.class, "ENTITY_TYPE", false);
         }
-
         try {
             field.invoke(ENTITY_REGISTRY.get());
         } catch (Throwable e) {
         }
-
     }
 
     @Override
@@ -1545,7 +1468,6 @@ public class NMSImpl implements NMSBridge {
                     facingByte = (byte) 3;
                     break;
             }
-
             Location bedLoc = loc.clone().add(0, -loc.getY(), 0);
             PacketPlayOutBed bed = new PacketPlayOutBed(from,
                     new BlockPosition(bedLoc.getBlockX(), bedLoc.getBlockY(), bedLoc.getBlockZ()));
@@ -1564,7 +1486,6 @@ public class NMSImpl implements NMSBridge {
                 list.forEach(packet -> sendPacket(nearby, packet));
                 meta.set(nearby.getUniqueId(), entity.getUniqueId().toString(), System.currentTimeMillis());
             }
-
         } else {
             PacketPlayOutAnimation packet = new PacketPlayOutAnimation(from, 2);
             sendPacketNearby(entity, entity.getLocation(), packet, 64);
@@ -1572,11 +1493,8 @@ public class NMSImpl implements NMSBridge {
                 if (meta.remove(player.getUniqueId(), entity.getUniqueId().toString())) {
                     sendPacket(player, packet);
                 }
-
             }
-
         }
-
     }
 
     @Override
@@ -1592,7 +1510,6 @@ public class NMSImpl implements NMSBridge {
         if (RANDOM.nextFloat() <= 0.85F && (handle.at() || handle.ax())) {
             handle.motY += power;
         }
-
     }
 
     @Override
@@ -1620,7 +1537,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Exception e) {
             Messaging.logTr(Messages.ERROR_UPDATING_NAVIGATION_WORLD, e.getMessage());
         }
-
     }
 
     @Override
@@ -1632,10 +1548,8 @@ public class NMSImpl implements NMSBridge {
             if (en instanceof EntityHumanNPC) {
                 ((EntityHumanNPC) en).updatePathfindingRange(pathfindingRange);
             }
-
             return;
         }
-
         if (PATHFINDING_RANGE == null)
             return;
         EntityInsentient handle = (EntityInsentient) en;
@@ -1648,7 +1562,6 @@ public class NMSImpl implements NMSBridge {
         } catch (IllegalAccessException e) {
             e.printStackTrace();
         }
-
     }
 
     private static class CitizensInventoryAnvil extends CraftInventoryAnvil implements ForwardingInventory {
@@ -1757,7 +1670,6 @@ public class NMSImpl implements NMSBridge {
             living.setPosition(living.locX - 0.01, living.locY, living.locZ - 0.01);
             living.setPosition(living.locX + 0.01, living.locY, living.locZ + 0.01);
         }
-
     }
 
     public static void clearGoals(PathfinderGoalSelector... goalSelectors) {
@@ -1770,9 +1682,7 @@ public class NMSImpl implements NMSBridge {
             } catch (Exception e) {
                 Messaging.logTr(Messages.ERROR_CLEARING_GOALS, e.getLocalizedMessage());
             }
-
         }
-
     }
 
     private static CompoundTag convertNBT(net.minecraft.server.v1_13_R2.NBTTagCompound tag) {
@@ -1782,7 +1692,6 @@ public class NMSImpl implements NMSBridge {
         for (String key : tag.getKeys()) {
             tags.put(key, convertNBT(key, tag.get(key)));
         }
-
         return new CompoundTag("", tags);
     }
 
@@ -1813,10 +1722,8 @@ public class NMSImpl implements NMSBridge {
                 for (int i = 0; i < list.size(); i++) {
                     converted.add(convertNBT("", list.get(i)));
                 }
-
                 return new ListTag(key, tagType, converted);
             }
-
         } else if (base instanceof net.minecraft.server.v1_13_R2.NBTTagCompound)
             return convertNBT((net.minecraft.server.v1_13_R2.NBTTagCompound) base);
         else if (base instanceof net.minecraft.server.v1_13_R2.NBTTagEnd)
@@ -1831,7 +1738,6 @@ public class NMSImpl implements NMSBridge {
                 d0 = 0.01D;
                 entity.fallDistance = 0.0F;
             }
-
             if (entity.isInWater()
                     && (!(entity instanceof EntityHuman) || !((EntityHuman) entity).abilities.isFlying)) {
                 double d2 = entity.locY;
@@ -1841,20 +1747,16 @@ public class NMSImpl implements NMSBridge {
                 if (f3 > 3.0F) {
                     f3 = 3.0F;
                 }
-
                 if (!entity.onGround) {
                     f3 *= 0.5F;
                 }
-
                 if (f3 > 0.0F) {
                     f5 += (0.54600006F - f5) * f3 / 3.0F;
                     f4 += (entity.cK() - f4) * f3 / 3.0F;
                 }
-
                 if (entity.hasEffect(MobEffects.DOLPHINS_GRACE)) {
                     f5 = 0.96F;
                 }
-
                 entity.a(f, f1, f2, f4);
                 entity.move(EnumMoveType.SELF, entity.motX, entity.motY, entity.motZ);
                 entity.motX *= f5;
@@ -1867,14 +1769,11 @@ public class NMSImpl implements NMSBridge {
                     } else {
                         entity.motY -= d0 / 16.0D;
                     }
-
                 }
-
                 if (entity.positionChanged
                         && entity.c(entity.motX, entity.motY + 0.6000000238418579D - entity.locY + d2, entity.motZ)) {
                     entity.motY = 0.30000001192092896D;
                 }
-
             } else if (entity.ax()
                     && (!(entity instanceof EntityHuman) || !((EntityHuman) entity).abilities.isFlying)) {
                 double d2 = entity.locY;
@@ -1886,17 +1785,14 @@ public class NMSImpl implements NMSBridge {
                 if (!entity.isNoGravity()) {
                     entity.motY -= d0 / 4.0D;
                 }
-
                 if (entity.positionChanged
                         && entity.c(entity.motX, entity.motY + 0.6000000238418579D - entity.locY + d2, entity.motZ)) {
                     entity.motY = 0.30000001192092896D;
                 }
-
             } else if (entity.dc()) {
                 if (entity.motY > -0.5D) {
                     entity.fallDistance = 1.0F;
                 }
-
                 Vec3D vec3d = entity.aN();
                 float f6 = entity.pitch * 0.017453292F;
                 double d1 = Math.sqrt(vec3d.x * vec3d.x + vec3d.z * vec3d.z);
@@ -1911,19 +1807,16 @@ public class NMSImpl implements NMSBridge {
                     entity.motX += vec3d.x * d5 / d1;
                     entity.motZ += vec3d.z * d5 / d1;
                 }
-
                 if (f6 < 0.0F && d1 > 0.0D) {
                     double d5 = d3 * -MathHelper.sin(f6) * 0.04D;
                     entity.motY += d5 * 3.2D;
                     entity.motX -= vec3d.x * d5 / d1;
                     entity.motZ -= vec3d.z * d5 / d1;
                 }
-
                 if (d1 > 0.0D) {
                     entity.motX += (vec3d.x / d1 * d3 - entity.motX) * 0.1D;
                     entity.motZ += (vec3d.z / d1 * d3 - entity.motZ) * 0.1D;
                 }
-
                 entity.motX *= 0.9900000095367432D;
                 entity.motY *= 0.9800000190734863D;
                 entity.motZ *= 0.9900000095367432D;
@@ -1937,14 +1830,11 @@ public class NMSImpl implements NMSBridge {
                                 1.0F, 1.0F);
                         entity.damageEntity(DamageSource.FLY_INTO_WALL, f8);
                     }
-
                 }
-
                 if (entity.onGround && !entity.world.isClientSide && entity.getFlag(7)
                         && !CraftEventFactory.callToggleGlideEvent(entity, false).isCancelled()) {
                     entity.setFlag(7, false);
                 }
-
             } else {
                 float f9 = 0.91F;
                 BoundingBox bb = NMSBoundingBox.wrap(entity.getBoundingBox());
@@ -1957,14 +1847,12 @@ public class NMSImpl implements NMSBridge {
                     if (entity.onGround) {
                         f9 = entity.world.getType(blockposition_b).getBlock().n() * 0.91F;
                     }
-
                     f4 = 0.16277137F / (f9 * f9 * f9);
                     if (entity.onGround) {
                         f3 = entity.cK() * f4;
                     } else {
                         f3 = entity.aU;
                     }
-
                     entity.a(f, f1, f2, f3);
                     f9 = 0.91F;
                     if (entity.onGround) {
@@ -1972,7 +1860,6 @@ public class NMSImpl implements NMSBridge {
                                 .getType(getBlockPositionBE(blockposition_b, entity.locX, bb.minY - 1.0D, entity.locZ))
                                 .getBlock().n() * 0.91F;
                     }
-
                     if (entity.z_()) {
                         entity.motX = MathHelper.a(entity.motX, -0.15000000596046448D, 0.15000000596046448D);
                         entity.motZ = MathHelper.a(entity.motZ, -0.15000000596046448D, 0.15000000596046448D);
@@ -1980,19 +1867,15 @@ public class NMSImpl implements NMSBridge {
                         if (entity.motY < -0.15D) {
                             entity.motY = -0.15D;
                         }
-
                         boolean flag = entity.isSneaking() && entity instanceof EntityHuman;
                         if (flag && entity.motY < 0.0D) {
                             entity.motY = 0.0D;
                         }
-
                     }
-
                     entity.move(EnumMoveType.SELF, entity.motX, entity.motY, entity.motZ);
                     if (entity.positionChanged && entity.z_()) {
                         entity.motY = 0.2D;
                     }
-
                     if (entity.hasEffect(MobEffects.LEVITATION)) {
                         entity.motY += (0.05D * (entity.getEffect(MobEffects.LEVITATION).getAmplifier() + 1)
                                 - entity.motY) * 0.2D;
@@ -2006,13 +1889,10 @@ public class NMSImpl implements NMSBridge {
                             } else {
                                 entity.motY = 0.0D;
                             }
-
                         } else if (!entity.isNoGravity()) {
                             entity.motY -= d0;
                         }
-
                     }
-
                     entity.motY *= 0.9800000190734863D;
                     entity.motX *= f9;
                     entity.motZ *= f9;
@@ -2027,19 +1907,13 @@ public class NMSImpl implements NMSBridge {
                             } catch (Throwable throwable2) {
                                 throwable.addSuppressed(throwable2);
                             }
-
                         } else {
                             blockposition_b.close();
                         }
-
                     }
-
                 }
-
             }
-
         }
-
         entity.aI = entity.aJ;
         double d0 = entity.locX - entity.lastX;
         double d2 = entity.locZ - entity.lastZ;
@@ -2048,7 +1922,6 @@ public class NMSImpl implements NMSBridge {
         if (f3 > 1.0F) {
             f3 = 1.0F;
         }
-
         entity.aJ += (f3 - entity.aJ) * 0.4F;
         entity.aK += entity.aJ;
     }
@@ -2064,9 +1937,7 @@ public class NMSImpl implements NMSBridge {
                 ex2.printStackTrace();
                 return null;
             }
-
         }
-
     }
 
     private static EntityLiving getHandle(LivingEntity entity) {
@@ -2095,7 +1966,6 @@ public class NMSImpl implements NMSBridge {
         } catch (IllegalAccessException e) {
             e.printStackTrace();
         }
-
         return null;
     }
 
@@ -2121,9 +1991,7 @@ public class NMSImpl implements NMSBridge {
             } catch (IllegalAccessException e) {
                 e.printStackTrace();
             }
-
         }
-
     }
 
     public static boolean isLeashed(NPC npc, Supplier<Boolean> isLeashed, EntityInsentient entity) {
@@ -2146,7 +2014,6 @@ public class NMSImpl implements NMSBridge {
         if (mat != null) {
             minecart.setDisplayBlock(Block.getByCombinedId(mat.getId()).getBlock().getBlockData());
         }
-
         minecart.setDisplayBlockOffset(offset);
     }
 
@@ -2165,7 +2032,6 @@ public class NMSImpl implements NMSBridge {
             handle.motZ *= 0.9D;
             return true;
         }
-
         return false;
     }
 
@@ -2193,13 +2059,10 @@ public class NMSImpl implements NMSBridge {
                     || location.distanceSquared(player.getLocation(PACKET_CACHE_LOCATION)) > radius) {
                 continue;
             }
-
             for (Packet<?> packet : packets) {
                 NMSImpl.sendPacket(player, packet);
             }
-
         }
-
     }
 
     public static void sendPacketsNearby(Player from, Location location, Packet<?>... packets) {
@@ -2212,7 +2075,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     public static void setNotInSchool(EntityFish entity) {
@@ -2222,11 +2084,9 @@ public class NMSImpl implements NMSBridge {
             } else if (ENTITY_FISH_METHOD != null) {
                 ENTITY_FISH_METHOD.invoke(entity, false);
             }
-
         } catch (Exception ex) {
             ex.printStackTrace();
         }
-
     }
 
     public static void setSize(Entity entity, float f, float f1, boolean justCreated) {
@@ -2240,9 +2100,7 @@ public class NMSImpl implements NMSBridge {
             if (entity.width > f2 && !justCreated && !entity.world.isClientSide) {
                 entity.move(EnumMoveType.SELF, (f2 - entity.width) / 2, 0.0D, (f2 - entity.width) / 2);
             }
-
         }
-
     }
 
     public static void stopNavigation(NavigationAbstract navigation) {
@@ -2260,7 +2118,6 @@ public class NMSImpl implements NMSBridge {
         } else if (entity instanceof EntityHumanNPC) {
             ((EntityHumanNPC) entity).updateAI();
         }
-
     }
 
     public static void updateNavigation(NavigationAbstract navigation) {
@@ -2317,24 +2174,20 @@ public class NMSImpl implements NMSBridge {
         } catch (ClassNotFoundException e) {
             // 1.13.2
         }
-
         try {
             MethodHandle setter = NMS.getFinalSetter(EntityTypes.class, "REGISTRY", false);
             if (setter == null) {
                 setter = NMS.getFinalSetter(IRegistry.class, "ENTITY_TYPE", false);
             }
-
             Field field = NMS.getField(EntityTypes.class, "REGISTRY", false);
             if (field == null) {
                 field = NMS.getField(IRegistry.class, "ENTITY_TYPE");
             }
-
             ENTITY_REGISTRY = new CustomEntityRegistry((RegistryMaterials<EntityTypes<?>>) field.get(null));
             setter.invoke(ENTITY_REGISTRY);
         } catch (Throwable e) {
             Messaging.logTr(Messages.ERROR_GETTING_ID_MAPPING, e.getMessage());
         }
-
         try {
             MAKE_REQUEST = YggdrasilAuthenticationService.class.getDeclaredMethod("makeRequest", URL.class,
                     Object.class, Class.class);
@@ -2342,7 +2195,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Exception ex) {
             ex.printStackTrace();
         }
-
         try {
             ENDERMAN_ANGRY = (DataWatcherObject<Boolean>) NMS.getField(EntityEnderman.class, "bC").get(null);
         } catch (IllegalArgumentException e) {
@@ -2350,6 +2202,5 @@ public class NMSImpl implements NMSBridge {
         } catch (IllegalAccessException e) {
             e.printStackTrace();
         }
-
     }
 }
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerAnimationImpl.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerAnimationImpl.java
index e613e8509..048b3bfd8 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerAnimationImpl.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerAnimationImpl.java
@@ -21,7 +21,6 @@ public class PlayerAnimationImpl {
             playDefaultAnimation(player, to, DEFAULTS.get(animation));
             return;
         }
-
         switch (animation) {
             case SNEAK:
                 player.getBukkitEntity().setSneaking(true);
@@ -52,7 +51,6 @@ public class PlayerAnimationImpl {
             default:
                 throw new UnsupportedOperationException();
         }
-
     }
 
     protected static void playDefaultAnimation(EntityPlayer player, Iterable<Player> to, int code) {
@@ -64,7 +62,6 @@ public class PlayerAnimationImpl {
         for (Player player : to) {
             NMSImpl.sendPacket(player, packet);
         }
-
     }
 
     private static EnumMap<PlayerAnimation, Integer> DEFAULTS = Maps.newEnumMap(PlayerAnimation.class);
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerControllerMove.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerControllerMove.java
index d61f7ef1f..f10fe75ea 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerControllerMove.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerControllerMove.java
@@ -46,7 +46,6 @@ public class PlayerControllerMove extends ControllerMove {
                 this.a.bj = 0.0F; // bi
                 return;
             }
-
             float f = (float) Math.toDegrees(Math.atan2(d1, d0)) - 90.0F;
             this.a.yaw = a(this.a.yaw, f, 90.0F);
             NMS.setHeadYaw(a.getBukkitEntity(), this.a.yaw);
@@ -64,11 +63,8 @@ public class PlayerControllerMove extends ControllerMove {
                 } else {
                     ((EntityInsentient) this.a).getControllerJump().a();
                 }
-
             }
-
         }
-
     }
 
     @Override
@@ -86,18 +82,15 @@ public class PlayerControllerMove extends ControllerMove {
         if (f3 > f2) {
             f3 = f2;
         }
-
         if (f3 < -f2) {
             f3 = -f2;
         }
-
         float f4 = f + f3;
         if (f4 < 0.0F) {
             f4 += 360.0F;
         } else if (f4 > 360.0F) {
             f4 -= 360.0F;
         }
-
         return f4;
     }
 
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerNavigation.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerNavigation.java
index e39fe70cb..9fae46e65 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerNavigation.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerNavigation.java
@@ -123,11 +123,8 @@ public class PlayerNavigation extends NavigationAbstract {
                             || localPathType == PathType.DAMAGE_OTHER)
                         return false;
                 }
-
             }
-
         }
-
         return true;
     }
 
@@ -137,11 +134,9 @@ public class PlayerNavigation extends NavigationAbstract {
             this.c = null;
             return false;
         }
-
         if (!paramPathEntity.a(this.c)) {
             this.c = paramPathEntity;
         }
-
         E_();
         if (this.c.d() <= 0)
             return false;
@@ -158,11 +153,9 @@ public class PlayerNavigation extends NavigationAbstract {
             if (paramVec3D.distanceSquared(this.g) < 2.25D) {
                 q();
             }
-
             this.f = this.e;
             this.g = paramVec3D;
         }
-
         if (this.c != null && !this.c.b()) {
             Vec3D localVec3D = this.c.f();
             if (localVec3D.equals(this.h)) {
@@ -172,17 +165,14 @@ public class PlayerNavigation extends NavigationAbstract {
                 double d1 = paramVec3D.f(this.h);
                 this.k = this.a.cK() > 0.0F ? d1 / this.a.cK() * 1000.0D : 0.0D;
             }
-
             if (this.k > 0.0D && this.i > this.k * 3.0D) {
                 this.h = Vec3D.a;
                 this.i = 0L;
                 this.k = 0.0D;
                 q();
             }
-
             this.j = getMonotonicMillis();
         }
-
     }
 
     @Override
@@ -210,11 +200,9 @@ public class PlayerNavigation extends NavigationAbstract {
         if (d1 >= 0.0D) {
             d7 += 1.0D;
         }
-
         if (d2 >= 0.0D) {
             d8 += 1.0D;
         }
-
         d7 /= d1;
         d8 /= d2;
         int k = d1 < 0.0D ? -1 : 1;
@@ -233,11 +221,9 @@ public class PlayerNavigation extends NavigationAbstract {
                 j += m;
                 i3 = i1 - j;
             }
-
             if (!a(i, (int) paramVec3D1.y, j, paramInt1, paramInt2, paramInt3, paramVec3D1, d1, d2))
                 return false;
         }
-
         return true;
     }
 
@@ -254,26 +240,21 @@ public class PlayerNavigation extends NavigationAbstract {
             while (localBlockPosition.getY() > 0 && this.b.getType(localBlockPosition).isAir()) {
                 localBlockPosition = localBlockPosition.down();
             }
-
             if (localBlockPosition.getY() > 0)
                 return superb(localBlockPosition.up());
             while (localBlockPosition.getY() < this.b.getHeight() && this.b.getType(localBlockPosition).isAir()) {
                 localBlockPosition = localBlockPosition.up();
             }
-
             paramBlockPosition = localBlockPosition;
         }
-
         if (this.b.getType(paramBlockPosition).getMaterial().isBuildable()) {
             localBlockPosition = paramBlockPosition.up();
             while (localBlockPosition.getY() < this.b.getHeight()
                     && this.b.getType(localBlockPosition).getMaterial().isBuildable()) {
                 localBlockPosition = localBlockPosition.up();
             }
-
             return superb(localBlockPosition);
         }
-
         return superb(paramBlockPosition);
     }
 
@@ -291,9 +272,7 @@ public class PlayerNavigation extends NavigationAbstract {
                 if (!this.b.getType(localBlockPosition).a(this.b, localBlockPosition, PathMode.LAND))
                     return false;
             }
-
         }
-
         return true;
     }
 
@@ -312,7 +291,6 @@ public class PlayerNavigation extends NavigationAbstract {
         if (this.m) {
             l();
         }
-
         if (p())
             return;
         if (b()) {
@@ -325,9 +303,7 @@ public class PlayerNavigation extends NavigationAbstract {
                     && MathHelper.floor(localVec3D.z) == MathHelper.floor(localObject.z)) {
                 this.c.c(this.c.e() + 1);
             }
-
         }
-
         n();
         if (p())
             return;
@@ -358,11 +334,8 @@ public class PlayerNavigation extends NavigationAbstract {
                     this.c.b(i - 1);
                     return;
                 }
-
             }
-
         }
-
     }
 
     public boolean g() {
@@ -393,11 +366,9 @@ public class PlayerNavigation extends NavigationAbstract {
                 this.n = this.b.getTime();
                 this.m = false;
             }
-
         } else {
             this.m = true;
         }
-
     }
 
     @Override
@@ -418,9 +389,7 @@ public class PlayerNavigation extends NavigationAbstract {
                 i1 = i2;
                 break;
             }
-
         }
-
         this.l = this.a.width > 0.75F ? this.a.width / 2.0F : 0.75F - this.a.width / 2.0F;
         Vec3D localVec3D2 = this.c.f();
         if (MathHelper.e((float) (this.a.locX - (localVec3D2.x + 0.5D))) < this.l
@@ -428,7 +397,6 @@ public class PlayerNavigation extends NavigationAbstract {
                 && Math.abs(this.a.locY - localVec3D2.y) < 1.0D) {
             this.c.c(this.c.e() + 1);
         }
-
         int i3 = MathHelper.f(this.a.width);
         int i4 = MathHelper.f(this.a.length);
         int i5 = i3;
@@ -437,9 +405,7 @@ public class PlayerNavigation extends NavigationAbstract {
                 this.c.c(i6);
                 break;
             }
-
         }
-
         a(localVec3D1);
     }
 
@@ -482,9 +448,7 @@ public class PlayerNavigation extends NavigationAbstract {
             } catch (Throwable ex2) {
                 ex2.printStackTrace();
             }
-
         }
-
         BlockPosition localBlockPosition = new BlockPosition(this.a);
         int i1 = (int) (f1 + 8.0F);
         ChunkCache localChunkCache = new ChunkCache(this.b, localBlockPosition.a(-i1, -i1, -i1),
@@ -498,9 +462,7 @@ public class PlayerNavigation extends NavigationAbstract {
             } catch (Throwable ex2) {
                 ex2.printStackTrace();
             }
-
         }
-
         return localPathEntity;
     }
 
@@ -519,11 +481,8 @@ public class PlayerNavigation extends NavigationAbstract {
                     this.c.a(i1 + 1, ((PathPoint) localObject).a(((PathPoint) localObject).a, localPathPoint.b + 1,
                             ((PathPoint) localObject).c));
                 }
-
             }
-
         }
-
     }
 
     @Override
@@ -548,7 +507,6 @@ public class PlayerNavigation extends NavigationAbstract {
             if (j > 16)
                 return (int) bb.minY;
         }
-
         return i;
     }
 
@@ -567,9 +525,7 @@ public class PlayerNavigation extends NavigationAbstract {
                 ex2.printStackTrace();
                 return 0;
             }
-
         }
-
     }
 
     private static final Method GET_MONOTONIC_MILLIS = NMS.getMethod(SystemUtils.class, "b", false);
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerPathfinder.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerPathfinder.java
index 6155a8578..146893195 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerPathfinder.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerPathfinder.java
@@ -81,7 +81,6 @@ public class PlayerPathfinder extends Pathfinder {
             i++;
             localPathPoint = localPathPoint.h;
         }
-
         PathPoint[] arrayOfPathPoint = new PathPoint[i];
         localPathPoint = paramPathPoint2;
         arrayOfPathPoint[--i] = localPathPoint;
@@ -89,7 +88,6 @@ public class PlayerPathfinder extends Pathfinder {
             localPathPoint = localPathPoint.h;
             arrayOfPathPoint[--i] = localPathPoint;
         }
-
         return new PathEntity(arrayOfPathPoint);
     }
 
@@ -107,17 +105,14 @@ public class PlayerPathfinder extends Pathfinder {
             if (i >= 200) {
                 break;
             }
-
             Object localObject2 = this.a.c();
             if (((PathPoint) localObject2).equals(paramPathPoint2)) {
                 localObject1 = paramPathPoint2;
                 break;
             }
-
             if (((PathPoint) localObject2).c(paramPathPoint2) < ((PathPoint) localObject1).c(paramPathPoint2)) {
                 localObject1 = localObject2;
             }
-
             ((PathPoint) localObject2).i = true;
             int j = this.d.a(this.c, (PathPoint) localObject2, paramPathPoint2, paramFloat);
             for (int k = 0; k < j; k++) {
@@ -136,13 +131,9 @@ public class PlayerPathfinder extends Pathfinder {
                         localPathPoint.g = localPathPoint.e + localPathPoint.f;
                         this.a.a(localPathPoint);
                     }
-
                 }
-
             }
-
         }
-
         if (localObject1 == paramPathPoint1)
             return null;
         Object localObject2 = a(paramPathPoint1, (PathPoint) localObject1);
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerPathfinderAbstract.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerPathfinderAbstract.java
index 78f92b05f..91004f6f7 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerPathfinderAbstract.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerPathfinderAbstract.java
@@ -46,7 +46,6 @@ public abstract class PlayerPathfinderAbstract extends PathfinderAbstract {
             localPathPoint = new PathPoint(paramInt1, paramInt2, paramInt3);
             this.c.a(j, localPathPoint);
         }
-
         return localPathPoint;
     }
 
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerPathfinderNormal.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerPathfinderNormal.java
index 758ac9906..50716ed51 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerPathfinderNormal.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerPathfinderNormal.java
@@ -75,13 +75,10 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
             if (var7 == PathType.DAMAGE_FIRE || var6 == Blocks.MAGMA_BLOCK) {
                 var5 = PathType.DAMAGE_FIRE;
             }
-
             if (var7 == PathType.DAMAGE_CACTUS) {
                 var5 = PathType.DAMAGE_CACTUS;
             }
-
         }
-
         var5 = this.a(var1, var2, var3, var4, var5);
         return var5;
     }
@@ -105,15 +102,12 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                 if (var5.a(var18) >= var5.a(var16)) {
                     var16 = var18;
                 }
-
             }
-
             if (var12 == PathType.OPEN && var5.a(var16) == 0.0F)
                 return PathType.OPEN;
             else
                 return var16;
         }
-
     }
 
     @Override
@@ -136,15 +130,12 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                 if (var5.a(var18) >= var5.a(var16)) {
                     var16 = var18;
                 }
-
             }
-
             if (var12 == PathType.OPEN && var5.a(var16) == 0.0F)
                 return PathType.OPEN;
             else
                 return var16;
         }
-
     }
 
     public PathType a(IBlockAccess var1, int var2, int var3, int var4, int var5, int var6, int var7, boolean var8,
@@ -159,28 +150,21 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                     if (var19 == PathType.DOOR_WOOD_CLOSED && var8 && var9) {
                         var19 = PathType.WALKABLE;
                     }
-
                     if (var19 == PathType.DOOR_OPEN && !var9) {
                         var19 = PathType.BLOCKED;
                     }
-
                     if (var19 == PathType.RAIL
                             && !(var1.getType(var12).getBlock() instanceof BlockMinecartTrackAbstract)
                             && !(var1.getType(var12.down()).getBlock() instanceof BlockMinecartTrackAbstract)) {
                         var19 = PathType.FENCE;
                     }
-
                     if (var13 == 0 && var14 == 0 && var15 == 0) {
                         var11 = var19;
                     }
-
                     var10.add(var19);
                 }
-
             }
-
         }
-
         return var11;
     }
 
@@ -203,22 +187,16 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                                     ex2.printStackTrace();
                                     return PathType.BLOCKED;
                                 }
-
                             }
-
                             Block var10 = var1.getType(blockPos).getBlock();
                             if (var10 == Blocks.CACTUS) {
                                 var5 = PathType.DANGER_CACTUS;
                             } else if (var10 == Blocks.FIRE) {
                                 var5 = PathType.DANGER_FIRE;
                             }
-
                         }
-
                     }
-
                 }
-
             } catch (Throwable var18) {
                 var7 = var18;
                 throw var18;
@@ -230,17 +208,12 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                         } catch (Throwable var17) {
                             var7.addSuppressed(var17);
                         }
-
                     } else {
                         var6.close();
                     }
-
                 }
-
             }
-
         }
-
         return var5;
     }
 
@@ -259,7 +232,6 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                 var8.m = var12;
                 var8.l = Math.max(var8.l, var13);
             }
-
             if ((var12 != PathType.WALKABLE)) {
                 if (var8 == null && var4 > 0 && var12 != PathType.FENCE && var12 != PathType.TRAPDOOR) {
                     var8 = this.a(var1, var2 + 1, var3, var4 - 1, var5, var7);
@@ -272,11 +244,8 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                         if (!this.b.world.getCubes((Entity) null, var20)) {
                             var8 = null;
                         }
-
                     }
-
                 }
-
                 if (var12 == PathType.WATER && !this.e()) {
                     if (this.a(this.b, var1, var2 - 1, var3) != PathType.WATER)
                         return var8;
@@ -289,9 +258,7 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                         var8.m = var12;
                         var8.l = Math.max(var8.l, this.b.a(var12));
                     }
-
                 }
-
                 if (var12 == PathType.OPEN) {
                     AxisAlignedBB var21 = new AxisAlignedBB(var1 - var14 + 0.5D, var2 + 0.001D, var3 - var14 + 0.5D,
                             var1 + var14 + 0.5D, var2 + this.b.length, var3 + var14 + 0.5D);
@@ -305,9 +272,7 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                             var8.l = Math.max(var8.l, var13);
                             return var8;
                         }
-
                     }
-
                     int var22 = 0;
                     while (var2 > 0 && var12 == PathType.OPEN) {
                         --var2;
@@ -321,18 +286,13 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                             var8.l = Math.max(var8.l, var13);
                             break;
                         }
-
                         if (var13 < 0.0F)
                             return null;
                     }
-
                 }
-
             }
-
             return var8;
         }
-
     }
 
     @Override
@@ -343,7 +303,6 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
         if (this.b.a(var7) >= 0.0F) {
             var6 = MathHelper.d(Math.max(1.0F, this.b.Q));
         }
-
         double var8 = a(this.a, new BlockPosition(var2.a, var2.b, var2.c));
         PathPoint var10 = this.a(var2.a, var2.b, var2.c + 1, var6, var8, EnumDirection.SOUTH);
         PathPoint var11 = this.a(var2.a - 1, var2.b, var2.c, var6, var8, EnumDirection.WEST);
@@ -352,19 +311,15 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
         if (var10 != null && !var10.i && var10.a(var3) < var4) {
             var1[var5++] = var10;
         }
-
         if (var11 != null && !var11.i && var11.a(var3) < var4) {
             var1[var5++] = var11;
         }
-
         if (var12 != null && !var12.i && var12.a(var3) < var4) {
             var1[var5++] = var12;
         }
-
         if (var13 != null && !var13.i && var13.a(var3) < var4) {
             var1[var5++] = var13;
         }
-
         boolean var14 = var13 == null || var13.m == PathType.OPEN || var13.l != 0.0F;
         boolean var15 = var10 == null || var10.m == PathType.OPEN || var10.l != 0.0F;
         boolean var16 = var12 == null || var12.m == PathType.OPEN || var12.l != 0.0F;
@@ -375,33 +330,25 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
             if (var18 != null && !var18.i && var18.a(var3) < var4) {
                 var1[var5++] = var18;
             }
-
         }
-
         if (var14 && var16) {
             var18 = this.a(var2.a + 1, var2.b, var2.c - 1, var6, var8, EnumDirection.NORTH);
             if (var18 != null && !var18.i && var18.a(var3) < var4) {
                 var1[var5++] = var18;
             }
-
         }
-
         if (var15 && var17) {
             var18 = this.a(var2.a - 1, var2.b, var2.c + 1, var6, var8, EnumDirection.SOUTH);
             if (var18 != null && !var18.i && var18.a(var3) < var4) {
                 var1[var5++] = var18;
             }
-
         }
-
         if (var15 && var16) {
             var18 = this.a(var2.a + 1, var2.b, var2.c + 1, var6, var8, EnumDirection.SOUTH);
             if (var18 != null && !var18.i && var18.a(var3) < var4) {
                 var1[var5++] = var18;
             }
-
         }
-
         return var5;
     }
 
@@ -419,7 +366,6 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                 ++var1;
                 var8.c(MathHelper.floor(this.b.locX), var1, MathHelper.floor(this.b.locZ));
             }
-
         } else if (this.b.onGround) {
             var1 = MathHelper.floor(bb.minY + 0.5D);
         } else {
@@ -427,10 +373,8 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                     this.b); (this.a.getType(var2).isAir() || this.a.getType(var2).a(this.a, var2, PathMode.LAND))
                             && var2.getY() > 0; var2 = var2.down()) {
             }
-
             var1 = var2.up().getY();
         }
-
         var2 = new BlockPosition(this.b);
         PathType var9 = this.a(this.b, var2.getX(), var1, var2.getZ());
         if (this.b.a(var9) < 0.0F) {
@@ -447,9 +391,7 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                 if (this.b.a(var7) >= 0.0F)
                     return this.a(var6.getX(), var6.getY(), var6.getZ());
             }
-
         }
-
         return this.a(var2.getX(), var1, var2.getZ());
     }
 
@@ -487,9 +429,7 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                         ex2.printStackTrace();
                         return PathType.BLOCKED;
                     }
-
                 }
-
                 if (var9.a(TagsFluid.WATER))
                     return PathType.WATER;
                 else if (var9.a(TagsFluid.LAVA))
@@ -514,9 +454,7 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                 ex2.printStackTrace();
                 return 0;
             }
-
         }
-
     }
 
     private static final Method BLOCK_POSITION_B_C = NMS.getMethod(BlockPosition.PooledBlockPosition.class, "f", false,
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerlistTrackerEntry.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerlistTrackerEntry.java
index 2c980a131..212b09b9d 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerlistTrackerEntry.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerlistTrackerEntry.java
@@ -43,14 +43,12 @@ public class PlayerlistTrackerEntry extends EntityTrackerEntry {
                         if (res == null) {
                             updateLastPlayer(player);
                         }
-
                         return res;
                     }
                 });
             } catch (Throwable e) {
                 e.printStackTrace();
             }
-
         } else {
             try {
                 Set<EntityPlayer> delegate = super.trackedPlayers;
@@ -61,7 +59,6 @@ public class PlayerlistTrackerEntry extends EntityTrackerEntry {
                         if (res) {
                             updateLastPlayer(player);
                         }
-
                         return res;
                     }
 
@@ -73,9 +70,7 @@ public class PlayerlistTrackerEntry extends EntityTrackerEntry {
             } catch (Throwable e) {
                 e.printStackTrace();
             }
-
         }
-
     }
 
     public PlayerlistTrackerEntry(EntityTrackerEntry entry) {
@@ -91,7 +86,6 @@ public class PlayerlistTrackerEntry extends EntityTrackerEntry {
             Bukkit.getPluginManager().callEvent(
                     new NPCLinkToPlayerEvent(((NPCHolder) tracker).getNPC(), lastUpdatedPlayer.getBukkitEntity()));
         }
-
     }
 
     @Override
@@ -114,11 +108,8 @@ public class PlayerlistTrackerEntry extends EntityTrackerEntry {
                 } catch (Throwable e) {
                     e.printStackTrace();
                 }
-
             }
-
         }
-
         super.updatePlayer(entityplayer);
     }
 
@@ -130,7 +121,6 @@ public class PlayerlistTrackerEntry extends EntityTrackerEntry {
         } catch (IllegalAccessException e) {
             e.printStackTrace();
         }
-
         return 0;
     }
 
@@ -142,7 +132,6 @@ public class PlayerlistTrackerEntry extends EntityTrackerEntry {
         } catch (IllegalAccessException e) {
             e.printStackTrace();
         }
-
         return 0;
     }
 
@@ -154,7 +143,6 @@ public class PlayerlistTrackerEntry extends EntityTrackerEntry {
         } catch (IllegalAccessException e) {
             e.printStackTrace();
         }
-
         return 0;
     }
 
@@ -166,7 +154,6 @@ public class PlayerlistTrackerEntry extends EntityTrackerEntry {
         } catch (IllegalAccessException e) {
             e.printStackTrace();
         }
-
         return null;
     }
 
@@ -178,7 +165,6 @@ public class PlayerlistTrackerEntry extends EntityTrackerEntry {
         } catch (IllegalAccessException e) {
             e.printStackTrace();
         }
-
         return false;
     }
 
@@ -200,9 +186,7 @@ public class PlayerlistTrackerEntry extends EntityTrackerEntry {
                 TRACKING_MAP_SETTER = NMS.getFirstSetter(EntityTrackerEntry.class, Map.class);
                 TRACKING_MAP_GETTER = NMS.getFirstGetter(EntityTrackerEntry.class, Map.class);
             }
-
         } catch (Exception e) {
         }
-
     }
 }
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ArmorStandController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ArmorStandController.java
index 552dc75f4..0be6bd61a 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ArmorStandController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ArmorStandController.java
@@ -89,7 +89,6 @@ public class ArmorStandController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -101,7 +100,6 @@ public class ArmorStandController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -120,7 +118,6 @@ public class ArmorStandController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -128,7 +125,6 @@ public class ArmorStandController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ArmorStandNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -148,7 +144,6 @@ public class ArmorStandController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
     }
 }
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/BatController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/BatController.java
index d02ed0024..c168a9cc6 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/BatController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/BatController.java
@@ -66,7 +66,6 @@ public class BatController extends MobEntityController {
             if (npc != null) {
                 setAsleep(false);
             }
-
         }
 
         @Override
@@ -89,7 +88,6 @@ public class BatController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -103,7 +101,6 @@ public class BatController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -114,7 +111,6 @@ public class BatController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -133,7 +129,6 @@ public class BatController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -141,7 +136,6 @@ public class BatController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new BatNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -183,7 +177,6 @@ public class BatController extends MobEntityController {
                 NMSImpl.updateAI(this);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/BlazeController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/BlazeController.java
index 34377b9f6..a1fa6aab5 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/BlazeController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/BlazeController.java
@@ -85,7 +85,6 @@ public class BlazeController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -99,7 +98,6 @@ public class BlazeController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -110,7 +108,6 @@ public class BlazeController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -129,7 +126,6 @@ public class BlazeController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -137,7 +133,6 @@ public class BlazeController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new BlazeNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -176,7 +171,6 @@ public class BlazeController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CatController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CatController.java
index 6125b4ed7..b9fade87d 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CatController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CatController.java
@@ -79,7 +79,6 @@ public class CatController extends MobEntityController {
                 super.a(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::a);
         }
 
@@ -88,7 +87,6 @@ public class CatController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -102,7 +100,6 @@ public class CatController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.b(f, f1);
             }
-
         }
 
         @Override
@@ -114,7 +111,6 @@ public class CatController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -128,7 +124,6 @@ public class CatController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -139,7 +134,6 @@ public class CatController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -159,7 +153,6 @@ public class CatController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -168,7 +161,6 @@ public class CatController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -176,7 +168,6 @@ public class CatController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new CatNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -224,7 +215,6 @@ public class CatController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CaveSpiderController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CaveSpiderController.java
index 45bb8b18d..67a62d7a0 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CaveSpiderController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CaveSpiderController.java
@@ -77,7 +77,6 @@ public class CaveSpiderController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -91,7 +90,6 @@ public class CaveSpiderController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.b(f, f1);
             }
-
         }
 
         @Override
@@ -103,7 +101,6 @@ public class CaveSpiderController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -117,7 +114,6 @@ public class CaveSpiderController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -128,7 +124,6 @@ public class CaveSpiderController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -148,7 +143,6 @@ public class CaveSpiderController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -157,7 +151,6 @@ public class CaveSpiderController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -165,7 +158,6 @@ public class CaveSpiderController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new CaveSpiderNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -213,7 +205,6 @@ public class CaveSpiderController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -230,7 +221,6 @@ public class CaveSpiderController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, justCreated);
             }
-
         }
     }
 }
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ChickenController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ChickenController.java
index 2ed450c5e..452f9b1e3 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ChickenController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ChickenController.java
@@ -79,7 +79,6 @@ public class ChickenController extends MobEntityController {
                 super.a(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::a);
         }
 
@@ -88,7 +87,6 @@ public class ChickenController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -102,7 +100,6 @@ public class ChickenController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.b(f, f1);
             }
-
         }
 
         @Override
@@ -114,7 +111,6 @@ public class ChickenController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -128,7 +124,6 @@ public class ChickenController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -139,7 +134,6 @@ public class ChickenController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -159,7 +153,6 @@ public class ChickenController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -168,7 +161,6 @@ public class ChickenController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -176,7 +168,6 @@ public class ChickenController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ChickenNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -224,7 +215,6 @@ public class ChickenController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -232,7 +222,6 @@ public class ChickenController extends MobEntityController {
             if (npc != null) {
                 this.eggLayTime = 100; // egg timer
             }
-
             super.movementTick();
         }
 
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CodController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CodController.java
index 5cf959f1d..64bc577c5 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CodController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CodController.java
@@ -73,7 +73,6 @@ public class CodController extends MobEntityController {
             if (npc != null) {
                 this.moveController = new ControllerMove(this);
             }
-
         }
 
         @Override
@@ -86,7 +85,6 @@ public class CodController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -110,7 +108,6 @@ public class CodController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.b(f, f1);
             }
-
         }
 
         @Override
@@ -122,7 +119,6 @@ public class CodController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -136,7 +132,6 @@ public class CodController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -147,7 +142,6 @@ public class CodController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -166,11 +160,9 @@ public class CodController extends MobEntityController {
                 if (!NMSImpl.moveFish(npc, this, vec3d)) {
                     super.e(vec3d);
                 }
-
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -179,7 +171,6 @@ public class CodController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -187,7 +178,6 @@ public class CodController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new CodNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -234,12 +224,10 @@ public class CodController extends MobEntityController {
             if (npc != null) {
                 NMSImpl.setNotInSchool(this);
             }
-
             super.mobTick();
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -248,12 +236,10 @@ public class CodController extends MobEntityController {
             if (npc != null) {
                 this.y = false;
             }
-
             super.movementTick();
             if (npc != null) {
                 this.y = lastInWater;
             }
-
         }
 
         @Override
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CowController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CowController.java
index 40c49be50..33835e9da 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CowController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CowController.java
@@ -83,7 +83,6 @@ public class CowController extends MobEntityController {
                 super.a(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::a);
         }
 
@@ -92,7 +91,6 @@ public class CowController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -116,7 +114,6 @@ public class CowController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.b(f, f1);
             }
-
         }
 
         @Override
@@ -128,7 +125,6 @@ public class CowController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -142,7 +138,6 @@ public class CowController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -153,7 +148,6 @@ public class CowController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -173,7 +167,6 @@ public class CowController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -182,7 +175,6 @@ public class CowController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -190,7 +182,6 @@ public class CowController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new CowNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -238,7 +229,6 @@ public class CowController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CreeperController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CreeperController.java
index bfba837f2..dcdbe77e2 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CreeperController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/CreeperController.java
@@ -80,7 +80,6 @@ public class CreeperController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -94,7 +93,6 @@ public class CreeperController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.b(f, f1);
             }
-
         }
 
         @Override
@@ -106,7 +104,6 @@ public class CreeperController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -120,7 +117,6 @@ public class CreeperController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -131,7 +127,6 @@ public class CreeperController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -151,7 +146,6 @@ public class CreeperController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -160,7 +154,6 @@ public class CreeperController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -168,7 +161,6 @@ public class CreeperController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new CreeperNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -202,7 +194,6 @@ public class CreeperController extends MobEntityController {
             if (npc == null || !npc.isProtected()) {
                 super.ignite();
             }
-
         }
 
         @Override
@@ -224,7 +215,6 @@ public class CreeperController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -239,7 +229,6 @@ public class CreeperController extends MobEntityController {
             if (npc == null || allowPowered) {
                 super.onLightningStrike(entitylightning);
             }
-
         }
 
         public void setAllowPowered(boolean allowPowered) {
@@ -253,7 +242,6 @@ public class CreeperController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, justCreated);
             }
-
         }
     }
 }
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/DolphinController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/DolphinController.java
index 9d43deb24..543bd0c9a 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/DolphinController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/DolphinController.java
@@ -74,7 +74,6 @@ public class DolphinController extends MobEntityController {
                 this.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED)
                         .setValue(this.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED).getBaseValue() / 10);
             }
-
         }
 
         @Override
@@ -87,7 +86,6 @@ public class DolphinController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -106,7 +104,6 @@ public class DolphinController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.b(f, f1);
             }
-
         }
 
         @Override
@@ -118,7 +115,6 @@ public class DolphinController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -132,7 +128,6 @@ public class DolphinController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -143,7 +138,6 @@ public class DolphinController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -162,11 +156,9 @@ public class DolphinController extends MobEntityController {
                 if (!NMSImpl.moveFish(npc, this, vec3d, db())) {
                     super.e(vec3d);
                 }
-
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -175,7 +167,6 @@ public class DolphinController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -183,7 +174,6 @@ public class DolphinController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new DolphinNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -237,13 +227,11 @@ public class DolphinController extends MobEntityController {
             if (npc != null && npc.isProtected()) {
                 inProtectedTick = true;
             }
-
             super.tick();
             inProtectedTick = false;
             if (npc != null) {
                 npc.update();
             }
-
         }
     }
 }
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/DrownedController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/DrownedController.java
index 42de6f247..c6cc69029 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/DrownedController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/DrownedController.java
@@ -77,7 +77,6 @@ public class DrownedController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -91,7 +90,6 @@ public class DrownedController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.b(f, f1);
             }
-
         }
 
         @Override
@@ -103,7 +101,6 @@ public class DrownedController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -117,7 +114,6 @@ public class DrownedController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -128,7 +124,6 @@ public class DrownedController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -148,7 +143,6 @@ public class DrownedController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -157,7 +151,6 @@ public class DrownedController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -165,7 +158,6 @@ public class DrownedController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new DrownedNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -213,7 +205,6 @@ public class DrownedController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EnderDragonController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EnderDragonController.java
index 1ef7a1b47..a3a375a58 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EnderDragonController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EnderDragonController.java
@@ -90,7 +90,6 @@ public class EnderDragonController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -104,7 +103,6 @@ public class EnderDragonController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -115,7 +113,6 @@ public class EnderDragonController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -138,7 +135,6 @@ public class EnderDragonController extends MobEntityController {
             if (getDragonControllerManager().a().getControllerPhase() == DragonControllerPhase.HOVER) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -148,7 +144,6 @@ public class EnderDragonController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -156,7 +151,6 @@ public class EnderDragonController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new EnderDragonNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -195,25 +189,20 @@ public class EnderDragonController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
             if (npc != null) {
                 if (getDragonControllerManager().a().getControllerPhase() == DragonControllerPhase.DYING) {
                     setHealth(0F);
                     return;
                 }
-
                 if (this.d < 0) {
                     for (int i = 0; i < this.c.length; ++i) {
                         this.c[i][0] = this.yaw;
                         this.c[i][1] = this.locY;
                     }
-
                 }
-
                 if (++this.d == this.c.length) {
                     this.d = 0;
                 }
-
                 this.c[this.d][0] = this.yaw;
                 this.c[this.d][1] = this.locY;
 
@@ -226,22 +215,18 @@ public class EnderDragonController extends MobEntityController {
                     children[j].lastY = vec3.y;
                     children[j].lastZ = vec3.z;
                 }
-
                 if (getRidingPassenger() != null) {
                     yaw = getRidingPassenger().getBukkitYaw() - 180;
                 }
-
                 Vec3D mot = getMot();
                 if (mot.getX() != 0 || mot.getY() != 0 || mot.getZ() != 0) {
                     mot = mot.d(0.98, 0.98, 0.98);
                     if (getRidingPassenger() == null) {
                         yaw = Util.getDragonYaw(getBukkitEntity(), mot.x, mot.z);
                     }
-
                     setPosition(locX + mot.getX(), locY + mot.getY(), locZ + mot.getZ());
                     setMot(mot);
                 }
-
                 if (npc.hasTrait(EnderDragonTrait.class) && npc.getOrAddTrait(EnderDragonTrait.class).isDestroyWalls()
                         && NMSImpl.ENDERDRAGON_CHECK_WALLS != null) {
                     for (int i = 0; i < 3; i++) {
@@ -251,11 +236,8 @@ public class EnderDragonController extends MobEntityController {
                         } catch (Throwable e) {
                             e.printStackTrace();
                         }
-
                     }
-
                 }
-
                 if (npc.data().get(NPC.Metadata.COLLIDABLE, false)) {
                     try {
                         KNOCKBACK.invoke(this, this.world.getEntities(this,
@@ -269,13 +251,10 @@ public class EnderDragonController extends MobEntityController {
                     } catch (Throwable t) {
                         t.printStackTrace();
                     }
-
                 }
-
             } else {
                 super.movementTick();
             }
-
         }
 
         @Override
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EndermanController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EndermanController.java
index 927e39e52..6e1944978 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EndermanController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EndermanController.java
@@ -77,7 +77,6 @@ public class EndermanController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -98,7 +97,6 @@ public class EndermanController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.b(f, f1);
             }
-
         }
 
         @Override
@@ -110,7 +108,6 @@ public class EndermanController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -124,7 +121,6 @@ public class EndermanController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -135,7 +131,6 @@ public class EndermanController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -155,7 +150,6 @@ public class EndermanController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -164,7 +158,6 @@ public class EndermanController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -172,7 +165,6 @@ public class EndermanController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new EndermanNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -220,7 +212,6 @@ public class EndermanController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -237,7 +228,6 @@ public class EndermanController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, justCreated);
             }
-
         }
     }
 }
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EndermiteController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EndermiteController.java
index 5da6db9ef..d53efa864 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EndermiteController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EndermiteController.java
@@ -77,7 +77,6 @@ public class EndermiteController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -91,7 +90,6 @@ public class EndermiteController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.b(f, f1);
             }
-
         }
 
         @Override
@@ -103,7 +101,6 @@ public class EndermiteController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -117,7 +114,6 @@ public class EndermiteController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -128,7 +124,6 @@ public class EndermiteController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -148,7 +143,6 @@ public class EndermiteController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -157,7 +151,6 @@ public class EndermiteController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -165,7 +158,6 @@ public class EndermiteController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new EndermiteNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -213,7 +205,6 @@ public class EndermiteController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -230,7 +221,6 @@ public class EndermiteController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, justCreated);
             }
-
         }
     }
 }
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EntityHumanNPC.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EntityHumanNPC.java
index 8bd39aa93..fb1c20c37 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EntityHumanNPC.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EntityHumanNPC.java
@@ -89,7 +89,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         } else {
             skinTracker = null;
         }
-
     }
 
     @Override
@@ -97,7 +96,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         if (npc == null || !npc.isFlyable()) {
             super.a(d0, flag, block, blockposition);
         }
-
     }
 
     @Override
@@ -120,7 +118,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         if (npc == null || !npc.isFlyable()) {
             super.b(f, f1);
         }
-
     }
 
     @Override
@@ -131,7 +128,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         if (npc != null) {
             Util.callCollisionEvent(npc, entity.getBukkitEntity());
         }
-
     }
 
     @Override
@@ -145,7 +141,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
             Bukkit.getScheduler().runTask(CitizensAPI.getPlugin(),
                     (Runnable) () -> EntityHumanNPC.this.velocityChanged = true);
         }
-
         return damaged;
     }
 
@@ -175,7 +170,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         } else {
             NMSImpl.flyingMoveLogic(this, vec3d);
         }
-
     }
 
     @Override
@@ -184,7 +178,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         if (vector != null) {
             super.f(vector.getX(), vector.getY(), vector.getZ());
         }
-
     }
 
     @Override
@@ -192,7 +185,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
             NMSImpl.setBukkitEntity(this, new PlayerNPC(this));
         }
-
         return super.getBukkitEntity();
     }
 
@@ -226,7 +218,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         if (skinName == null) {
             skinName = npc.getName();
         }
-
         return skinName.toLowerCase();
     }
 
@@ -259,12 +250,10 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
             conn.setPacketListener(playerConnection);
         } catch (IOException e) {
         }
-
         AttributeInstance range = getAttributeInstance(GenericAttributes.FOLLOW_RANGE);
         if (range == null) {
             range = getAttributeMap().b(GenericAttributes.FOLLOW_RANGE);
         }
-
         range.setValue(Setting.DEFAULT_PATHFINDING_RANGE.asDouble());
         controllerJump = new PlayerControllerJump(this);
         controllerMove = new PlayerControllerMove(this);
@@ -302,11 +291,9 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
                 jump();
                 jumpTicks = 10;
             }
-
         } else {
             jumpTicks = 0;
         }
-
         bb *= 0.98F;
         bd *= 0.98F;
         be *= 0.9F;
@@ -315,7 +302,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         if (jumpTicks > 0) {
             jumpTicks--;
         }
-
     }
 
     private void moveWithFallDamage(Vec3D vec) {
@@ -324,7 +310,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         if (!npc.isProtected()) {
             a(this.locY - y, onGround);
         }
-
     }
 
     @Override
@@ -333,7 +318,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
             super.playerTick();
             return;
         }
-
         entityBaseTick();
         boolean navigating = npc.getNavigator().isNavigating() || controllerMove.b();
         if (!navigating && getBukkitEntity() != null
@@ -342,20 +326,16 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
                 && (!npc.isProtected() || SpigotUtil.checkYSafe(locY, getBukkitEntity().getWorld()))) {
             moveWithFallDamage(new Vec3D(0, 0, 0));
         }
-
         Vec3D mot = getMot();
         if (Math.abs(mot.getX()) < EPSILON && Math.abs(mot.getY()) < EPSILON && Math.abs(mot.getZ()) < EPSILON) {
             setMot(new Vec3D(0, 0, 0));
         }
-
         if (navigating) {
             if (!NMSImpl.isNavigationFinished(navigation)) {
                 NMSImpl.updateNavigation(navigation);
             }
-
             moveOnCurrentHeading();
         }
-
         updateAI();
         collideNearby();
         if (npc.data().get(NPC.Metadata.PICKUP_ITEMS, false)) {
@@ -365,16 +345,12 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
             } else {
                 axisalignedbb = this.getBoundingBox().grow(1.0, 0.5, 1.0);
             }
-
             for (Entity entity : this.world.getEntities(this, axisalignedbb)) {
                 if (!entity.dead) {
                     entity.pickup(this);
                 }
-
             }
-
         }
-
     }
 
     public void setMoveDestination(double x, double y, double z, double speed) {
@@ -442,16 +418,12 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
                 if (cache != null && !cache.isEmpty()) {
                     this.getAttributeMap().a(cache.a(slot));
                 }
-
                 if (equipment != null && !equipment.isEmpty()) {
                     this.getAttributeMap().b(equipment.a(slot));
                 }
-
             }
-
             equipmentCache.put(slot, equipment);
         }
-
         if (!itemChanged)
             return;
         Location current = getBukkitEntity().getLocation(packetLocationCache);
@@ -460,7 +432,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         for (EnumItemSlot slot : EnumItemSlot.values()) {
             packets[i++] = new PacketPlayOutEntityEquipment(getId(), slot, getEquipment(slot));
         }
-
         NMSImpl.sendPacketsNearby(getBukkitEntity(), current, packets);
     }
 
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EvokerController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EvokerController.java
index 63c9f7d70..af2261f0c 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EvokerController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/EvokerController.java
@@ -63,7 +63,6 @@ public class EvokerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -77,7 +76,6 @@ public class EvokerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.b(f, f1);
             }
-
         }
 
         @Override
@@ -89,7 +87,6 @@ public class EvokerController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -103,7 +100,6 @@ public class EvokerController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -114,7 +110,6 @@ public class EvokerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -134,7 +129,6 @@ public class EvokerController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -143,7 +137,6 @@ public class EvokerController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -151,7 +144,6 @@ public class EvokerController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new EvokerNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -199,7 +191,6 @@ public class EvokerController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/FoxController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/FoxController.java
index 16434e809..a984bf6ec 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/FoxController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/FoxController.java
@@ -65,7 +65,6 @@ public class FoxController extends MobEntityController {
                 super.a(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::a);
         }
 
@@ -74,7 +73,6 @@ public class FoxController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -88,7 +86,6 @@ public class FoxController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.b(f, f1);
             }
-
         }
 
         @Override
@@ -100,7 +97,6 @@ public class FoxController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -114,7 +110,6 @@ public class FoxController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -125,7 +120,6 @@ public class FoxController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -145,7 +139,6 @@ public class FoxController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -154,7 +147,6 @@ public class FoxController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -162,7 +154,6 @@ public class FoxController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new FoxNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -210,7 +201,6 @@ public class FoxController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GhastController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GhastController.java
index d80fb4d21..06f10279c 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GhastController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GhastController.java
@@ -71,7 +71,6 @@ public class GhastController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -85,7 +84,6 @@ public class GhastController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -96,7 +94,6 @@ public class GhastController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -115,7 +112,6 @@ public class GhastController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -123,7 +119,6 @@ public class GhastController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new GhastNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -167,7 +162,6 @@ public class GhastController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
             super.mobTick();
         }
 
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GiantController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GiantController.java
index 6d2f72d44..0a9cdc4aa 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GiantController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GiantController.java
@@ -63,7 +63,6 @@ public class GiantController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -77,7 +76,6 @@ public class GiantController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.b(f, f1);
             }
-
         }
 
         @Override
@@ -89,7 +87,6 @@ public class GiantController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -103,7 +100,6 @@ public class GiantController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -114,7 +110,6 @@ public class GiantController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -134,7 +129,6 @@ public class GiantController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -143,7 +137,6 @@ public class GiantController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -151,7 +144,6 @@ public class GiantController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new GiantNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -199,7 +191,6 @@ public class GiantController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -216,7 +207,6 @@ public class GiantController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, justCreated);
             }
-
         }
     }
 
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GuardianController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GuardianController.java
index 3ff30b930..1f6be0e44 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GuardianController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GuardianController.java
@@ -63,7 +63,6 @@ public class GuardianController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -77,7 +76,6 @@ public class GuardianController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.b(f, f1);
             }
-
         }
 
         @Override
@@ -89,7 +87,6 @@ public class GuardianController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -103,7 +100,6 @@ public class GuardianController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -114,7 +110,6 @@ public class GuardianController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -134,7 +129,6 @@ public class GuardianController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -143,7 +137,6 @@ public class GuardianController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -151,7 +144,6 @@ public class GuardianController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new GuardianNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -201,7 +193,6 @@ public class GuardianController extends MobEntityController {
                 NMSImpl.updateAI(this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -218,7 +209,6 @@ public class GuardianController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, justCreated);
             }
-
         }
     }
 
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GuardianElderController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GuardianElderController.java
index 730b9c460..9edcdb17b 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GuardianElderController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/GuardianElderController.java
@@ -63,7 +63,6 @@ public class GuardianElderController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -77,7 +76,6 @@ public class GuardianElderController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.b(f, f1);
             }
-
         }
 
         @Override
@@ -89,7 +87,6 @@ public class GuardianElderController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -103,7 +100,6 @@ public class GuardianElderController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -114,7 +110,6 @@ public class GuardianElderController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -134,7 +129,6 @@ public class GuardianElderController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -143,7 +137,6 @@ public class GuardianElderController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -151,7 +144,6 @@ public class GuardianElderController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new GuardianElderNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -201,7 +193,6 @@ public class GuardianElderController extends MobEntityController {
                 NMSImpl.updateAI(this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -218,7 +209,6 @@ public class GuardianElderController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, justCreated);
             }
-
         }
     }
 
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseController.java
index bbdf4718f..21b94737c 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseController.java
@@ -71,7 +71,6 @@ public class HorseController extends MobEntityController {
                 horse.setDomestication(horse.getMaxDomestication());
                 baseMovementSpeed = this.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED).getValue();
             }
-
         }
 
         @Override
@@ -85,7 +84,6 @@ public class HorseController extends MobEntityController {
                 super.a(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::a);
         }
 
@@ -94,7 +92,6 @@ public class HorseController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -108,7 +105,6 @@ public class HorseController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.b(f, f1);
             }
-
         }
 
         @Override
@@ -120,7 +116,6 @@ public class HorseController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -141,7 +136,6 @@ public class HorseController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -152,7 +146,6 @@ public class HorseController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -177,7 +170,6 @@ public class HorseController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -186,7 +178,6 @@ public class HorseController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -194,7 +185,6 @@ public class HorseController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new HorseNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -247,20 +237,16 @@ public class HorseController extends MobEntityController {
                 } else {
                     riding = false;
                 }
-
                 if (riding) {
                     if (npc.getNavigator().isNavigating()) {
                         org.bukkit.entity.Entity basePassenger = passengers.get(0).getBukkitEntity();
                         NMS.look(basePassenger, yaw, pitch);
                     }
-
                     d(4, true); // datawatcher method
                 }
-
                 NMS.setStepHeight(getBukkitEntity(), 1);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseDonkeyController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseDonkeyController.java
index e0598bc9f..88d2fd7bc 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseDonkeyController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseDonkeyController.java
@@ -70,7 +70,6 @@ public class HorseDonkeyController extends MobEntityController {
                 ((Donkey) getBukkitEntity()).setDomestication(((Donkey) getBukkitEntity()).getMaxDomestication());
                 baseMovementSpeed = this.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED).getValue();
             }
-
         }
 
         @Override
@@ -84,7 +83,6 @@ public class HorseDonkeyController extends MobEntityController {
                 super.a(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::a);
         }
 
@@ -93,7 +91,6 @@ public class HorseDonkeyController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -107,7 +104,6 @@ public class HorseDonkeyController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.b(f, f1);
             }
-
         }
 
         @Override
@@ -119,7 +115,6 @@ public class HorseDonkeyController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -140,7 +135,6 @@ public class HorseDonkeyController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -151,7 +145,6 @@ public class HorseDonkeyController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -176,7 +169,6 @@ public class HorseDonkeyController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -185,7 +177,6 @@ public class HorseDonkeyController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -193,7 +184,6 @@ public class HorseDonkeyController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new HorseDonkeyNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -246,20 +236,16 @@ public class HorseDonkeyController extends MobEntityController {
                 } else {
                     riding = false;
                 }
-
                 if (riding) {
                     if (npc.getNavigator().isNavigating()) {
                         org.bukkit.entity.Entity basePassenger = passengers.get(0).getBukkitEntity();
                         NMS.look(basePassenger, yaw, pitch);
                     }
-
                     d(4, true); // datawatcher method
                 }
-
                 NMS.setStepHeight(getBukkitEntity(), 1);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseMuleController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseMuleController.java
index 0a88e206a..856e0c22d 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseMuleController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseMuleController.java
@@ -70,7 +70,6 @@ public class HorseMuleController extends MobEntityController {
                 ((Mule) getBukkitEntity()).setDomestication(((Mule) getBukkitEntity()).getMaxDomestication());
                 baseMovementSpeed = this.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED).getValue();
             }
-
         }
 
         @Override
@@ -84,7 +83,6 @@ public class HorseMuleController extends MobEntityController {
                 super.a(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::a);
         }
 
@@ -93,7 +91,6 @@ public class HorseMuleController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -107,7 +104,6 @@ public class HorseMuleController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.b(f, f1);
             }
-
         }
 
         @Override
@@ -119,7 +115,6 @@ public class HorseMuleController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -140,7 +135,6 @@ public class HorseMuleController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -151,7 +145,6 @@ public class HorseMuleController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -176,7 +169,6 @@ public class HorseMuleController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -185,7 +177,6 @@ public class HorseMuleController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -193,7 +184,6 @@ public class HorseMuleController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new HorseMuleNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -246,20 +236,16 @@ public class HorseMuleController extends MobEntityController {
                 } else {
                     riding = false;
                 }
-
                 if (riding) {
                     if (npc.getNavigator().isNavigating()) {
                         org.bukkit.entity.Entity basePassenger = passengers.get(0).getBukkitEntity();
                         NMS.look(basePassenger, yaw, pitch);
                     }
-
                     d(4, true); // datawatcher method
                 }
-
                 NMS.setStepHeight(getBukkitEntity(), 1);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseSkeletonController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseSkeletonController.java
index 0267cec4a..ae721a02e 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseSkeletonController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseSkeletonController.java
@@ -71,7 +71,6 @@ public class HorseSkeletonController extends MobEntityController {
                         .setDomestication(((SkeletonHorse) getBukkitEntity()).getMaxDomestication());
                 baseMovementSpeed = this.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED).getValue();
             }
-
         }
 
         @Override
@@ -85,7 +84,6 @@ public class HorseSkeletonController extends MobEntityController {
                 super.a(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::a);
         }
 
@@ -94,7 +92,6 @@ public class HorseSkeletonController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -108,7 +105,6 @@ public class HorseSkeletonController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.b(f, f1);
             }
-
         }
 
         @Override
@@ -120,7 +116,6 @@ public class HorseSkeletonController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -141,7 +136,6 @@ public class HorseSkeletonController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -152,7 +146,6 @@ public class HorseSkeletonController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -177,7 +170,6 @@ public class HorseSkeletonController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -186,7 +178,6 @@ public class HorseSkeletonController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -194,7 +185,6 @@ public class HorseSkeletonController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new HorseSkeletonNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -247,20 +237,16 @@ public class HorseSkeletonController extends MobEntityController {
                 } else {
                     riding = false;
                 }
-
                 if (riding) {
                     if (npc.getNavigator().isNavigating()) {
                         org.bukkit.entity.Entity basePassenger = passengers.get(0).getBukkitEntity();
                         NMS.look(basePassenger, yaw, pitch);
                     }
-
                     d(4, true); // datawatcher method
                 }
-
                 NMS.setStepHeight(getBukkitEntity(), 1);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseZombieController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseZombieController.java
index ae00905ef..df484379f 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseZombieController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HorseZombieController.java
@@ -71,7 +71,6 @@ public class HorseZombieController extends MobEntityController {
                         .setDomestication(((ZombieHorse) getBukkitEntity()).getMaxDomestication());
                 baseMovementSpeed = this.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED).getValue();
             }
-
         }
 
         @Override
@@ -85,7 +84,6 @@ public class HorseZombieController extends MobEntityController {
                 super.a(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::a);
         }
 
@@ -94,7 +92,6 @@ public class HorseZombieController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -108,7 +105,6 @@ public class HorseZombieController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.b(f, f1);
             }
-
         }
 
         @Override
@@ -120,7 +116,6 @@ public class HorseZombieController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -141,7 +136,6 @@ public class HorseZombieController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -152,7 +146,6 @@ public class HorseZombieController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -177,7 +170,6 @@ public class HorseZombieController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -186,7 +178,6 @@ public class HorseZombieController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -194,7 +185,6 @@ public class HorseZombieController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new HorseZombieNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -247,20 +237,16 @@ public class HorseZombieController extends MobEntityController {
                 } else {
                     riding = false;
                 }
-
                 if (riding) {
                     if (npc.getNavigator().isNavigating()) {
                         org.bukkit.entity.Entity basePassenger = passengers.get(0).getBukkitEntity();
                         NMS.look(basePassenger, yaw, pitch);
                     }
-
                     d(4, true); // datawatcher method
                 }
-
                 NMS.setStepHeight(getBukkitEntity(), 1);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HumanController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HumanController.java
index 1d6521f2c..150fcf1e3 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HumanController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/HumanController.java
@@ -35,11 +35,9 @@ public class HumanController extends AbstractEntityController {
         if (npc.requiresNameHologram()) {
             name = teamName;
         }
-
         if (Setting.USE_SCOREBOARD_TEAMS.asBoolean()) {
             npc.getOrAddTrait(ScoreboardTrait.class).createTeam(name);
         }
-
         final GameProfile profile = new GameProfile(uuid, name);
         final EntityHumanNPC handle = new EntityHumanNPC(nmsWorld.getServer().getServer(), nmsWorld, profile,
                 new PlayerInteractManager(nmsWorld), npc);
@@ -47,7 +45,6 @@ public class HumanController extends AbstractEntityController {
         if (skin != null) {
             skin.apply(handle);
         }
-
         Bukkit.getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(), () -> {
             if (getBukkitEntity() == null || !getBukkitEntity().isValid()
                     || getBukkitEntity() != handle.getBukkitEntity())
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/IllusionerController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/IllusionerController.java
index db8023e2c..bee946808 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/IllusionerController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/IllusionerController.java
@@ -63,7 +63,6 @@ public class IllusionerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -77,7 +76,6 @@ public class IllusionerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.b(f, f1);
             }
-
         }
 
         @Override
@@ -89,7 +87,6 @@ public class IllusionerController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -103,7 +100,6 @@ public class IllusionerController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -114,7 +110,6 @@ public class IllusionerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -134,7 +129,6 @@ public class IllusionerController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -143,7 +137,6 @@ public class IllusionerController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -151,7 +144,6 @@ public class IllusionerController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new IllusionerNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -199,7 +191,6 @@ public class IllusionerController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/IronGolemController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/IronGolemController.java
index a17ed0948..8d5ca0122 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/IronGolemController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/IronGolemController.java
@@ -63,7 +63,6 @@ public class IronGolemController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -77,7 +76,6 @@ public class IronGolemController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.b(f, f1);
             }
-
         }
 
         @Override
@@ -89,7 +87,6 @@ public class IronGolemController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -103,7 +100,6 @@ public class IronGolemController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -114,7 +110,6 @@ public class IronGolemController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -134,7 +129,6 @@ public class IronGolemController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -143,7 +137,6 @@ public class IronGolemController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -151,7 +144,6 @@ public class IronGolemController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new IronGolemNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -199,7 +191,6 @@ public class IronGolemController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -216,7 +207,6 @@ public class IronGolemController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, justCreated);
             }
-
         }
     }
 
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/LlamaController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/LlamaController.java
index 851da2f60..e439b2690 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/LlamaController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/LlamaController.java
@@ -70,7 +70,6 @@ public class LlamaController extends MobEntityController {
                 ((Llama) getBukkitEntity()).setDomestication(((Llama) getBukkitEntity()).getMaxDomestication());
                 baseMovementSpeed = this.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED).getValue();
             }
-
         }
 
         @Override
@@ -84,7 +83,6 @@ public class LlamaController extends MobEntityController {
                 super.a(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::a);
         }
 
@@ -93,7 +91,6 @@ public class LlamaController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -107,7 +104,6 @@ public class LlamaController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.b(f, f1);
             }
-
         }
 
         @Override
@@ -119,7 +115,6 @@ public class LlamaController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -140,7 +135,6 @@ public class LlamaController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -151,7 +145,6 @@ public class LlamaController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -176,7 +169,6 @@ public class LlamaController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -185,7 +177,6 @@ public class LlamaController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -193,7 +184,6 @@ public class LlamaController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new LlamaNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -246,20 +236,16 @@ public class LlamaController extends MobEntityController {
                 } else {
                     riding = false;
                 }
-
                 if (riding) {
                     if (npc.getNavigator().isNavigating()) {
                         org.bukkit.entity.Entity basePassenger = passengers.get(0).getBukkitEntity();
                         NMS.look(basePassenger, yaw, pitch);
                     }
-
                     d(4, true); // datawatcher method
                 }
-
                 NMS.setStepHeight(getBukkitEntity(), 1);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/MagmaCubeController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/MagmaCubeController.java
index 900836b5f..75cf8114f 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/MagmaCubeController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/MagmaCubeController.java
@@ -57,7 +57,6 @@ public class MagmaCubeController extends MobEntityController {
                 setSize(3, true);
                 this.moveController = new PlayerControllerMove(this);
             }
-
         }
 
         @Override
@@ -70,7 +69,6 @@ public class MagmaCubeController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -84,7 +82,6 @@ public class MagmaCubeController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.b(f, f1);
             }
-
         }
 
         @Override
@@ -96,7 +93,6 @@ public class MagmaCubeController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -110,7 +106,6 @@ public class MagmaCubeController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -121,7 +116,6 @@ public class MagmaCubeController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -141,7 +135,6 @@ public class MagmaCubeController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -150,7 +143,6 @@ public class MagmaCubeController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -158,7 +150,6 @@ public class MagmaCubeController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new MagmaCubeNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -212,7 +203,6 @@ public class MagmaCubeController extends MobEntityController {
             if (npc == null) {
                 super.pickup(human);
             }
-
         }
 
         @Override
@@ -221,7 +211,6 @@ public class MagmaCubeController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -231,7 +220,6 @@ public class MagmaCubeController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, justCreated);
             }
-
         }
     }
 
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/MobEntityController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/MobEntityController.java
index 16c63f9d6..4b4d92a34 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/MobEntityController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/MobEntityController.java
@@ -41,9 +41,7 @@ public abstract class MobEntityController extends AbstractEntityController {
             if (mob.getControllerLook().getClass() == ControllerLook.class) {
                 NMSImpl.setLookControl(mob, new PitchableLookControl(mob));
             }
-
         }
-
         entity.setPositionRotation(at.getX(), at.getY(), at.getZ(), at.getYaw(), at.getPitch());
         if (npc != null) {
             // entity.onGround isn't updated right away - we approximate here so
@@ -52,19 +50,15 @@ public abstract class MobEntityController extends AbstractEntityController {
             if (beneath.isSolid()) {
                 entity.onGround = true;
             }
-
             try {
                 UUID_FIELD.invoke(entity, npc.getUniqueId());
             } catch (Throwable e) {
                 e.printStackTrace();
             }
-
             if (Setting.USE_SCOREBOARD_TEAMS.asBoolean()) {
                 npc.getOrAddTrait(ScoreboardTrait.class).createTeam(npc.getUniqueId().toString());
             }
-
         }
-
         return entity.getBukkitEntity();
     }
 
@@ -75,7 +69,6 @@ public abstract class MobEntityController extends AbstractEntityController {
             ex.printStackTrace();
             return null;
         }
-
     }
 
     private static Constructor<?> getConstructor(Class<?> clazz) {
@@ -88,7 +81,6 @@ public abstract class MobEntityController extends AbstractEntityController {
         } catch (Exception ex) {
             throw new IllegalStateException("unable to find an entity constructor");
         }
-
     }
 
     private static final Map<Class<?>, Constructor<?>> CONSTRUCTOR_CACHE = new WeakHashMap<>();
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/MushroomCowController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/MushroomCowController.java
index 48b183d7d..9b4a7e53c 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/MushroomCowController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/MushroomCowController.java
@@ -67,7 +67,6 @@ public class MushroomCowController extends MobEntityController {
                 super.a(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::a);
         }
 
@@ -76,7 +75,6 @@ public class MushroomCowController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -97,7 +95,6 @@ public class MushroomCowController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.b(f, f1);
             }
-
         }
 
         @Override
@@ -109,7 +106,6 @@ public class MushroomCowController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -123,7 +119,6 @@ public class MushroomCowController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -134,7 +129,6 @@ public class MushroomCowController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -154,7 +148,6 @@ public class MushroomCowController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -163,7 +156,6 @@ public class MushroomCowController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -171,7 +163,6 @@ public class MushroomCowController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new MushroomCowNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -219,7 +210,6 @@ public class MushroomCowController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/OcelotController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/OcelotController.java
index 34cf8f85e..e03546217 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/OcelotController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/OcelotController.java
@@ -65,7 +65,6 @@ public class OcelotController extends MobEntityController {
                 super.a(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::a);
         }
 
@@ -74,7 +73,6 @@ public class OcelotController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -88,7 +86,6 @@ public class OcelotController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.b(f, f1);
             }
-
         }
 
         @Override
@@ -100,7 +97,6 @@ public class OcelotController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -114,7 +110,6 @@ public class OcelotController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -125,7 +120,6 @@ public class OcelotController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -143,7 +137,6 @@ public class OcelotController extends MobEntityController {
             if (npc == null) {
                 super.dW();
             }
-
         }
 
         @Override
@@ -153,7 +146,6 @@ public class OcelotController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -162,7 +154,6 @@ public class OcelotController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -170,7 +161,6 @@ public class OcelotController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new OcelotNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -218,7 +208,6 @@ public class OcelotController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PandaController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PandaController.java
index 4e72b1847..370e9cca8 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PandaController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PandaController.java
@@ -65,7 +65,6 @@ public class PandaController extends MobEntityController {
                 super.a(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::a);
         }
 
@@ -74,7 +73,6 @@ public class PandaController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -88,7 +86,6 @@ public class PandaController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.b(f, f1);
             }
-
         }
 
         @Override
@@ -100,7 +97,6 @@ public class PandaController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -114,7 +110,6 @@ public class PandaController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -125,7 +120,6 @@ public class PandaController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -145,7 +139,6 @@ public class PandaController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -154,7 +147,6 @@ public class PandaController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -162,7 +154,6 @@ public class PandaController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new PandaNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -210,7 +201,6 @@ public class PandaController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ParrotController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ParrotController.java
index 1c53011d6..59385d4e9 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ParrotController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ParrotController.java
@@ -81,7 +81,6 @@ public class ParrotController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -95,7 +94,6 @@ public class ParrotController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -106,7 +104,6 @@ public class ParrotController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -125,7 +122,6 @@ public class ParrotController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -133,7 +129,6 @@ public class ParrotController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ParrotNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -175,7 +170,6 @@ public class ParrotController extends MobEntityController {
                 NMSImpl.updateAI(this);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PhantomController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PhantomController.java
index ab0b218e7..c1468a502 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PhantomController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PhantomController.java
@@ -59,7 +59,6 @@ public class PhantomController extends MobEntityController {
                 this.lookController = new ControllerLook(this);
                 // TODO: phantom pitch reversed
             }
-
         }
 
         @Override
@@ -72,7 +71,6 @@ public class PhantomController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -86,7 +84,6 @@ public class PhantomController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.b(f, f1);
             }
-
         }
 
         @Override
@@ -98,7 +95,6 @@ public class PhantomController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -112,7 +108,6 @@ public class PhantomController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -123,7 +118,6 @@ public class PhantomController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -150,7 +144,6 @@ public class PhantomController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -159,7 +152,6 @@ public class PhantomController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -167,7 +159,6 @@ public class PhantomController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new PhantomNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -216,10 +207,8 @@ public class PhantomController extends MobEntityController {
                 if (npc.isProtected()) {
                     this.setOnFire(0);
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
@@ -236,12 +225,10 @@ public class PhantomController extends MobEntityController {
             if (npc != null && resetDifficulty) {
                 this.world.getWorldData().setDifficulty(EnumDifficulty.NORMAL);
             }
-
             super.tick();
             if (npc != null && resetDifficulty) {
                 this.world.getWorldData().setDifficulty(EnumDifficulty.PEACEFUL);
             }
-
         }
     }
 
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PigController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PigController.java
index 6416e87af..48fdcbcc8 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PigController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PigController.java
@@ -66,7 +66,6 @@ public class PigController extends MobEntityController {
                 super.a(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::a);
         }
 
@@ -75,7 +74,6 @@ public class PigController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -89,7 +87,6 @@ public class PigController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.b(f, f1);
             }
-
         }
 
         @Override
@@ -101,7 +98,6 @@ public class PigController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -115,7 +111,6 @@ public class PigController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -126,7 +121,6 @@ public class PigController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -152,7 +146,6 @@ public class PigController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -161,7 +154,6 @@ public class PigController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -169,7 +161,6 @@ public class PigController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new PigNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -217,7 +208,6 @@ public class PigController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -232,7 +222,6 @@ public class PigController extends MobEntityController {
             if (npc == null) {
                 super.onLightningStrike(entitylightning);
             }
-
         }
     }
 
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PigZombieController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PigZombieController.java
index 35d0d78fe..13edfad41 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PigZombieController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PigZombieController.java
@@ -63,7 +63,6 @@ public class PigZombieController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -77,7 +76,6 @@ public class PigZombieController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.b(f, f1);
             }
-
         }
 
         @Override
@@ -89,7 +87,6 @@ public class PigZombieController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -103,7 +100,6 @@ public class PigZombieController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -114,7 +110,6 @@ public class PigZombieController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -134,7 +129,6 @@ public class PigZombieController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -143,7 +137,6 @@ public class PigZombieController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -151,7 +144,6 @@ public class PigZombieController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new PigZombieNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -199,7 +191,6 @@ public class PigZombieController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PillagerController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PillagerController.java
index b328e6105..e3cef52ab 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PillagerController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PillagerController.java
@@ -65,7 +65,6 @@ public class PillagerController extends MobEntityController {
                 super.a(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::a);
         }
 
@@ -74,7 +73,6 @@ public class PillagerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -88,7 +86,6 @@ public class PillagerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.b(f, f1);
             }
-
         }
 
         @Override
@@ -100,7 +97,6 @@ public class PillagerController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -114,7 +110,6 @@ public class PillagerController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -125,7 +120,6 @@ public class PillagerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -145,7 +139,6 @@ public class PillagerController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -154,7 +147,6 @@ public class PillagerController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -162,7 +154,6 @@ public class PillagerController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new PillagerNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -210,7 +201,6 @@ public class PillagerController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PolarBearController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PolarBearController.java
index 59ba2a351..1560d64d3 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PolarBearController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PolarBearController.java
@@ -63,7 +63,6 @@ public class PolarBearController extends MobEntityController {
                 super.a(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::a);
         }
 
@@ -82,7 +81,6 @@ public class PolarBearController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -96,7 +94,6 @@ public class PolarBearController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -107,7 +104,6 @@ public class PolarBearController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -126,7 +122,6 @@ public class PolarBearController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -134,7 +129,6 @@ public class PolarBearController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new PolarBearNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -174,7 +168,6 @@ public class PolarBearController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PufferFishController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PufferFishController.java
index 776f05507..94dc36bb0 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PufferFishController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PufferFishController.java
@@ -62,7 +62,6 @@ public class PufferFishController extends MobEntityController {
             if (npc != null) {
                 this.moveController = new ControllerMove(this);
             }
-
         }
 
         @Override
@@ -75,7 +74,6 @@ public class PufferFishController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -106,7 +104,6 @@ public class PufferFishController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.b(f, f1);
             }
-
         }
 
         @Override
@@ -118,7 +115,6 @@ public class PufferFishController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -132,7 +128,6 @@ public class PufferFishController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -143,7 +138,6 @@ public class PufferFishController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -162,11 +156,9 @@ public class PufferFishController extends MobEntityController {
                 if (!NMSImpl.moveFish(npc, this, vec3d)) {
                     super.e(vec3d);
                 }
-
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -175,7 +167,6 @@ public class PufferFishController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -183,7 +174,6 @@ public class PufferFishController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new PufferFishNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -231,7 +221,6 @@ public class PufferFishController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -242,13 +231,11 @@ public class PufferFishController extends MobEntityController {
                 this.y = false;
                 setPuffState(0);
             }
-
             super.movementTick();
             if (npc != null) {
                 this.y = lastInWater;
                 setPuffState(lastPuffState);
             }
-
         }
 
         @Override
@@ -263,12 +250,10 @@ public class PufferFishController extends MobEntityController {
             if (npc != null) {
                 NMSImpl.resetPuffTicks(this);
             }
-
             super.tick();
             if (npc != null && npc.hasTrait(PufferFishTrait.class)) {
                 setPuffState(npc.getOrAddTrait(PufferFishTrait.class).getPuffState());
             }
-
         }
 
         private static float s(int i) {
@@ -280,7 +265,6 @@ public class PufferFishController extends MobEntityController {
                 default:
                     return 1.0F;
             }
-
         }
     }
 
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/RabbitController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/RabbitController.java
index 157b717f7..53b628961 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/RabbitController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/RabbitController.java
@@ -66,7 +66,6 @@ public class RabbitController extends MobEntityController {
                 super.a(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::a);
         }
 
@@ -75,7 +74,6 @@ public class RabbitController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -89,7 +87,6 @@ public class RabbitController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.b(f, f1);
             }
-
         }
 
         @Override
@@ -101,7 +98,6 @@ public class RabbitController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -115,7 +111,6 @@ public class RabbitController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -126,7 +121,6 @@ public class RabbitController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -146,7 +140,6 @@ public class RabbitController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -155,7 +148,6 @@ public class RabbitController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -163,7 +155,6 @@ public class RabbitController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new RabbitNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -217,12 +208,10 @@ public class RabbitController extends MobEntityController {
                 if (npc.getNavigator().isNavigating()) {
                     NMS.setShouldJump(getBukkitEntity());
                 }
-
                 npc.update();
             } else {
                 super.mobTick();
             }
-
         }
 
         @Override
@@ -240,7 +229,6 @@ public class RabbitController extends MobEntityController {
                 this.datawatcher.set(NMSImpl.getRabbitTypeField(), i);
                 return;
             }
-
             super.setRabbitType(i);
         }
     }
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/RavagerController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/RavagerController.java
index ba607f5d8..c04a7314d 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/RavagerController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/RavagerController.java
@@ -65,7 +65,6 @@ public class RavagerController extends MobEntityController {
                 super.a(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::a);
         }
 
@@ -74,7 +73,6 @@ public class RavagerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -88,7 +86,6 @@ public class RavagerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.b(f, f1);
             }
-
         }
 
         @Override
@@ -100,7 +97,6 @@ public class RavagerController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -114,7 +110,6 @@ public class RavagerController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -125,7 +120,6 @@ public class RavagerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -145,7 +139,6 @@ public class RavagerController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -154,7 +147,6 @@ public class RavagerController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -162,7 +154,6 @@ public class RavagerController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new RavagerNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -210,7 +201,6 @@ public class RavagerController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SalmonController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SalmonController.java
index 2e22235c4..6f6097819 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SalmonController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SalmonController.java
@@ -59,7 +59,6 @@ public class SalmonController extends MobEntityController {
             if (npc != null) {
                 this.moveController = new ControllerMove(this);
             }
-
         }
 
         @Override
@@ -72,7 +71,6 @@ public class SalmonController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -96,7 +94,6 @@ public class SalmonController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.b(f, f1);
             }
-
         }
 
         @Override
@@ -108,7 +105,6 @@ public class SalmonController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -122,7 +118,6 @@ public class SalmonController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -133,7 +128,6 @@ public class SalmonController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -152,11 +146,9 @@ public class SalmonController extends MobEntityController {
                 if (!NMSImpl.moveFish(npc, this, vec3d)) {
                     super.e(vec3d);
                 }
-
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -165,7 +157,6 @@ public class SalmonController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -173,7 +164,6 @@ public class SalmonController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SalmonNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -220,12 +210,10 @@ public class SalmonController extends MobEntityController {
             if (npc != null) {
                 NMSImpl.setNotInSchool(this);
             }
-
             super.mobTick();
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -234,12 +222,10 @@ public class SalmonController extends MobEntityController {
             if (npc != null) {
                 this.y = false;
             }
-
             super.movementTick();
             if (npc != null) {
                 this.y = lastInWater;
             }
-
         }
 
         @Override
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SheepController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SheepController.java
index 31fbbbcf0..a5393535d 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SheepController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SheepController.java
@@ -65,7 +65,6 @@ public class SheepController extends MobEntityController {
                 super.a(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::a);
         }
 
@@ -74,7 +73,6 @@ public class SheepController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -88,7 +86,6 @@ public class SheepController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.b(f, f1);
             }
-
         }
 
         @Override
@@ -100,7 +97,6 @@ public class SheepController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -114,7 +110,6 @@ public class SheepController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -125,7 +120,6 @@ public class SheepController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -145,7 +139,6 @@ public class SheepController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -154,7 +147,6 @@ public class SheepController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -162,7 +154,6 @@ public class SheepController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SheepNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -210,7 +201,6 @@ public class SheepController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ShulkerController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ShulkerController.java
index b3d2acecb..727599738 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ShulkerController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ShulkerController.java
@@ -64,7 +64,6 @@ public class ShulkerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -78,7 +77,6 @@ public class ShulkerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.b(f, f1);
             }
-
         }
 
         @Override
@@ -90,7 +88,6 @@ public class ShulkerController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -104,7 +101,6 @@ public class ShulkerController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -115,7 +111,6 @@ public class ShulkerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -135,7 +130,6 @@ public class ShulkerController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -144,7 +138,6 @@ public class ShulkerController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -152,7 +145,6 @@ public class ShulkerController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ShulkerNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -199,7 +191,6 @@ public class ShulkerController extends MobEntityController {
             if (npc == null) {
                 super.movementTick();
             }
-
         }
 
         @Override
@@ -221,7 +212,6 @@ public class ShulkerController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -231,7 +221,6 @@ public class ShulkerController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, justCreated);
             }
-
         }
     }
 
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SilverfishController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SilverfishController.java
index 958229bfa..2eddbb76b 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SilverfishController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SilverfishController.java
@@ -63,7 +63,6 @@ public class SilverfishController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -77,7 +76,6 @@ public class SilverfishController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.b(f, f1);
             }
-
         }
 
         @Override
@@ -89,7 +87,6 @@ public class SilverfishController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -103,7 +100,6 @@ public class SilverfishController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -114,7 +110,6 @@ public class SilverfishController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -134,7 +129,6 @@ public class SilverfishController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -143,7 +137,6 @@ public class SilverfishController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -151,7 +144,6 @@ public class SilverfishController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SilverfishNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -199,7 +191,6 @@ public class SilverfishController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -216,7 +207,6 @@ public class SilverfishController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, justCreated);
             }
-
         }
     }
 
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SkeletonController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SkeletonController.java
index b37a58c64..8d0d73297 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SkeletonController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SkeletonController.java
@@ -63,7 +63,6 @@ public class SkeletonController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -77,7 +76,6 @@ public class SkeletonController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.b(f, f1);
             }
-
         }
 
         @Override
@@ -89,7 +87,6 @@ public class SkeletonController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -103,7 +100,6 @@ public class SkeletonController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -114,7 +110,6 @@ public class SkeletonController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -134,7 +129,6 @@ public class SkeletonController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -143,7 +137,6 @@ public class SkeletonController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -151,7 +144,6 @@ public class SkeletonController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SkeletonNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -199,7 +191,6 @@ public class SkeletonController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -216,7 +207,6 @@ public class SkeletonController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, justCreated);
             }
-
         }
     }
 
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SkeletonStrayController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SkeletonStrayController.java
index 6d6fb69dd..164877de6 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SkeletonStrayController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SkeletonStrayController.java
@@ -63,7 +63,6 @@ public class SkeletonStrayController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -77,7 +76,6 @@ public class SkeletonStrayController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.b(f, f1);
             }
-
         }
 
         @Override
@@ -89,7 +87,6 @@ public class SkeletonStrayController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -103,7 +100,6 @@ public class SkeletonStrayController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -114,7 +110,6 @@ public class SkeletonStrayController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -134,7 +129,6 @@ public class SkeletonStrayController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -143,7 +137,6 @@ public class SkeletonStrayController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -151,7 +144,6 @@ public class SkeletonStrayController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new StrayNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -199,7 +191,6 @@ public class SkeletonStrayController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -216,7 +207,6 @@ public class SkeletonStrayController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, justCreated);
             }
-
         }
     }
 
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SkeletonWitherController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SkeletonWitherController.java
index a89c21b87..1bcf48a69 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SkeletonWitherController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SkeletonWitherController.java
@@ -63,7 +63,6 @@ public class SkeletonWitherController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -77,7 +76,6 @@ public class SkeletonWitherController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.b(f, f1);
             }
-
         }
 
         @Override
@@ -89,7 +87,6 @@ public class SkeletonWitherController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -103,7 +100,6 @@ public class SkeletonWitherController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -114,7 +110,6 @@ public class SkeletonWitherController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -134,7 +129,6 @@ public class SkeletonWitherController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -143,7 +137,6 @@ public class SkeletonWitherController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -151,7 +144,6 @@ public class SkeletonWitherController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SkeletonWitherNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -199,7 +191,6 @@ public class SkeletonWitherController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -216,7 +207,6 @@ public class SkeletonWitherController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, justCreated);
             }
-
         }
     }
 
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SlimeController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SlimeController.java
index 9f48c417a..a203077ee 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SlimeController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SlimeController.java
@@ -57,7 +57,6 @@ public class SlimeController extends MobEntityController {
                 setSize(3, true);
                 this.moveController = new PlayerControllerMove(this);
             }
-
         }
 
         @Override
@@ -70,7 +69,6 @@ public class SlimeController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -84,7 +82,6 @@ public class SlimeController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.b(f, f1);
             }
-
         }
 
         @Override
@@ -96,7 +93,6 @@ public class SlimeController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -110,7 +106,6 @@ public class SlimeController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -121,7 +116,6 @@ public class SlimeController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -141,7 +135,6 @@ public class SlimeController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -150,7 +143,6 @@ public class SlimeController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -158,7 +150,6 @@ public class SlimeController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SlimeNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -212,7 +203,6 @@ public class SlimeController extends MobEntityController {
             if (npc == null) {
                 super.pickup(human);
             }
-
         }
 
         @Override
@@ -221,7 +211,6 @@ public class SlimeController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -231,7 +220,6 @@ public class SlimeController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, justCreated);
             }
-
         }
     }
 
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SnowmanController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SnowmanController.java
index afb47302e..bab8ef22d 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SnowmanController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SnowmanController.java
@@ -63,7 +63,6 @@ public class SnowmanController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -77,7 +76,6 @@ public class SnowmanController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.b(f, f1);
             }
-
         }
 
         @Override
@@ -89,7 +87,6 @@ public class SnowmanController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -103,7 +100,6 @@ public class SnowmanController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -114,7 +110,6 @@ public class SnowmanController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -134,7 +129,6 @@ public class SnowmanController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -143,7 +137,6 @@ public class SnowmanController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -151,7 +144,6 @@ public class SnowmanController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SnowmanNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -199,7 +191,6 @@ public class SnowmanController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -216,7 +207,6 @@ public class SnowmanController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, justCreated);
             }
-
         }
     }
 
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SpiderController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SpiderController.java
index 75623e980..1901f5345 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SpiderController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SpiderController.java
@@ -63,7 +63,6 @@ public class SpiderController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -77,7 +76,6 @@ public class SpiderController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.b(f, f1);
             }
-
         }
 
         @Override
@@ -89,7 +87,6 @@ public class SpiderController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -103,7 +100,6 @@ public class SpiderController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -114,7 +110,6 @@ public class SpiderController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -134,7 +129,6 @@ public class SpiderController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -143,7 +137,6 @@ public class SpiderController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -151,7 +144,6 @@ public class SpiderController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SpiderNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -199,7 +191,6 @@ public class SpiderController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -216,7 +207,6 @@ public class SpiderController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, justCreated);
             }
-
         }
     }
 
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SquidController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SquidController.java
index ecbb238e7..3068b6a86 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SquidController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/SquidController.java
@@ -63,7 +63,6 @@ public class SquidController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -77,7 +76,6 @@ public class SquidController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.b(f, f1);
             }
-
         }
 
         @Override
@@ -89,7 +87,6 @@ public class SquidController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -103,7 +100,6 @@ public class SquidController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -114,7 +110,6 @@ public class SquidController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -134,7 +129,6 @@ public class SquidController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -143,7 +137,6 @@ public class SquidController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -151,7 +144,6 @@ public class SquidController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SquidNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -199,7 +191,6 @@ public class SquidController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -216,7 +207,6 @@ public class SquidController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, justCreated);
             }
-
         }
     }
 
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/TraderLlamaController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/TraderLlamaController.java
index 4c6af4c17..2fb6c8337 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/TraderLlamaController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/TraderLlamaController.java
@@ -66,7 +66,6 @@ public class TraderLlamaController extends MobEntityController {
                 ((TraderLlama) getBukkitEntity())
                         .setDomestication(((TraderLlama) getBukkitEntity()).getMaxDomestication());
             }
-
         }
 
         @Override
@@ -80,7 +79,6 @@ public class TraderLlamaController extends MobEntityController {
                 super.a(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::a);
         }
 
@@ -89,7 +87,6 @@ public class TraderLlamaController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -103,7 +100,6 @@ public class TraderLlamaController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.b(f, f1);
             }
-
         }
 
         @Override
@@ -115,7 +111,6 @@ public class TraderLlamaController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -129,7 +124,6 @@ public class TraderLlamaController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -140,7 +134,6 @@ public class TraderLlamaController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -160,7 +153,6 @@ public class TraderLlamaController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -169,7 +161,6 @@ public class TraderLlamaController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -177,7 +168,6 @@ public class TraderLlamaController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new TraderLlamaNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -228,14 +218,11 @@ public class TraderLlamaController extends MobEntityController {
                     if (bI != null) {
                         bI.invoke(this, 10); // DespawnDelay
                     }
-
                 } catch (Throwable e) {
                 }
-
                 NMS.setStepHeight(getBukkitEntity(), 1);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/TropicalFishController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/TropicalFishController.java
index 8fd423c66..a2e4d5a92 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/TropicalFishController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/TropicalFishController.java
@@ -59,7 +59,6 @@ public class TropicalFishController extends MobEntityController {
             if (npc != null) {
                 this.moveController = new ControllerMove(this);
             }
-
         }
 
         @Override
@@ -72,7 +71,6 @@ public class TropicalFishController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -96,7 +94,6 @@ public class TropicalFishController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.b(f, f1);
             }
-
         }
 
         @Override
@@ -108,7 +105,6 @@ public class TropicalFishController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -122,7 +118,6 @@ public class TropicalFishController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -133,7 +128,6 @@ public class TropicalFishController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -152,11 +146,9 @@ public class TropicalFishController extends MobEntityController {
                 if (!NMSImpl.moveFish(npc, this, vec3d)) {
                     super.e(vec3d);
                 }
-
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -165,7 +157,6 @@ public class TropicalFishController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -173,7 +164,6 @@ public class TropicalFishController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new TropicalFishNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -220,12 +210,10 @@ public class TropicalFishController extends MobEntityController {
             if (npc != null) {
                 NMSImpl.setNotInSchool(this);
             }
-
             super.mobTick();
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -234,12 +222,10 @@ public class TropicalFishController extends MobEntityController {
             if (npc != null) {
                 this.y = false;
             }
-
             super.movementTick();
             if (npc != null) {
                 this.y = lastInWater;
             }
-
         }
 
         @Override
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/TurtleController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/TurtleController.java
index bfe8ef0be..3bb3e3259 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/TurtleController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/TurtleController.java
@@ -58,7 +58,6 @@ public class TurtleController extends MobEntityController {
                 this.moveController = new ControllerMove(this);
                 this.bt = new EmptyControllerJump(this);
             }
-
         }
 
         @Override
@@ -71,7 +70,6 @@ public class TurtleController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -85,7 +83,6 @@ public class TurtleController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.b(f, f1);
             }
-
         }
 
         @Override
@@ -97,7 +94,6 @@ public class TurtleController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -111,7 +107,6 @@ public class TurtleController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -122,7 +117,6 @@ public class TurtleController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -141,11 +135,9 @@ public class TurtleController extends MobEntityController {
                 if (!NMSImpl.moveFish(npc, this, vec3d)) {
                     super.e(vec3d);
                 }
-
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -154,7 +146,6 @@ public class TurtleController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -162,7 +153,6 @@ public class TurtleController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new TurtleNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -210,7 +200,6 @@ public class TurtleController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/VexController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/VexController.java
index 0953f2815..d29b48441 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/VexController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/VexController.java
@@ -52,7 +52,6 @@ public class VexController extends MobEntityController {
             if (npc != null) {
                 setNoGravity(true);
             }
-
         }
 
         @Override
@@ -75,7 +74,6 @@ public class VexController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -89,7 +87,6 @@ public class VexController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -100,7 +97,6 @@ public class VexController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -119,7 +115,6 @@ public class VexController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -127,7 +122,6 @@ public class VexController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new VexNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -166,7 +160,6 @@ public class VexController extends MobEntityController {
             if (super.isLeashed()) {
                 unleash(true, false); // clearLeash with client update
             }
-
             return false; // shouldLeash
         }
 
@@ -176,7 +169,6 @@ public class VexController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/VillagerController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/VillagerController.java
index 8056750b7..d5cec3088 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/VillagerController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/VillagerController.java
@@ -79,7 +79,6 @@ public class VillagerController extends MobEntityController {
                 super.a(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::a);
         }
 
@@ -88,7 +87,6 @@ public class VillagerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -105,9 +103,7 @@ public class VillagerController extends MobEntityController {
                 if (list != null) {
                     list.clear();
                 }
-
             }
-
             return super.a(entityhuman, enumhand);
         }
 
@@ -116,7 +112,6 @@ public class VillagerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.b(f, f1);
             }
-
         }
 
         @Override
@@ -128,7 +123,6 @@ public class VillagerController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -142,7 +136,6 @@ public class VillagerController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -153,7 +146,6 @@ public class VillagerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -172,7 +164,6 @@ public class VillagerController extends MobEntityController {
                 blockingATrade = false;
                 return true;
             }
-
             return super.dY();
         }
 
@@ -183,7 +174,6 @@ public class VillagerController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -192,7 +182,6 @@ public class VillagerController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -200,7 +189,6 @@ public class VillagerController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new VillagerNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -249,19 +237,15 @@ public class VillagerController extends MobEntityController {
                     this.behaviorMap = NMSImpl.getBehaviorMap(this);
                     this.previousBehaviorController = this.getBehaviorController();
                 }
-
                 if (this.behaviorMap.size() > 0) {
                     this.behaviorMap.clear();
                     NMSImpl.clearGoals(goalSelector, targetSelector);
                 }
-
             }
-
             super.mobTick();
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -276,7 +260,6 @@ public class VillagerController extends MobEntityController {
             if (npc == null) {
                 super.onLightningStrike(entitylightning);
             }
-
         }
     }
 
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/VindicatorController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/VindicatorController.java
index 26315cbcf..4e017df0d 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/VindicatorController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/VindicatorController.java
@@ -65,7 +65,6 @@ public class VindicatorController extends MobEntityController {
                 super.a(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::a);
         }
 
@@ -74,7 +73,6 @@ public class VindicatorController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -88,7 +86,6 @@ public class VindicatorController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.b(f, f1);
             }
-
         }
 
         @Override
@@ -100,7 +97,6 @@ public class VindicatorController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -114,7 +110,6 @@ public class VindicatorController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -125,7 +120,6 @@ public class VindicatorController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -145,7 +139,6 @@ public class VindicatorController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -154,7 +147,6 @@ public class VindicatorController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -162,7 +154,6 @@ public class VindicatorController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new VindicatorNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -210,7 +201,6 @@ public class VindicatorController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WanderingTraderController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WanderingTraderController.java
index 16ca96982..e3bb6f395 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WanderingTraderController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WanderingTraderController.java
@@ -79,7 +79,6 @@ public class WanderingTraderController extends MobEntityController {
                 super.a(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::a);
         }
 
@@ -88,7 +87,6 @@ public class WanderingTraderController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -105,9 +103,7 @@ public class WanderingTraderController extends MobEntityController {
                 if (list != null) {
                     list.clear();
                 }
-
             }
-
             return super.a(entityhuman, enumhand);
         }
 
@@ -116,7 +112,6 @@ public class WanderingTraderController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.b(f, f1);
             }
-
         }
 
         @Override
@@ -128,7 +123,6 @@ public class WanderingTraderController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -142,7 +136,6 @@ public class WanderingTraderController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -153,7 +146,6 @@ public class WanderingTraderController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -172,7 +164,6 @@ public class WanderingTraderController extends MobEntityController {
                 blockingATrade = false;
                 return true;
             }
-
             return super.dY();
         }
 
@@ -183,7 +174,6 @@ public class WanderingTraderController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -192,7 +182,6 @@ public class WanderingTraderController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -200,7 +189,6 @@ public class WanderingTraderController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new WanderingTraderNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -252,26 +240,20 @@ public class WanderingTraderController extends MobEntityController {
                 if (this.behaviorMap == null) {
                     this.behaviorMap = NMSImpl.getBehaviorMap(this);
                 }
-
                 if (this.behaviorMap.size() > 0) {
                     this.behaviorMap.clear();
                 }
-
             }
-
             super.mobTick();
             if (npc != null) {
                 try {
                     if (bB != null) {
                         bB.invoke(this, 10); // DespawnDelay
                     }
-
                 } catch (Throwable e) {
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
@@ -286,7 +268,6 @@ public class WanderingTraderController extends MobEntityController {
             if (npc == null) {
                 super.onLightningStrike(entitylightning);
             }
-
         }
 
         public void setBlockTrades(boolean blocked) {
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WitchController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WitchController.java
index 6081aac8a..0da210782 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WitchController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WitchController.java
@@ -63,7 +63,6 @@ public class WitchController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -77,7 +76,6 @@ public class WitchController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.b(f, f1);
             }
-
         }
 
         @Override
@@ -89,7 +87,6 @@ public class WitchController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -103,7 +100,6 @@ public class WitchController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -114,7 +110,6 @@ public class WitchController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -134,7 +129,6 @@ public class WitchController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -143,7 +137,6 @@ public class WitchController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -151,7 +144,6 @@ public class WitchController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new WitchNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -199,7 +191,6 @@ public class WitchController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -216,7 +207,6 @@ public class WitchController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, justCreated);
             }
-
         }
     }
 
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WitherController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WitherController.java
index a06f5e0b9..df6638956 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WitherController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WitherController.java
@@ -71,7 +71,6 @@ public class WitherController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -85,7 +84,6 @@ public class WitherController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -96,7 +94,6 @@ public class WitherController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -121,7 +118,6 @@ public class WitherController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -129,7 +125,6 @@ public class WitherController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new WitherNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -175,7 +170,6 @@ public class WitherController extends MobEntityController {
             } else {
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WolfController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WolfController.java
index 1e59b9466..9ef35c02b 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WolfController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/WolfController.java
@@ -67,7 +67,6 @@ public class WolfController extends MobEntityController {
                 super.a(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::a);
         }
 
@@ -76,7 +75,6 @@ public class WolfController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -90,7 +88,6 @@ public class WolfController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.b(f, f1);
             }
-
         }
 
         @Override
@@ -102,7 +99,6 @@ public class WolfController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -116,7 +112,6 @@ public class WolfController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -127,7 +122,6 @@ public class WolfController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -147,7 +141,6 @@ public class WolfController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -156,7 +149,6 @@ public class WolfController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -164,7 +156,6 @@ public class WolfController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new WolfNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -212,7 +203,6 @@ public class WolfController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ZombieController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ZombieController.java
index 344a327fa..252d0ee39 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ZombieController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ZombieController.java
@@ -63,7 +63,6 @@ public class ZombieController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -77,7 +76,6 @@ public class ZombieController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.b(f, f1);
             }
-
         }
 
         @Override
@@ -89,7 +87,6 @@ public class ZombieController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -103,7 +100,6 @@ public class ZombieController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -114,7 +110,6 @@ public class ZombieController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -134,7 +129,6 @@ public class ZombieController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -143,7 +137,6 @@ public class ZombieController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -151,7 +144,6 @@ public class ZombieController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ZombieNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -199,7 +191,6 @@ public class ZombieController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ZombieHuskController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ZombieHuskController.java
index ff11cd1ae..1e2623cf6 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ZombieHuskController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ZombieHuskController.java
@@ -63,7 +63,6 @@ public class ZombieHuskController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -77,7 +76,6 @@ public class ZombieHuskController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.b(f, f1);
             }
-
         }
 
         @Override
@@ -89,7 +87,6 @@ public class ZombieHuskController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -103,7 +100,6 @@ public class ZombieHuskController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -114,7 +110,6 @@ public class ZombieHuskController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -134,7 +129,6 @@ public class ZombieHuskController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -143,7 +137,6 @@ public class ZombieHuskController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -151,7 +144,6 @@ public class ZombieHuskController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ZombieHuskNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -199,7 +191,6 @@ public class ZombieHuskController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ZombieVillagerController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ZombieVillagerController.java
index f902977a9..f6acbfc1e 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ZombieVillagerController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ZombieVillagerController.java
@@ -63,7 +63,6 @@ public class ZombieVillagerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -77,7 +76,6 @@ public class ZombieVillagerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.b(f, f1);
             }
-
         }
 
         @Override
@@ -89,7 +87,6 @@ public class ZombieVillagerController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -103,7 +100,6 @@ public class ZombieVillagerController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -114,7 +110,6 @@ public class ZombieVillagerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -134,7 +129,6 @@ public class ZombieVillagerController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -143,7 +137,6 @@ public class ZombieVillagerController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -151,7 +144,6 @@ public class ZombieVillagerController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ZombieVillagerNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -199,7 +191,6 @@ public class ZombieVillagerController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/AreaEffectCloudController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/AreaEffectCloudController.java
index 9cf50a59f..d08133066 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/AreaEffectCloudController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/AreaEffectCloudController.java
@@ -74,7 +74,6 @@ public class AreaEffectCloudController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -86,7 +85,6 @@ public class AreaEffectCloudController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -100,7 +98,6 @@ public class AreaEffectCloudController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -108,7 +105,6 @@ public class AreaEffectCloudController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new AreaEffectCloudNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -129,7 +125,6 @@ public class AreaEffectCloudController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
     }
 }
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/BoatController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/BoatController.java
index 608a48098..4b1b1bc82 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/BoatController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/BoatController.java
@@ -74,7 +74,6 @@ public class BoatController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -86,7 +85,6 @@ public class BoatController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -100,7 +98,6 @@ public class BoatController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -108,7 +105,6 @@ public class BoatController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new BoatNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -129,7 +125,6 @@ public class BoatController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -139,7 +134,6 @@ public class BoatController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, justCreated);
             }
-
         }
     }
 }
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/DragonFireballController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/DragonFireballController.java
index 0892feaa4..96ad93613 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/DragonFireballController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/DragonFireballController.java
@@ -74,7 +74,6 @@ public class DragonFireballController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -86,7 +85,6 @@ public class DragonFireballController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -100,7 +98,6 @@ public class DragonFireballController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -108,7 +105,6 @@ public class DragonFireballController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new DragonFireballNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -129,11 +125,9 @@ public class DragonFireballController extends MobEntityController {
                 if (!npc.isProtected()) {
                     super.tick();
                 }
-
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -143,7 +137,6 @@ public class DragonFireballController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, justCreated);
             }
-
         }
     }
 }
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/EggController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/EggController.java
index 87fd954b5..39f2ae862 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/EggController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/EggController.java
@@ -90,7 +90,6 @@ public class EggController extends AbstractEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -102,7 +101,6 @@ public class EggController extends AbstractEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -116,7 +114,6 @@ public class EggController extends AbstractEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -124,7 +121,6 @@ public class EggController extends AbstractEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new EggNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -145,11 +141,9 @@ public class EggController extends AbstractEntityController {
                 if (!npc.isProtected()) {
                     super.tick();
                 }
-
             } else {
                 super.tick();
             }
-
         }
     }
 }
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/EnderCrystalController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/EnderCrystalController.java
index 038613325..4d1652bdb 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/EnderCrystalController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/EnderCrystalController.java
@@ -74,7 +74,6 @@ public class EnderCrystalController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -86,7 +85,6 @@ public class EnderCrystalController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -100,7 +98,6 @@ public class EnderCrystalController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -108,7 +105,6 @@ public class EnderCrystalController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new EnderCrystalNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -129,7 +125,6 @@ public class EnderCrystalController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
     }
 }
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/EnderPearlController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/EnderPearlController.java
index 5a915bbb9..e01e5c887 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/EnderPearlController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/EnderPearlController.java
@@ -74,7 +74,6 @@ public class EnderPearlController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -86,7 +85,6 @@ public class EnderPearlController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -100,7 +98,6 @@ public class EnderPearlController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -108,7 +105,6 @@ public class EnderPearlController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new EnderPearlNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -129,11 +125,9 @@ public class EnderPearlController extends MobEntityController {
                 if (!npc.isProtected()) {
                     super.tick();
                 }
-
             } else {
                 super.tick();
             }
-
         }
     }
 }
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/EnderSignalController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/EnderSignalController.java
index 4dcf125ce..0193b6cbb 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/EnderSignalController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/EnderSignalController.java
@@ -74,7 +74,6 @@ public class EnderSignalController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -86,7 +85,6 @@ public class EnderSignalController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -100,7 +98,6 @@ public class EnderSignalController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -108,7 +105,6 @@ public class EnderSignalController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new EnderSignalNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -129,7 +125,6 @@ public class EnderSignalController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
     }
 }
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/EvokerFangsController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/EvokerFangsController.java
index 562599500..cbf646abf 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/EvokerFangsController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/EvokerFangsController.java
@@ -75,7 +75,6 @@ public class EvokerFangsController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -87,7 +86,6 @@ public class EvokerFangsController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -101,7 +99,6 @@ public class EvokerFangsController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -109,7 +106,6 @@ public class EvokerFangsController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new EvokerFangsNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -129,7 +125,6 @@ public class EvokerFangsController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
     }
 
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ExperienceOrbController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ExperienceOrbController.java
index ff4c36dba..5839c4f4b 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ExperienceOrbController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ExperienceOrbController.java
@@ -60,7 +60,6 @@ public class ExperienceOrbController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -72,7 +71,6 @@ public class ExperienceOrbController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -86,7 +84,6 @@ public class ExperienceOrbController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -94,7 +91,6 @@ public class ExperienceOrbController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ExperienceOrbNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -115,7 +111,6 @@ public class ExperienceOrbController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
     }
 
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/FallingBlockController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/FallingBlockController.java
index 033cf1985..a67ab70c4 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/FallingBlockController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/FallingBlockController.java
@@ -82,7 +82,6 @@ public class FallingBlockController extends AbstractEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -94,7 +93,6 @@ public class FallingBlockController extends AbstractEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -108,7 +106,6 @@ public class FallingBlockController extends AbstractEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -116,7 +113,6 @@ public class FallingBlockController extends AbstractEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new FallingBlockNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -141,11 +137,9 @@ public class FallingBlockController extends AbstractEntityController {
                     setMot(mot);
                     move(EnumMoveType.SELF, mot);
                 }
-
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -155,7 +149,6 @@ public class FallingBlockController extends AbstractEntityController {
             } else {
                 NMSImpl.setSize(this, justCreated);
             }
-
         }
 
         private static final double EPSILON = 0.001;
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/FireworkController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/FireworkController.java
index 844cd1444..2f8626f36 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/FireworkController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/FireworkController.java
@@ -60,7 +60,6 @@ public class FireworkController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -72,7 +71,6 @@ public class FireworkController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -86,7 +84,6 @@ public class FireworkController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -94,7 +91,6 @@ public class FireworkController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new FireworkNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -115,7 +111,6 @@ public class FireworkController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
     }
 
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/FishingHookController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/FishingHookController.java
index f74e69aa2..321d72c9f 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/FishingHookController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/FishingHookController.java
@@ -74,7 +74,6 @@ public class FishingHookController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -86,7 +85,6 @@ public class FishingHookController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -100,7 +98,6 @@ public class FishingHookController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -108,7 +105,6 @@ public class FishingHookController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new FishingHookNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -144,12 +140,10 @@ public class FishingHookController extends MobEntityController {
                 } catch (IllegalAccessException e) {
                     e.printStackTrace();
                 }
-
                 npc.update();
             } else {
                 super.tick();
             }
-
         }
     }
 
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ItemController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ItemController.java
index 3f9d88bc7..178842e7d 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ItemController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ItemController.java
@@ -73,7 +73,6 @@ public class ItemController extends AbstractEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -85,7 +84,6 @@ public class ItemController extends AbstractEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -99,7 +97,6 @@ public class ItemController extends AbstractEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -107,7 +104,6 @@ public class ItemController extends AbstractEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ItemNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -126,7 +122,6 @@ public class ItemController extends AbstractEntityController {
             if (npc == null) {
                 super.pickup(entityhuman);
             }
-
         }
 
         @Override
@@ -136,7 +131,6 @@ public class ItemController extends AbstractEntityController {
             } else {
                 super.tick();
             }
-
         }
     }
 
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ItemFrameController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ItemFrameController.java
index d371cb746..fda9e2e0b 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ItemFrameController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ItemFrameController.java
@@ -73,7 +73,6 @@ public class ItemFrameController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -85,7 +84,6 @@ public class ItemFrameController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -99,7 +97,6 @@ public class ItemFrameController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -107,7 +104,6 @@ public class ItemFrameController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ItemFrameNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -133,7 +129,6 @@ public class ItemFrameController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
     }
 
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/LargeFireballController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/LargeFireballController.java
index 9483817b1..6c41b610b 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/LargeFireballController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/LargeFireballController.java
@@ -60,7 +60,6 @@ public class LargeFireballController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -72,7 +71,6 @@ public class LargeFireballController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -86,7 +84,6 @@ public class LargeFireballController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -94,7 +91,6 @@ public class LargeFireballController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new LargeFireballNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -115,11 +111,9 @@ public class LargeFireballController extends MobEntityController {
                 if (!npc.isProtected()) {
                     super.tick();
                 }
-
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -129,7 +123,6 @@ public class LargeFireballController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, justCreated);
             }
-
         }
     }
 
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/LeashController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/LeashController.java
index 16f5dff98..efb541e45 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/LeashController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/LeashController.java
@@ -60,7 +60,6 @@ public class LeashController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -72,7 +71,6 @@ public class LeashController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -86,7 +84,6 @@ public class LeashController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -94,7 +91,6 @@ public class LeashController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new LeashNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -120,7 +116,6 @@ public class LeashController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
     }
 
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/LlamaSpitController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/LlamaSpitController.java
index b871b5342..02d1c7c96 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/LlamaSpitController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/LlamaSpitController.java
@@ -79,7 +79,6 @@ public class LlamaSpitController extends AbstractEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -91,7 +90,6 @@ public class LlamaSpitController extends AbstractEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -105,7 +103,6 @@ public class LlamaSpitController extends AbstractEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -113,7 +110,6 @@ public class LlamaSpitController extends AbstractEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new LlamaSpitNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -134,11 +130,9 @@ public class LlamaSpitController extends AbstractEntityController {
                 if (!npc.isProtected()) {
                     super.tick();
                 }
-
             } else {
                 super.tick();
             }
-
         }
     }
 
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartChestController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartChestController.java
index 034707afd..e8166610a 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartChestController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartChestController.java
@@ -60,7 +60,6 @@ public class MinecartChestController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -72,7 +71,6 @@ public class MinecartChestController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -86,7 +84,6 @@ public class MinecartChestController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -94,7 +91,6 @@ public class MinecartChestController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new MinecartChestNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -115,7 +111,6 @@ public class MinecartChestController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
     }
 
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartCommandController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartCommandController.java
index 603ec86b9..95d465d32 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartCommandController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartCommandController.java
@@ -60,7 +60,6 @@ public class MinecartCommandController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -72,7 +71,6 @@ public class MinecartCommandController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -86,7 +84,6 @@ public class MinecartCommandController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -94,7 +91,6 @@ public class MinecartCommandController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new MinecartCommandNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -115,7 +111,6 @@ public class MinecartCommandController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
     }
 
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartFurnaceController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartFurnaceController.java
index c0bc51c54..cb32f82b4 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartFurnaceController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartFurnaceController.java
@@ -60,7 +60,6 @@ public class MinecartFurnaceController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -72,7 +71,6 @@ public class MinecartFurnaceController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -86,7 +84,6 @@ public class MinecartFurnaceController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -94,7 +91,6 @@ public class MinecartFurnaceController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new MinecartFurnaceNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -115,7 +111,6 @@ public class MinecartFurnaceController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
     }
 
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartHopperController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartHopperController.java
index ade2464e5..475cdcec1 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartHopperController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartHopperController.java
@@ -56,7 +56,6 @@ public class MinecartHopperController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -68,7 +67,6 @@ public class MinecartHopperController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -82,7 +80,6 @@ public class MinecartHopperController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -102,7 +99,6 @@ public class MinecartHopperController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
     }
 }
\ No newline at end of file
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartRideableController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartRideableController.java
index 9d58d6e9c..8320dec35 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartRideableController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartRideableController.java
@@ -60,7 +60,6 @@ public class MinecartRideableController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -72,7 +71,6 @@ public class MinecartRideableController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -86,7 +84,6 @@ public class MinecartRideableController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -94,7 +91,6 @@ public class MinecartRideableController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new MinecartRideableNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -115,7 +111,6 @@ public class MinecartRideableController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
     }
 
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartSpawnerController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartSpawnerController.java
index 56dbb5477..d48543189 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartSpawnerController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartSpawnerController.java
@@ -56,7 +56,6 @@ public class MinecartSpawnerController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -68,7 +67,6 @@ public class MinecartSpawnerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -82,7 +80,6 @@ public class MinecartSpawnerController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -102,7 +99,6 @@ public class MinecartSpawnerController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
     }
 }
\ No newline at end of file
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartTNTController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartTNTController.java
index 92153dc73..a5e45c450 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartTNTController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/MinecartTNTController.java
@@ -56,7 +56,6 @@ public class MinecartTNTController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -68,7 +67,6 @@ public class MinecartTNTController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -82,7 +80,6 @@ public class MinecartTNTController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -102,7 +99,6 @@ public class MinecartTNTController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
     }
 }
\ No newline at end of file
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/PaintingController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/PaintingController.java
index 84b9d19ef..d2de2e140 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/PaintingController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/PaintingController.java
@@ -60,7 +60,6 @@ public class PaintingController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -72,7 +71,6 @@ public class PaintingController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -86,7 +84,6 @@ public class PaintingController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -94,7 +91,6 @@ public class PaintingController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new PaintingNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -120,7 +116,6 @@ public class PaintingController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
     }
 
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ShulkerBulletController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ShulkerBulletController.java
index 912825348..89b2daea6 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ShulkerBulletController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ShulkerBulletController.java
@@ -60,7 +60,6 @@ public class ShulkerBulletController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -72,7 +71,6 @@ public class ShulkerBulletController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -86,7 +84,6 @@ public class ShulkerBulletController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -94,7 +91,6 @@ public class ShulkerBulletController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ShulkerBulletNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -115,7 +111,6 @@ public class ShulkerBulletController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
     }
 
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/SmallFireballController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/SmallFireballController.java
index ec2bdadc8..17a5454fe 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/SmallFireballController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/SmallFireballController.java
@@ -60,7 +60,6 @@ public class SmallFireballController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -72,7 +71,6 @@ public class SmallFireballController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -86,7 +84,6 @@ public class SmallFireballController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -94,7 +91,6 @@ public class SmallFireballController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SmallFireballNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -115,11 +111,9 @@ public class SmallFireballController extends MobEntityController {
                 if (!npc.isProtected()) {
                     super.tick();
                 }
-
             } else {
                 super.tick();
             }
-
         }
     }
 
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/SnowballController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/SnowballController.java
index 2e6e3bd26..9396e0758 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/SnowballController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/SnowballController.java
@@ -60,7 +60,6 @@ public class SnowballController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -72,7 +71,6 @@ public class SnowballController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -86,7 +84,6 @@ public class SnowballController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -94,7 +91,6 @@ public class SnowballController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SnowballNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -115,7 +111,6 @@ public class SnowballController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
     }
 
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/SpectralArrowController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/SpectralArrowController.java
index 0f20d5fcb..0de9f824d 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/SpectralArrowController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/SpectralArrowController.java
@@ -60,7 +60,6 @@ public class SpectralArrowController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -72,7 +71,6 @@ public class SpectralArrowController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -86,7 +84,6 @@ public class SpectralArrowController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -94,7 +91,6 @@ public class SpectralArrowController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SpectralArrowNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -115,7 +111,6 @@ public class SpectralArrowController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
     }
 
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/TNTPrimedController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/TNTPrimedController.java
index 5a5bd83cd..10a64f79d 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/TNTPrimedController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/TNTPrimedController.java
@@ -60,7 +60,6 @@ public class TNTPrimedController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -72,7 +71,6 @@ public class TNTPrimedController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -86,7 +84,6 @@ public class TNTPrimedController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -94,7 +91,6 @@ public class TNTPrimedController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new TNTPrimedNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -115,7 +111,6 @@ public class TNTPrimedController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
     }
 
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ThrownExpBottleController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ThrownExpBottleController.java
index 6ffc93126..c6e11cd82 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ThrownExpBottleController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ThrownExpBottleController.java
@@ -60,7 +60,6 @@ public class ThrownExpBottleController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -72,7 +71,6 @@ public class ThrownExpBottleController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -86,7 +84,6 @@ public class ThrownExpBottleController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -94,7 +91,6 @@ public class ThrownExpBottleController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ThrownExpBottleNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -115,11 +111,9 @@ public class ThrownExpBottleController extends MobEntityController {
                 if (!npc.isProtected()) {
                     super.tick();
                 }
-
             } else {
                 super.tick();
             }
-
         }
     }
 
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ThrownPotionController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ThrownPotionController.java
index 67c2a7209..6fa7bdf57 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ThrownPotionController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ThrownPotionController.java
@@ -61,7 +61,6 @@ public class ThrownPotionController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -73,7 +72,6 @@ public class ThrownPotionController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -87,7 +85,6 @@ public class ThrownPotionController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -98,9 +95,7 @@ public class ThrownPotionController extends MobEntityController {
                 } else {
                     NMSImpl.setBukkitEntity(this, new SplashThrownPotionNPC(this));
                 }
-
             }
-
             return super.getBukkitEntity();
         }
 
@@ -121,7 +116,6 @@ public class ThrownPotionController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
     }
 
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ThrownTridentController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ThrownTridentController.java
index 636a62553..7aa2931b0 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ThrownTridentController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/ThrownTridentController.java
@@ -60,7 +60,6 @@ public class ThrownTridentController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -72,7 +71,6 @@ public class ThrownTridentController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -86,7 +84,6 @@ public class ThrownTridentController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -94,7 +91,6 @@ public class ThrownTridentController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ThrownTridentNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -115,7 +111,6 @@ public class ThrownTridentController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
     }
 
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/TippedArrowController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/TippedArrowController.java
index 4cc43b6c4..986c1a4e2 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/TippedArrowController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/TippedArrowController.java
@@ -60,7 +60,6 @@ public class TippedArrowController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -72,7 +71,6 @@ public class TippedArrowController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -86,7 +84,6 @@ public class TippedArrowController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -94,7 +91,6 @@ public class TippedArrowController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new TippedArrowNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -115,7 +111,6 @@ public class TippedArrowController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
     }
 
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/WitherSkullController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/WitherSkullController.java
index 2a163871a..60b3ac531 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/WitherSkullController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/nonliving/WitherSkullController.java
@@ -60,7 +60,6 @@ public class WitherSkullController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -72,7 +71,6 @@ public class WitherSkullController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -86,7 +84,6 @@ public class WitherSkullController extends MobEntityController {
             if (vector != null) {
                 super.f(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -94,7 +91,6 @@ public class WitherSkullController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new WitherSkullNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -115,7 +111,6 @@ public class WitherSkullController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
     }
 
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/CitizensBlockBreaker.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/CitizensBlockBreaker.java
index 861d70566..dad4df784 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/CitizensBlockBreaker.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/CitizensBlockBreaker.java
@@ -48,7 +48,6 @@ public class CitizensBlockBreaker extends AbstractBlockBreaker {
             ItemStack current = getCurrentItem();
             return current != null ? current.b(block) : false;
         }
-
     }
 
     @Override
@@ -66,13 +65,10 @@ public class CitizensBlockBreaker extends AbstractBlockBreaker {
                 if (i > 0) {
                     f += i * i + 1;
                 }
-
             }
-
             if (handle.hasEffect(MobEffects.FASTER_DIG)) {
                 f *= 1.0F + (handle.getEffect(MobEffects.FASTER_DIG).getAmplifier() + 1) * 0.2F;
             }
-
             if (handle.hasEffect(MobEffects.SLOWER_DIG)) {
                 float f1 = 1.0F;
                 switch (handle.getEffect(MobEffects.SLOWER_DIG).getAmplifier()) {
@@ -89,20 +85,15 @@ public class CitizensBlockBreaker extends AbstractBlockBreaker {
                     default:
                         f1 = 8.1E-4F;
                 }
-
                 f *= f1;
             }
-
             if (handle.a(TagsFluid.WATER) && !EnchantmentManager.h(handle)) {
                 f /= 5.0F;
             }
-
         }
-
         if (!getHandle().onGround) {
             f /= 5.0F;
         }
-
         return f;
     }
 }
\ No newline at end of file
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/EmptyAdvancementDataPlayer.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/EmptyAdvancementDataPlayer.java
index bdcb57df0..86a5f9e13 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/EmptyAdvancementDataPlayer.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/EmptyAdvancementDataPlayer.java
@@ -64,7 +64,6 @@ public class EmptyAdvancementDataPlayer extends AdvancementDataPlayer {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     private static final MethodHandle G = NMS.getGetter(AdvancementDataPlayer.class, "g");
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/NMSImpl.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/NMSImpl.java
index f983ec914..7bd90f581 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/NMSImpl.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/NMSImpl.java
@@ -326,21 +326,17 @@ public class NMSImpl implements NMSBridge {
                 viewDistance = (int) PLAYER_CHUNK_MAP_VIEW_DISTANCE_GETTER.invoke(chunkMap);
                 PLAYER_CHUNK_MAP_VIEW_DISTANCE_SETTER.invoke(chunkMap, -1);
             }
-
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         boolean success = getHandle(entity).world.addEntity(getHandle(entity), custom);
         try {
             if (chunkMap != null) {
                 PLAYER_CHUNK_MAP_VIEW_DISTANCE_SETTER.invoke(chunkMap, viewDistance);
             }
-
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         return success;
     }
 
@@ -356,14 +352,12 @@ public class NMSImpl implements NMSBridge {
         } else if (!handle.world.getPlayers().contains(handle)) {
             ((List) handle.world.getPlayers()).add(handle);
         }
-
         try {
             CHUNKMAP_UPDATE_PLAYER_STATUS.invoke(((WorldServer) handle.world).getChunkProvider().playerChunkMap, handle,
                     !remove);
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         // PlayerUpdateTask.addOrRemove(entity, remove);
     }
 
@@ -377,7 +371,6 @@ public class NMSImpl implements NMSBridge {
             PlayerAnimation.ARM_SWING.play(humanHandle.getBukkitEntity());
             return;
         }
-
         AttributeInstance attackDamage = handle.getAttributeInstance(GenericAttributes.ATTACK_DAMAGE);
         float f = (float) (attackDamage == null ? 1 : attackDamage.getValue());
         int i = 0;
@@ -385,7 +378,6 @@ public class NMSImpl implements NMSBridge {
             f += EnchantmentManager.a(handle.getItemInMainHand(), target.getMonsterType());
             i += EnchantmentManager.a(Enchantments.KNOCKBACK, handle);
         }
-
         boolean flag = target.damageEntity(DamageSource.mobAttack(handle), f);
         if (!flag)
             return;
@@ -394,12 +386,10 @@ public class NMSImpl implements NMSBridge {
                     Math.cos(handle.yaw * Math.PI / 180.0F) * i * 0.5F);
             handle.setMot(handle.getMot().d(0.6, 1, 0.6));
         }
-
         int fireAspectLevel = EnchantmentManager.getFireAspectEnchantmentLevel(handle);
         if (fireAspectLevel > 0) {
             target.setOnFire(fireAspectLevel * 4);
         }
-
     }
 
     @Override
@@ -411,11 +401,9 @@ public class NMSImpl implements NMSBridge {
             } catch (Throwable t) {
                 t.printStackTrace();
             }
-
         } else if (handle instanceof EntityHumanNPC) {
             ((EntityHumanNPC) handle).getControllerMove().f = false;
         }
-
     }
 
     @Override
@@ -448,19 +436,14 @@ public class NMSImpl implements NMSBridge {
                         if (!changed && !ItemStack.matches(old, curr)) {
                             changed = true;
                         }
-
                         equipment.put(slot, curr);
                     }
-
                     if (changed) {
                         for (EnumItemSlot slot : EnumItemSlot.values()) {
                             agg.send(new PacketPlayOutEntityEquipment(handle.getId(), slot, equipment.get(slot)));
                         }
-
                     }
-
                 }
-
                 tracker.a();
             }
 
@@ -481,9 +464,7 @@ public class NMSImpl implements NMSBridge {
                     if (callback != null) {
                         callback.accept(entity);
                     }
-
                 }
-
                 linked.clear();
             }
         };
@@ -534,11 +515,9 @@ public class NMSImpl implements NMSBridge {
                     return null;
                 bserver = ((EnderDragonBattle) battleObject).bossBattle;
             }
-
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         if (bserver == null)
             return null;
         BossBar ret = Bukkit.createBossBar("", BarColor.BLUE, BarStyle.SEGMENTED_10);
@@ -547,7 +526,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         return ret;
     }
 
@@ -657,13 +635,11 @@ public class NMSImpl implements NMSBridge {
             if (SKULL_PROFILE_FIELD == null)
                 return null;
         }
-
         try {
             return (GameProfile) SKULL_PROFILE_FIELD.get(meta);
         } catch (Exception e) {
             return null;
         }
-
     }
 
     @Override
@@ -676,7 +652,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Exception e) {
             throw new CommandException(Messages.INVALID_SOUND);
         }
-
     }
 
     @Override
@@ -692,7 +667,6 @@ public class NMSImpl implements NMSBridge {
         EntityLiving handle = NMSImpl.getHandle((LivingEntity) npc.getEntity());
         if (handle == null) {
         }
-
         return DEFAULT_SPEED;
         // return (float)
         // handle.getAttributeInstance(GenericAttributes.d).getValue();
@@ -737,9 +711,7 @@ public class NMSImpl implements NMSBridge {
             } else {
                 ((EntityInsentient) raw).a(PathType.WATER, oldWater + 1F);
             }
-
         }
-
         navigation.q().b(params.hasExaminer(DoorExaminer.class));
         return new MCNavigator() {
             float lastSpeed;
@@ -752,7 +724,6 @@ public class NMSImpl implements NMSBridge {
                     PathPoint pp = navigation.l().a(i);
                     blocks.add(entity.getWorld().getBlockAt(pp.a, pp.b, pp.c));
                 }
-
                 return blocks;
             }
 
@@ -772,16 +743,13 @@ public class NMSImpl implements NMSBridge {
                     List<org.bukkit.block.Block> blocks = getBlocks(entity, navigation);
                     Util.sendBlockChanges(blocks, null);
                 }
-
                 if (oldWater >= 0) {
                     if (raw instanceof EntityPlayer) {
                         ((EntityHumanNPC) raw).a(PathType.WATER, oldWater);
                     } else {
                         ((EntityInsentient) raw).a(PathType.WATER, oldWater);
                     }
-
                 }
-
                 stopNavigation(navigation);
             }
 
@@ -796,15 +764,12 @@ public class NMSImpl implements NMSBridge {
                             SIZE_FIELD_SETTER.invoke(handle,
                                     new EntitySize(Math.min(0.99F, size.width), size.height, false));
                         }
-
                     } catch (Throwable e) {
                         e.printStackTrace();
                     }
-
                     if (!function.apply(navigation)) {
                         reason = CancelReason.STUCK;
                     }
-
                     try {
                         SIZE_FIELD_SETTER.invoke(handle, size);
                     } catch (Throwable e) {
@@ -812,14 +777,11 @@ public class NMSImpl implements NMSBridge {
                         // minecraft requires that an entity fit onto both blocks if width >= 1f, but we'd prefer to
                         // make it just fit on 1 so hack around it a bit.
                     }
-
                     lastSpeed = params.speed();
                 }
-
                 if (params.debug() && !NMSImpl.isNavigationFinished(navigation)) {
                     Util.sendBlockChanges(getBlocks(entity, navigation), Material.DANDELION);
                 }
-
                 navigation.a(params.speed());
                 return NMSImpl.isNavigationFinished(navigation);
             }
@@ -1030,37 +992,30 @@ public class NMSImpl implements NMSBridge {
             if (zDiff < 0.0) {
                 yaw += Math.abs(180 - yaw) * 2;
             }
-
             if (handle instanceof EntityEnderDragon) {
                 yaw = Util.getDragonYaw(handle.getBukkitEntity(), xDiff, zDiff);
             } else {
                 yaw = yaw - 90;
             }
-
             if (headOnly) {
                 setHeadYaw(entity, (float) yaw);
             } else {
                 look(entity, (float) yaw, (float) pitch);
             }
-
             return;
         }
-
         if (handle instanceof EntityInsentient) {
             ((EntityInsentient) handle).getControllerLook().a(to.getX(), to.getY(), to.getZ(),
                     ((EntityInsentient) handle).dB(), ((EntityInsentient) handle).M());
             while (((EntityLiving) handle).aM >= 180F) {
                 ((EntityLiving) handle).aM -= 360F;
             }
-
             while (((EntityLiving) handle).aM < -180F) {
                 ((EntityLiving) handle).aM += 360F;
             }
-
         } else if (handle instanceof EntityHumanNPC) {
             ((EntityHumanNPC) handle).getNPC().getOrAddTrait(RotationTrait.class).getPhysicalSession().rotateToFace(to);
         }
-
     }
 
     @Override
@@ -1073,22 +1028,18 @@ public class NMSImpl implements NMSBridge {
             } else {
                 look(from, to.getLocation(), false, true);
             }
-
         } else if (handle instanceof EntityInsentient) {
             ((EntityInsentient) handle).getControllerLook().a(target, ((EntityInsentient) handle).dB(),
                     ((EntityInsentient) handle).M());
             while (((EntityLiving) handle).aM >= 180F) {
                 ((EntityLiving) handle).aM -= 360F;
             }
-
             while (((EntityLiving) handle).aM < -180F) {
                 ((EntityLiving) handle).aM += 360F;
             }
-
         } else if (handle instanceof EntityHumanNPC) {
             ((EntityHumanNPC) handle).getNPC().getOrAddTrait(RotationTrait.class).getPhysicalSession().rotateToFace(to);
         }
-
     }
 
     @Override
@@ -1130,9 +1081,7 @@ public class NMSImpl implements NMSBridge {
                         e.printStackTrace();
                         return super.getBukkitView();
                     }
-
                 }
-
                 return this.bukkitEntity;
             }
         };
@@ -1179,13 +1128,11 @@ public class NMSImpl implements NMSBridge {
             if (key == null || type == null) {
                 continue;
             }
-
             CITIZENS_ENTITY_TYPES.put(clazz, type);
             int code = ENTITY_REGISTRY.a(type);
             ENTITY_REGISTRY.put(code, key, type);
             return;
         }
-
         throw new IllegalArgumentException("unable to find valid entity superclass for class " + clazz.toString());
     }
 
@@ -1224,7 +1171,6 @@ public class NMSImpl implements NMSBridge {
             hook.hooked = null;
             hook.getBukkitEntity().remove();
         }
-
     }
 
     @Override
@@ -1239,7 +1185,6 @@ public class NMSImpl implements NMSBridge {
         if (getHandle(entity) instanceof EntityHumanNPC) {
             ((EntityHumanNPC) getHandle(entity)).setTracked(replace);
         }
-
     }
 
     @Override
@@ -1249,11 +1194,9 @@ public class NMSImpl implements NMSBridge {
         if (bodyYaw == null) {
             bodyYaw = handle.yaw;
         }
-
         if (pitch == null) {
             pitch = handle.pitch;
         }
-
         List<Packet<?>> toSend = Lists.newArrayList();
         if (position) {
             EntityTracker entry = ((WorldServer) handle.world).getChunkProvider().playerChunkMap.trackedEntities
@@ -1265,7 +1208,6 @@ public class NMSImpl implements NMSBridge {
                 e.printStackTrace();
                 return;
             }
-
             Vec3D pos = handle.getPositionVector().d(ete.b());
             toSend.add(new PacketPlayOutRelEntityMoveLook(handle.getId(), (short) pos.x, (short) pos.y, (short) pos.z,
                     (byte) (bodyYaw * 256.0F / 360.0F), (byte) (pitch * 256.0F / 360.0F), handle.onGround));
@@ -1273,11 +1215,9 @@ public class NMSImpl implements NMSBridge {
             toSend.add(new PacketPlayOutEntityLook(handle.getId(), (byte) (bodyYaw * 256.0F / 360.0F),
                     (byte) (pitch * 256.0F / 360.0F), handle.onGround));
         }
-
         if (headYaw != null) {
             toSend.add(new PacketPlayOutEntityHeadRotation(handle, (byte) (headYaw * 256.0F / 360.0F)));
         }
-
         sendPacketsNearby(null, from.getLocation(), toSend, 64);
     }
 
@@ -1301,7 +1241,6 @@ public class NMSImpl implements NMSBridge {
             entities[i] = (EntityPlayer) skinnable;
             i++;
         }
-
         NMSImpl.sendPacket(recipient,
                 new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.REMOVE_PLAYER, entities));
     }
@@ -1322,14 +1261,12 @@ public class NMSImpl implements NMSBridge {
         if (TEAM_FIELD == null) {
             TEAM_FIELD = NMS.getGetter(team.getClass(), "team");
         }
-
         try {
             ScoreboardTeam nmsTeam = (ScoreboardTeam) TEAM_FIELD.invoke(team);
             sendPacket(recipient, new PacketPlayOutScoreboardTeam(nmsTeam, mode));
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     @Override
@@ -1365,7 +1302,6 @@ public class NMSImpl implements NMSBridge {
         } else if (handle instanceof EntityHumanNPC) {
             ((EntityHumanNPC) handle).setMoveDestination(x, y, z, speed);
         }
-
     }
 
     @Override
@@ -1378,7 +1314,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable ex) {
             ex.printStackTrace();
         }
-
     }
 
     @Override
@@ -1398,7 +1333,6 @@ public class NMSImpl implements NMSBridge {
         if (!(handle instanceof EntityHuman)) {
             handle.aK = yaw;
         }
-
         handle.aM = yaw;
     }
 
@@ -1451,12 +1385,10 @@ public class NMSImpl implements NMSBridge {
             if (SKULL_PROFILE_FIELD == null)
                 return;
         }
-
         try {
             SKULL_PROFILE_FIELD.set(meta, profile);
         } catch (Exception e) {
         }
-
     }
 
     @Override
@@ -1470,7 +1402,6 @@ public class NMSImpl implements NMSBridge {
         } else if (handle instanceof EntityHumanNPC) {
             ((EntityHumanNPC) handle).setShouldJump();
         }
-
     }
 
     @Override
@@ -1488,14 +1419,12 @@ public class NMSImpl implements NMSBridge {
         if (entity instanceof Player) {
             ((Player) entity).setSneaking(sneaking);
         }
-
         EntityPose pose = sneaking ? EntityPose.SNEAKING : EntityPose.STANDING;
         try {
             ENTITY_SETPOSE.invoke(getHandle(entity), pose);
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     @Override
@@ -1526,7 +1455,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         return false;
     }
 
@@ -1539,7 +1467,6 @@ public class NMSImpl implements NMSBridge {
             field.invoke(null, ENTITY_REGISTRY.get());
         } catch (Throwable e) {
         }
-
     }
 
     @Override
@@ -1549,7 +1476,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     @Override
@@ -1565,7 +1491,6 @@ public class NMSImpl implements NMSBridge {
         if (RANDOM.nextFloat() <= 0.85F && (handle.isInWater() || handle.ay())) {
             handle.setMot(handle.getMot().getX(), handle.getMot().getY() + power, handle.getMot().getZ());
         }
-
     }
 
     @Override
@@ -1652,7 +1577,6 @@ public class NMSImpl implements NMSBridge {
                 menuType = Containers.CRAFTING;
                 break;
         }
-
         Container active = handle.activeContainer;
         handle.playerConnection
                 .sendPacket(new PacketPlayOutOpenWindow(active.windowId, menuType, new ChatComponentText(newTitle)));
@@ -1675,7 +1599,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     @Override
@@ -1687,10 +1610,8 @@ public class NMSImpl implements NMSBridge {
             if (en instanceof EntityHumanNPC) {
                 ((EntityHumanNPC) en).updatePathfindingRange(pathfindingRange);
             }
-
             return;
         }
-
         if (PATHFINDING_RANGE == null)
             return;
         EntityInsentient handle = (EntityInsentient) en;
@@ -1701,7 +1622,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     private static class CitizensInventoryAnvil extends CraftInventoryAnvil implements ForwardingInventory {
@@ -1811,7 +1731,6 @@ public class NMSImpl implements NMSBridge {
             e.printStackTrace();
             return;
         }
-
         float oldw = size.width;
         float oldl = size.height;
         cb.accept(datawatcherobject);
@@ -1819,7 +1738,6 @@ public class NMSImpl implements NMSBridge {
             living.setPosition(living.locX - 0.01, living.locY, living.locZ - 0.01);
             living.setPosition(living.locX + 0.01, living.locY, living.locZ + 0.01);
         }
-
     }
 
     public static void clearGoals(PathfinderGoalSelector... goalSelectors) {
@@ -1834,9 +1752,7 @@ public class NMSImpl implements NMSBridge {
             } catch (Throwable e) {
                 Messaging.logTr(Messages.ERROR_CLEARING_GOALS, e.getLocalizedMessage());
             }
-
         }
-
     }
 
     private static CompoundTag convertNBT(net.minecraft.server.v1_14_R1.NBTTagCompound tag) {
@@ -1846,7 +1762,6 @@ public class NMSImpl implements NMSBridge {
         for (String key : tag.getKeys()) {
             tags.put(key, convertNBT(key, tag.get(key)));
         }
-
         return new CompoundTag("", tags);
     }
 
@@ -1877,10 +1792,8 @@ public class NMSImpl implements NMSBridge {
                 for (int i = 0; i < list.size(); i++) {
                     converted.add(convertNBT("", list.get(i)));
                 }
-
                 return new ListTag(key, tagType, converted);
             }
-
         } else if (base instanceof net.minecraft.server.v1_14_R1.NBTTagCompound)
             return convertNBT((net.minecraft.server.v1_14_R1.NBTTagCompound) base);
         else if (base instanceof net.minecraft.server.v1_14_R1.NBTTagEnd)
@@ -1898,7 +1811,6 @@ public class NMSImpl implements NMSBridge {
                 d0 = 0.01D;
                 entity.fallDistance = 0.0F;
             }
-
             double d1;
             float f1;
             double d2;
@@ -1914,19 +1826,16 @@ public class NMSImpl implements NMSBridge {
                     if (!entity.isNoGravity()) {
                         entity.setMot(entity.getMot().add(0.0D, -d0 / 4.0D, 0.0D));
                     }
-
                     vec3d4 = entity.getMot();
                     if (entity.positionChanged
                             && entity.d(vec3d4.x, vec3d4.y + 0.6000000238418579D - entity.locY + d1, vec3d4.z)) {
                         entity.setMot(vec3d4.x, 0.30000001192092896D, vec3d4.z);
                     }
-
                 } else if (entity.isGliding()) {
                     vec3d4 = entity.getMot();
                     if (vec3d4.y > -0.5D) {
                         entity.fallDistance = 1.0F;
                     }
-
                     vec3d5 = entity.getLookDirection();
                     f1 = entity.pitch * 0.017453292F;
                     double d3 = Math.sqrt(vec3d5.x * vec3d5.x + vec3d5.z * vec3d5.z);
@@ -1940,17 +1849,14 @@ public class NMSImpl implements NMSBridge {
                         d5 = vec3d4.y * -0.1D * f3;
                         vec3d4 = vec3d4.add(vec3d5.x * d5 / d3, d5, vec3d5.z * d5 / d3);
                     }
-
                     if (f1 < 0.0F && d3 > 0.0D) {
                         d5 = d4 * -MathHelper.sin(f1) * 0.04D;
                         vec3d4 = vec3d4.add(-vec3d5.x * d5 / d3, d5 * 3.2D, -vec3d5.z * d5 / d3);
                     }
-
                     if (d3 > 0.0D) {
                         vec3d4 = vec3d4.add((vec3d5.x / d3 * d4 - vec3d4.x) * 0.1D, 0.0D,
                                 (vec3d5.z / d3 * d4 - vec3d4.z) * 0.1D);
                     }
-
                     entity.setMot(vec3d4.d(0.9900000095367432D, 0.9800000190734863D, 0.9900000095367432D));
                     entity.move(EnumMoveType.SELF, entity.getMot());
                     if (entity.positionChanged && !entity.world.isClientSide) {
@@ -1963,17 +1869,13 @@ public class NMSImpl implements NMSBridge {
                             } catch (Throwable e) {
                                 e.printStackTrace();
                             }
-
                             entity.damageEntity(DamageSource.FLY_INTO_WALL, f4);
                         }
-
                     }
-
                     if (entity.onGround && !entity.world.isClientSide && entity.getFlag(7)
                             && !CraftEventFactory.callToggleGlideEvent(entity, false).isCancelled()) {
                         entity.setFlag(7, false);
                     }
-
                 } else {
                     BlockPosition blockposition = new BlockPosition(entity.locX, entity.getBoundingBox().minY - 1.0D,
                             entity.locZ);
@@ -1985,18 +1887,15 @@ public class NMSImpl implements NMSBridge {
                     } catch (Throwable e) {
                         e.printStackTrace();
                     }
-
                     entity.move(EnumMoveType.SELF, entity.getMot());
                     vec3d2 = entity.getMot();
                     try {
                         if ((entity.positionChanged || (boolean) JUMP_FIELD.invoke(entity)) && entity.isClimbing()) {
                             vec3d2 = new Vec3D(vec3d2.x, 0.2D, vec3d2.z);
                         }
-
                     } catch (Throwable e) {
                         e.printStackTrace();
                     }
-
                     double d7 = vec3d2.y;
                     if (entity.hasEffect(MobEffects.LEVITATION)) {
                         d7 += (0.05D * (entity.getEffect(MobEffects.LEVITATION).getAmplifier() + 1) - vec3d2.y) * 0.2D;
@@ -2007,14 +1906,11 @@ public class NMSImpl implements NMSBridge {
                         } else {
                             d7 = 0.0D;
                         }
-
                     } else if (!entity.isNoGravity()) {
                         d7 -= d0;
                     }
-
                     entity.setMot(vec3d2.x * f1, d7 * 0.9800000190734863D, vec3d2.z * f1);
                 }
-
             } else {
                 d1 = entity.locY;
                 f1 = entity.isSprinting() ? 0.9F : entity instanceof EntityPolarBear ? 0.98F : 0.8F;
@@ -2023,27 +1919,22 @@ public class NMSImpl implements NMSBridge {
                 if (f2 > 3.0F) {
                     f2 = 3.0F;
                 }
-
                 if (!entity.onGround) {
                     f2 *= 0.5F;
                 }
-
                 if (f2 > 0.0F) {
                     f1 += (0.54600006F - f1) * f2 / 3.0F;
                     f += (entity.db() - f) * f2 / 3.0F;
                 }
-
                 if (entity.hasEffect(MobEffects.DOLPHINS_GRACE)) {
                     f1 = 0.96F;
                 }
-
                 entity.a(f, vec3d);
                 entity.move(EnumMoveType.SELF, entity.getMot());
                 vec3d5 = entity.getMot();
                 if (entity.positionChanged && entity.isClimbing()) {
                     vec3d5 = new Vec3D(vec3d5.x, 0.2D, vec3d5.z);
                 }
-
                 entity.setMot(vec3d5.d(f1, 0.800000011920929D, f1));
                 if (!entity.isNoGravity() && !entity.isSprinting()) {
                     vec3d2 = entity.getMot();
@@ -2052,20 +1943,15 @@ public class NMSImpl implements NMSBridge {
                     } else {
                         d2 = vec3d2.y - d0 / 16.0D;
                     }
-
                     entity.setMot(vec3d2.x, d2, vec3d2.z);
                 }
-
                 vec3d2 = entity.getMot();
                 if (entity.positionChanged
                         && entity.d(vec3d2.x, vec3d2.y + 0.6000000238418579D - entity.locY + d1, vec3d2.z)) {
                     entity.setMot(vec3d2.x, 0.30000001192092896D, vec3d2.z);
                 }
-
             }
-
         }
-
         entity.aE = entity.aF;
         d0 = entity.locX - entity.lastX;
         double d8 = entity.locZ - entity.lastZ;
@@ -2074,7 +1960,6 @@ public class NMSImpl implements NMSBridge {
         if (f > 1.0F) {
             f = 1.0F;
         }
-
         entity.aF += (f - entity.aF) * 0.4F;
         entity.aG += entity.aF;
     }
@@ -2085,7 +1970,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         return null;
     }
 
@@ -2100,9 +1984,7 @@ public class NMSImpl implements NMSBridge {
                 ex2.printStackTrace();
                 return null;
             }
-
         }
-
     }
 
     public static <T extends Entity> EntityTypes<T> getEntityType(Class<?> clazz) {
@@ -2133,7 +2015,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         return null;
     }
 
@@ -2170,7 +2051,6 @@ public class NMSImpl implements NMSBridge {
         if (mat != null) {
             minecart.setDisplayBlock(Block.getByCombinedId(mat.getId()).getBlock().getBlockData());
         }
-
         minecart.setDisplayBlockOffset(offset);
     }
 
@@ -2187,7 +2067,6 @@ public class NMSImpl implements NMSBridge {
             handle.setMot(handle.getMot().a(0.9));
             return true;
         }
-
         return false;
     }
 
@@ -2198,7 +2077,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     public static void sendPacket(Player player, Packet<?> packet) {
@@ -2225,13 +2103,10 @@ public class NMSImpl implements NMSBridge {
                     || location.distanceSquared(player.getLocation(PACKET_CACHE_LOCATION)) > radius) {
                 continue;
             }
-
             for (Packet<?> packet : packets) {
                 NMSImpl.sendPacket(player, packet);
             }
-
         }
-
     }
 
     public static void sendPacketsNearby(Player from, Location location, Packet<?>... packets) {
@@ -2244,7 +2119,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     public static void setBukkitEntity(Entity entity, CraftEntity bukkitEntity) {
@@ -2253,7 +2127,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     public static void setLookControl(EntityInsentient mob, ControllerLook control) {
@@ -2262,7 +2135,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     public static void setNotInSchool(EntityFish entity) {
@@ -2270,11 +2142,9 @@ public class NMSImpl implements NMSBridge {
             if (ENTITY_FISH_NUM_IN_SCHOOL != null) {
                 ENTITY_FISH_NUM_IN_SCHOOL.invoke(entity, 2);
             }
-
         } catch (Throwable ex) {
             ex.printStackTrace();
         }
-
     }
 
     public static void setSize(Entity entity, boolean justCreated) {
@@ -2297,13 +2167,10 @@ public class NMSImpl implements NMSBridge {
                     float f = entitysize.width - entitysize1.width;
                     entity.move(EnumMoveType.SELF, new Vec3D(f, 0.0D, f));
                 }
-
             }
-
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     public static void stopNavigation(NavigationAbstract navigation) {
@@ -2321,7 +2188,6 @@ public class NMSImpl implements NMSBridge {
         } else if (entity instanceof EntityHumanNPC) {
             ((EntityHumanNPC) entity).updateAI();
         }
-
     }
 
     public static void updateNavigation(NavigationAbstract navigation) {
@@ -2399,7 +2265,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             Messaging.logTr(Messages.ERROR_GETTING_ID_MAPPING, e.getMessage());
         }
-
         try {
             ENDERMAN_ANGRY = (DataWatcherObject<Boolean>) NMS.getField(EntityEnderman.class, "bz").get(null);
         } catch (IllegalArgumentException e) {
@@ -2407,6 +2272,5 @@ public class NMSImpl implements NMSBridge {
         } catch (IllegalAccessException e) {
             e.printStackTrace();
         }
-
     }
 }
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/PitchableLookControl.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/PitchableLookControl.java
index aa5f33404..f1d51d7b6 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/PitchableLookControl.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/PitchableLookControl.java
@@ -18,7 +18,6 @@ public class PitchableLookControl extends ControllerLook {
         } else {
             resetOnTick = () -> true;
         }
-
     }
 
     @Override
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/PlayerAnimationImpl.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/PlayerAnimationImpl.java
index 48009952a..c9e296f1e 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/PlayerAnimationImpl.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/PlayerAnimationImpl.java
@@ -20,7 +20,6 @@ public class PlayerAnimationImpl {
             playDefaultAnimation(player, to, DEFAULTS.get(animation));
             return;
         }
-
         switch (animation) {
             case SNEAK:
                 player.getBukkitEntity().setSneaking(true);
@@ -51,7 +50,6 @@ public class PlayerAnimationImpl {
             default:
                 throw new UnsupportedOperationException();
         }
-
     }
 
     protected static void playDefaultAnimation(EntityPlayer player, Iterable<Player> to, int code) {
@@ -63,7 +61,6 @@ public class PlayerAnimationImpl {
         for (Player player : to) {
             NMSImpl.sendPacket(player, packet);
         }
-
     }
 
     private static EnumMap<PlayerAnimation, Integer> DEFAULTS = Maps.newEnumMap(PlayerAnimation.class);
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/PlayerControllerMove.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/PlayerControllerMove.java
index 4a1026ffd..5470a678f 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/PlayerControllerMove.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/PlayerControllerMove.java
@@ -45,7 +45,6 @@ public class PlayerControllerMove extends ControllerMove {
                 this.a.bd = 0.0F;
                 return;
             }
-
             float f = (float) Math.toDegrees(Math.atan2(d1, d0)) - 90.0F;
             this.a.yaw = a(this.a.yaw, f, 90.0F);
             NMS.setHeadYaw(a.getBukkitEntity(), this.a.yaw);
@@ -63,11 +62,8 @@ public class PlayerControllerMove extends ControllerMove {
                 } else {
                     ((EntityInsentient) this.a).getControllerJump().jump();
                 }
-
             }
-
         }
-
     }
 
     @Override
@@ -85,18 +81,15 @@ public class PlayerControllerMove extends ControllerMove {
         if (f3 > f2) {
             f3 = f2;
         }
-
         if (f3 < -f2) {
             f3 = -f2;
         }
-
         float f4 = f + f3;
         if (f4 < 0.0F) {
             f4 += 360.0F;
         } else if (f4 > 360.0F) {
             f4 -= 360.0F;
         }
-
         return f4;
     }
 
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/PlayerNavigation.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/PlayerNavigation.java
index 99820cf23..feb440cd4 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/PlayerNavigation.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/PlayerNavigation.java
@@ -87,26 +87,21 @@ public class PlayerNavigation extends NavigationAbstract {
         if (this.b.getType(var0).isAir()) {
             for (var2 = var0.down(); var2.getY() > 0 && this.b.getType(var2).isAir(); var2 = var2.down()) {
             }
-
             if (var2.getY() > 0)
                 return supera(var2.up(), var1);
             while (var2.getY() < this.b.getBuildHeight() && this.b.getType(var2).isAir()) {
                 var2 = var2.up();
             }
-
             var0 = var2;
         }
-
         if (!this.b.getType(var0).getMaterial().isBuildable())
             return supera(var0, var1);
         else {
             for (var2 = var0.up(); var2.getY() < this.b.getBuildHeight()
                     && this.b.getType(var2).getMaterial().isBuildable(); var2 = var2.up()) {
             }
-
             return supera(var2, var1);
         }
-
     }
 
     public void a(boolean var0) {
@@ -162,14 +157,10 @@ public class PlayerNavigation extends NavigationAbstract {
                                 || var19 == PathType.DAMAGE_OTHER)
                             return false;
                     }
-
                 }
-
             }
-
             return true;
         }
-
     }
 
     @Override
@@ -181,7 +172,6 @@ public class PlayerNavigation extends NavigationAbstract {
             if (!var0.a(this.c)) {
                 this.c = var0;
             }
-
             this.D_();
             if (this.c.e() <= 0)
                 return false;
@@ -192,9 +182,7 @@ public class PlayerNavigation extends NavigationAbstract {
                 this.g = var3;
                 return true;
             }
-
         }
-
     }
 
     @Override
@@ -215,7 +203,6 @@ public class PlayerNavigation extends NavigationAbstract {
                 this.q = var8.k();
                 this.r = var3;
             }
-
             return var8;
         }
     }
@@ -231,11 +218,9 @@ public class PlayerNavigation extends NavigationAbstract {
             if (var0.distanceSquared(this.g) < 2.25D) {
                 this.o();
             }
-
             this.f = this.e;
             this.g = var0;
         }
-
         if (this.c != null && !this.c.b()) {
             Vec3D var1 = this.c.g();
             if (var1.equals(this.h)) {
@@ -245,17 +230,14 @@ public class PlayerNavigation extends NavigationAbstract {
                 double var2 = var0.f(this.h);
                 this.k = this.a.db() > 0.0F ? var2 / this.a.db() * 1000.0D : 0.0D;
             }
-
             if (this.k > 0.0D && this.i > this.k * 3.0D) {
                 this.h = Vec3D.a;
                 this.i = 0L;
                 this.k = 0.0D;
                 this.o();
             }
-
             this.j = SystemUtils.getMonotonicMillis();
         }
-
     }
 
     @Override
@@ -283,11 +265,9 @@ public class PlayerNavigation extends NavigationAbstract {
                 if (var7 >= 0.0D) {
                     ++var19;
                 }
-
                 if (var9 >= 0.0D) {
                     ++var21;
                 }
-
                 var19 /= var7;
                 var21 /= var9;
                 int var23 = var7 < 0.0D ? -1 : 1;
@@ -308,14 +288,10 @@ public class PlayerNavigation extends NavigationAbstract {
                         var6 += var24;
                         var28 = var26 - var6;
                     }
-
                 } while (this.a(var5, MathHelper.floor(var0.y), var6, var2, var3, var4, var0, var7, var9));
-
             }
-
             return false;
         }
-
     }
 
     @Override
@@ -332,9 +308,7 @@ public class PlayerNavigation extends NavigationAbstract {
             if (var0.a(var2, this.c.e() - this.c.f())) {
                 this.k();
             }
-
         }
-
     }
 
     private boolean b(int var0, int var1, int var2, int var3, int var4, int var5, Vec3D var6, double var7,
@@ -351,7 +325,6 @@ public class PlayerNavigation extends NavigationAbstract {
             var13 = var14.getX() + 0.5D - var6.x;
             var15 = var14.getZ() + 0.5D - var6.z;
         } while (var13 * var7 + var15 * var9 < 0.0D || this.b.getType(var14).a(this.b, var14, PathMode.LAND));
-
         return false;
     }
 
@@ -361,7 +334,6 @@ public class PlayerNavigation extends NavigationAbstract {
         if (this.m) {
             this.k();
         }
-
         if (!this.n()) {
             Vec3D var0;
             if (this.a()) {
@@ -373,9 +345,7 @@ public class PlayerNavigation extends NavigationAbstract {
                         && MathHelper.floor(var0.z) == MathHelper.floor(var1.z)) {
                     this.c.c(this.c.f() + 1);
                 }
-
             }
-
             if (!this.n()) {
                 var0 = this.c.a(this.a);
                 BlockPosition var1 = new BlockPosition(var0);
@@ -383,9 +353,7 @@ public class PlayerNavigation extends NavigationAbstract {
                         this.b.getType(var1.down()).isAir() ? var0.y : PathfinderNormal.a(this.b, var1), var0.z,
                         this.d);
             }
-
         }
-
     }
 
     public void c(boolean var0) {
@@ -409,11 +377,8 @@ public class PlayerNavigation extends NavigationAbstract {
                     this.c.b(var0);
                     return;
                 }
-
             }
-
         }
-
     }
 
     public boolean f() {
@@ -444,11 +409,9 @@ public class PlayerNavigation extends NavigationAbstract {
                 this.n = this.b.getTime();
                 this.m = false;
             }
-
         } else {
             this.m = true;
         }
-
     }
 
     @Override
@@ -465,7 +428,6 @@ public class PlayerNavigation extends NavigationAbstract {
                 && Math.abs(this.a.locY - var1.y) < 1.0D) {
             this.c.c(this.c.f() + 1);
         }
-
         this.a(var0);
     }
 
@@ -514,13 +476,9 @@ public class PlayerNavigation extends NavigationAbstract {
                     if (var2 != null && var1.b >= var2.b) {
                         this.c.a(var0 + 1, var2.a(var2.a, var1.b + 1, var2.c));
                     }
-
                 }
-
             }
-
         }
-
     }
 
     private int t() {
@@ -535,11 +493,9 @@ public class PlayerNavigation extends NavigationAbstract {
                 var1 = this.b.getType(new BlockPosition(this.a.locX, var0, this.a.locZ)).getBlock();
                 ++var2;
             } while (var2 <= 16);
-
             return MathHelper.floor(this.a.getBoundingBox().minY);
         } else
             return MathHelper.floor(this.a.getBoundingBox().minY + 0.5D);
-
     }
 
     private static EntityInsentient getDummyInsentient(EntityHumanNPC from, World world) {
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/PlayerPathfinder.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/PlayerPathfinder.java
index 8f96045e2..f323cf31d 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/PlayerPathfinder.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/PlayerPathfinder.java
@@ -72,7 +72,6 @@ public class PlayerPathfinder extends Pathfinder {
             var4 = var4.h;
             var3.add(0, var4);
         }
-
         return new PathEntity(var3, var1, var2);
     }
 
@@ -90,14 +89,12 @@ public class PlayerPathfinder extends Pathfinder {
             if (var5 >= this.d) {
                 break;
             }
-
             PathPoint var6 = this.a.c();
             var6.i = true;
             var4.stream().filter(var2x -> (var6.c(var2x) <= var3)).forEach(PathDestination::e);
             if (var4.stream().anyMatch(PathDestination::f)) {
                 break;
             }
-
             if (var6.a(var0) < var2) {
                 int var7 = this.e.a(this.c, var6);
                 for (int var8 = 0; var8 < var7; ++var8) {
@@ -115,15 +112,10 @@ public class PlayerPathfinder extends Pathfinder {
                             var9.g = var9.e + var9.f;
                             this.a.a(var9);
                         }
-
                     }
-
                 }
-
             }
-
         }
-
         Stream var6;
         if (var4.stream().anyMatch(PathDestination::f)) {
             var6 = var4.stream().filter(PathDestination::f)
@@ -132,7 +124,6 @@ public class PlayerPathfinder extends Pathfinder {
         } else {
             var6 = getFallbackDestinations(var1, var4);
         }
-
         Optional var7 = var6.findFirst();
         if (!var7.isPresent())
             return null;
@@ -140,7 +131,6 @@ public class PlayerPathfinder extends Pathfinder {
             PathEntity var8 = (PathEntity) var7.get();
             return var8;
         }
-
     }
 
     private float a(PathPoint var0, Set var1) {
@@ -151,7 +141,6 @@ public class PlayerPathfinder extends Pathfinder {
             var5 = var0.a(var3);
             var3.a(var5, var0);
         }
-
         return var2;
     }
 
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/PlayerPathfinderNormal.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/PlayerPathfinderNormal.java
index da2f36c8d..1134439ed 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/PlayerPathfinderNormal.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/PlayerPathfinderNormal.java
@@ -68,20 +68,16 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
         if (var4 == PathType.DOOR_WOOD_CLOSED && var1 && var2) {
             var4 = PathType.WALKABLE;
         }
-
         if (var4 == PathType.DOOR_OPEN && !var2) {
             var4 = PathType.BLOCKED;
         }
-
         if (var4 == PathType.RAIL && !(var0.getType(var3).getBlock() instanceof BlockMinecartTrackAbstract)
                 && !(var0.getType(var3.down()).getBlock() instanceof BlockMinecartTrackAbstract)) {
             var4 = PathType.FENCE;
         }
-
         if (var4 == PathType.LEAVES) {
             var4 = PathType.BLOCKED;
         }
-
         return var4;
     }
 
@@ -97,17 +93,13 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
             if (var6 == PathType.DAMAGE_FIRE || var5 == Blocks.MAGMA_BLOCK || var5 == Blocks.CAMPFIRE) {
                 var4 = PathType.DAMAGE_FIRE;
             }
-
             if (var6 == PathType.DAMAGE_CACTUS) {
                 var4 = PathType.DAMAGE_CACTUS;
             }
-
             if (var6 == PathType.DAMAGE_OTHER) {
                 var4 = PathType.DAMAGE_OTHER;
             }
-
         }
-
         var4 = this.a(var0, var1, var2, var3, var4);
         return var4;
     }
@@ -131,15 +123,12 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                 if (var4.a(var16) >= var4.a(var15)) {
                     var15 = var16;
                 }
-
             }
-
             if (var11 == PathType.OPEN && var4.a(var15) == 0.0F)
                 return PathType.OPEN;
             else
                 return var15;
         }
-
     }
 
     @Override
@@ -162,15 +151,12 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                 if (var4.a(var16) >= var4.a(var15)) {
                     var15 = var16;
                 }
-
             }
-
             if (var11 == PathType.OPEN && var4.a(var15) == 0.0F)
                 return PathType.OPEN;
             else
                 return var15;
         }
-
     }
 
     public PathType a(IBlockAccess var0, int var1, int var2, int var3, int var4, int var5, int var6, boolean var7,
@@ -186,14 +172,10 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                     if (var12 == 0 && var13 == 0 && var14 == 0) {
                         var10 = var18;
                     }
-
                     var9.add(var18);
                 }
-
             }
-
         }
-
         return var10;
     }
 
@@ -213,13 +195,9 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                             } else if (var9 == Blocks.SWEET_BERRY_BUSH) {
                                 var4 = PathType.DANGER_OTHER;
                             }
-
                         }
-
                     }
-
                 }
-
             } catch (Throwable var18) {
                 tt = var18;
                 throw var18;
@@ -231,17 +209,12 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                         } catch (Throwable var17) {
                             tt.addSuppressed(var17);
                         }
-
                     } else {
                         var5.close();
                     }
-
                 }
-
             }
-
         }
-
         return var4;
     }
 
@@ -260,7 +233,6 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                 var7.l = var11;
                 var7.k = Math.max(var7.k, var12);
             }
-
             if ((var11 != PathType.WALKABLE)) {
                 if ((var7 == null || var7.k < 0.0F) && var3 > 0 && var11 != PathType.FENCE
                         && var11 != PathType.TRAPDOOR) {
@@ -277,11 +249,8 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                         if (!this.a.getCubes(this.b, var19)) {
                             var7 = null;
                         }
-
                     }
-
                 }
-
                 if (var11 == PathType.WATER && !this.e()) {
                     if (this.a(this.b, var0, var1 - 1, var2) != PathType.WATER)
                         return var7;
@@ -294,9 +263,7 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                         var7.l = var11;
                         var7.k = Math.max(var7.k, this.b.a(var11));
                     }
-
                 }
-
                 if (var11 == PathType.OPEN) {
                     AxisAlignedBB var15 = new AxisAlignedBB(var0 - var13 + 0.5D, var1 + 0.001D, var2 - var13 + 0.5D,
                             var0 + var13 + 0.5D, var1 + this.b.getHeight(), var2 + var13 + 0.5D);
@@ -310,9 +277,7 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                             var7.k = Math.max(var7.k, var12);
                             return var7;
                         }
-
                     }
-
                     int var16 = 0;
                     int var17 = var1;
                     while (var11 == PathType.OPEN) {
@@ -324,14 +289,12 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                             var18.k = -1.0F;
                             return var18;
                         }
-
                         var18 = this.a(var0, var1, var2);
                         if (var16++ >= b.bv()) {
                             var18.l = PathType.BLOCKED;
                             var18.k = -1.0F;
                             return var18;
                         }
-
                         var11 = this.a(this.b, var0, var1, var2);
                         var12 = this.b.a(var11);
                         if (var11 != PathType.OPEN && var12 >= 0.0F) {
@@ -340,22 +303,16 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                             var18.k = Math.max(var18.k, var12);
                             break;
                         }
-
                         if (var12 < 0.0F) {
                             var18.l = PathType.BLOCKED;
                             var18.k = -1.0F;
                             return var18;
                         }
-
                     }
-
                 }
-
             }
-
             return var7;
         }
-
     }
 
     private boolean a(PathPoint var0, PathPoint var1, PathPoint var2, PathPoint var3) {
@@ -375,48 +332,39 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
         if (this.b.a(var4) >= 0.0F) {
             var3 = MathHelper.d(Math.max(1.0F, this.b.K));
         }
-
         double var5 = a(this.a, new BlockPosition(var1.a, var1.b, var1.c));
         PathPoint var7 = this.a(var1.a, var1.b, var1.c + 1, var3, var5, EnumDirection.SOUTH);
         if (var7 != null && !var7.i && var7.k >= 0.0F) {
             var0[var2++] = var7;
         }
-
         PathPoint var8 = this.a(var1.a - 1, var1.b, var1.c, var3, var5, EnumDirection.WEST);
         if (var8 != null && !var8.i && var8.k >= 0.0F) {
             var0[var2++] = var8;
         }
-
         PathPoint var9 = this.a(var1.a + 1, var1.b, var1.c, var3, var5, EnumDirection.EAST);
         if (var9 != null && !var9.i && var9.k >= 0.0F) {
             var0[var2++] = var9;
         }
-
         PathPoint var10 = this.a(var1.a, var1.b, var1.c - 1, var3, var5, EnumDirection.NORTH);
         if (var10 != null && !var10.i && var10.k >= 0.0F) {
             var0[var2++] = var10;
         }
-
         PathPoint var11 = this.a(var1.a - 1, var1.b, var1.c - 1, var3, var5, EnumDirection.NORTH);
         if (this.a(var1, var8, var10, var11)) {
             var0[var2++] = var11;
         }
-
         PathPoint var12 = this.a(var1.a + 1, var1.b, var1.c - 1, var3, var5, EnumDirection.NORTH);
         if (this.a(var1, var9, var10, var12)) {
             var0[var2++] = var12;
         }
-
         PathPoint var13 = this.a(var1.a - 1, var1.b, var1.c + 1, var3, var5, EnumDirection.SOUTH);
         if (this.a(var1, var8, var7, var13)) {
             var0[var2++] = var13;
         }
-
         PathPoint var14 = this.a(var1.a + 1, var1.b, var1.c + 1, var3, var5, EnumDirection.SOUTH);
         if (this.a(var1, var9, var7, var14)) {
             var0[var2++] = var14;
         }
-
         return var2;
     }
 
@@ -432,7 +380,6 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                 ++var0;
                 ((MutableBlockPosition) var1).c(this.b.locX, var0, this.b.locZ);
             }
-
             --var0;
         } else if (this.b.onGround) {
             var0 = MathHelper.floor(this.b.getBoundingBox().minY + 0.5D);
@@ -441,10 +388,8 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                     this.b); (this.a.getType(var1).isAir() || this.a.getType(var1).a(this.a, var1, PathMode.LAND))
                             && var1.getY() > 0; var1 = var1.down()) {
             }
-
             var0 = var1.up().getY();
         }
-
         var1 = new BlockPosition(this.b);
         PathType var2 = this.a(this.b, var1.getX(), var0, var1.getZ());
         if (this.b.a(var2) < 0.0F) {
@@ -460,9 +405,7 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                 if (this.b.a(var6) >= 0.0F)
                     return this.a(var4.getX(), var4.getY(), var4.getZ());
             }
-
         }
-
         return this.a(var1.getX(), var0, var1.getZ());
     }
 
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/PlayerlistTracker.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/PlayerlistTracker.java
index 02aa40d45..56b3e9475 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/PlayerlistTracker.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/PlayerlistTracker.java
@@ -44,14 +44,12 @@ public class PlayerlistTracker extends PlayerChunkMap.EntityTracker {
                         if (res == null) {
                             updateLastPlayer(player);
                         }
-
                         return res;
                     }
                 });
             } catch (Throwable e) {
                 e.printStackTrace();
             }
-
         } else {
             try {
                 Set<EntityPlayer> delegate = super.trackedPlayers;
@@ -62,7 +60,6 @@ public class PlayerlistTracker extends PlayerChunkMap.EntityTracker {
                         if (res) {
                             updateLastPlayer(player);
                         }
-
                         return res;
                     }
 
@@ -74,9 +71,7 @@ public class PlayerlistTracker extends PlayerChunkMap.EntityTracker {
             } catch (Throwable e) {
                 e.printStackTrace();
             }
-
         }
-
     }
 
     public PlayerlistTracker(PlayerChunkMap map, EntityTracker entry) {
@@ -92,7 +87,6 @@ public class PlayerlistTracker extends PlayerChunkMap.EntityTracker {
             Bukkit.getPluginManager().callEvent(
                     new NPCLinkToPlayerEvent(((NPCHolder) tracker).getNPC(), lastUpdatedPlayer.getBukkitEntity()));
         }
-
     }
 
     @Override
@@ -116,11 +110,8 @@ public class PlayerlistTracker extends PlayerChunkMap.EntityTracker {
                 } catch (Throwable e) {
                     e.printStackTrace();
                 }
-
             }
-
         }
-
         super.updatePlayer(entityplayer);
     }
 
@@ -130,7 +121,6 @@ public class PlayerlistTracker extends PlayerChunkMap.EntityTracker {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         return 0;
     }
 
@@ -140,7 +130,6 @@ public class PlayerlistTracker extends PlayerChunkMap.EntityTracker {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         return false;
     }
 
@@ -150,7 +139,6 @@ public class PlayerlistTracker extends PlayerChunkMap.EntityTracker {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         return null;
     }
 
@@ -160,7 +148,6 @@ public class PlayerlistTracker extends PlayerChunkMap.EntityTracker {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         return 0;
     }
 
@@ -180,9 +167,7 @@ public class PlayerlistTracker extends PlayerChunkMap.EntityTracker {
                 TRACKING_MAP_SETTER = NMS.getFirstSetter(EntityTracker.class, Map.class);
                 TRACKING_MAP_GETTER = NMS.getFirstGetter(EntityTracker.class, Map.class);
             }
-
         } catch (Exception e) {
         }
-
     }
 }
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ArmorStandController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ArmorStandController.java
index f893a30e4..5a96a17ad 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ArmorStandController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ArmorStandController.java
@@ -82,7 +82,6 @@ public class ArmorStandController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -94,7 +93,6 @@ public class ArmorStandController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -112,7 +110,6 @@ public class ArmorStandController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ArmorStandNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -132,7 +129,6 @@ public class ArmorStandController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -141,7 +137,6 @@ public class ArmorStandController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
     }
 }
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/BatController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/BatController.java
index ffc0b1479..5115bacde 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/BatController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/BatController.java
@@ -59,7 +59,6 @@ public class BatController extends MobEntityController {
             if (npc != null) {
                 setAsleep(false);
             }
-
         }
 
         @Override
@@ -82,7 +81,6 @@ public class BatController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -96,7 +94,6 @@ public class BatController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -107,7 +104,6 @@ public class BatController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -125,7 +121,6 @@ public class BatController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new BatNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -160,7 +155,6 @@ public class BatController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -177,10 +171,8 @@ public class BatController extends MobEntityController {
                 if (npc.useMinecraftAI()) {
                     super.mobTick();
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/BeeController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/BeeController.java
index c273d90ee..5d422ef73 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/BeeController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/BeeController.java
@@ -78,7 +78,6 @@ public class BeeController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -92,7 +91,6 @@ public class BeeController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -103,7 +101,6 @@ public class BeeController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -121,7 +118,6 @@ public class BeeController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new BeeNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -156,7 +152,6 @@ public class BeeController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -173,10 +168,8 @@ public class BeeController extends MobEntityController {
                 if (npc.useMinecraftAI()) {
                     super.mobTick();
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/BlazeController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/BlazeController.java
index cba71f6b8..3c4ce8293 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/BlazeController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/BlazeController.java
@@ -78,7 +78,6 @@ public class BlazeController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -92,7 +91,6 @@ public class BlazeController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -103,7 +101,6 @@ public class BlazeController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -121,7 +118,6 @@ public class BlazeController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new BlazeNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -156,7 +152,6 @@ public class BlazeController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -170,7 +165,6 @@ public class BlazeController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CatController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CatController.java
index 8a4d03c30..8b1923de6 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CatController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CatController.java
@@ -72,7 +72,6 @@ public class CatController extends MobEntityController {
                 super.a(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::a);
         }
 
@@ -81,7 +80,6 @@ public class CatController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -106,7 +104,6 @@ public class CatController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -120,7 +117,6 @@ public class CatController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -131,7 +127,6 @@ public class CatController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -151,7 +146,6 @@ public class CatController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -159,7 +153,6 @@ public class CatController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new CatNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -194,7 +187,6 @@ public class CatController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -217,7 +209,6 @@ public class CatController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CaveSpiderController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CaveSpiderController.java
index 04976b510..d93223cb5 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CaveSpiderController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CaveSpiderController.java
@@ -70,7 +70,6 @@ public class CaveSpiderController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -95,7 +94,6 @@ public class CaveSpiderController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -109,7 +107,6 @@ public class CaveSpiderController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -120,7 +117,6 @@ public class CaveSpiderController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -140,7 +136,6 @@ public class CaveSpiderController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -148,7 +143,6 @@ public class CaveSpiderController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new CaveSpiderNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -183,7 +177,6 @@ public class CaveSpiderController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -206,7 +199,6 @@ public class CaveSpiderController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -223,7 +215,6 @@ public class CaveSpiderController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, justCreated);
             }
-
         }
     }
 }
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ChickenController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ChickenController.java
index 6ce8793b8..d2f2a6298 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ChickenController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ChickenController.java
@@ -72,7 +72,6 @@ public class ChickenController extends MobEntityController {
                 super.a(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::a);
         }
 
@@ -81,7 +80,6 @@ public class ChickenController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -106,7 +104,6 @@ public class ChickenController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -120,7 +117,6 @@ public class ChickenController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -131,7 +127,6 @@ public class ChickenController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -151,7 +146,6 @@ public class ChickenController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -159,7 +153,6 @@ public class ChickenController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ChickenNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -194,7 +187,6 @@ public class ChickenController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -217,7 +209,6 @@ public class ChickenController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -225,7 +216,6 @@ public class ChickenController extends MobEntityController {
             if (npc != null) {
                 this.eggLayTime = 100; // egg timer
             }
-
             super.movementTick();
         }
 
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CodController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CodController.java
index 1a074f9c2..2408a7786 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CodController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CodController.java
@@ -70,7 +70,6 @@ public class CodController extends MobEntityController {
                 this.oldMoveController = this.moveController;
                 this.moveController = new ControllerMove(this);
             }
-
         }
 
         @Override
@@ -83,7 +82,6 @@ public class CodController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -118,7 +116,6 @@ public class CodController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -132,7 +129,6 @@ public class CodController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -143,7 +139,6 @@ public class CodController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -162,11 +157,9 @@ public class CodController extends MobEntityController {
                 if (!NMSImpl.moveFish(npc, this, vec3d)) {
                     super.e(vec3d);
                 }
-
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -174,7 +167,6 @@ public class CodController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new CodNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -209,7 +201,6 @@ public class CodController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -231,23 +222,18 @@ public class CodController extends MobEntityController {
                 if (!npc.useMinecraftAI()) {
                     NMSImpl.setNotInSchool(this);
                 }
-
                 NMSImpl.updateMinecraftAIState(npc, this);
                 if (npc.useMinecraftAI() && this.moveController != this.oldMoveController) {
                     this.moveController = this.oldMoveController;
                 }
-
                 if (!npc.useMinecraftAI() && this.moveController == this.oldMoveController) {
                     this.moveController = new PlayerControllerMove(this);
                 }
-
             }
-
             super.mobTick();
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -256,12 +242,10 @@ public class CodController extends MobEntityController {
             if (npc != null) {
                 this.v = false;
             }
-
             super.movementTick();
             if (npc != null) {
                 this.v = lastInWater;
             }
-
         }
 
         @Override
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CowController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CowController.java
index 78db8370c..a50130273 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CowController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CowController.java
@@ -76,7 +76,6 @@ public class CowController extends MobEntityController {
                 super.a(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::a);
         }
 
@@ -85,7 +84,6 @@ public class CowController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -120,7 +118,6 @@ public class CowController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -134,7 +131,6 @@ public class CowController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -145,7 +141,6 @@ public class CowController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -165,7 +160,6 @@ public class CowController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -173,7 +167,6 @@ public class CowController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new CowNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -208,7 +201,6 @@ public class CowController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -231,7 +223,6 @@ public class CowController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CreeperController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CreeperController.java
index 912882d45..21cf28576 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CreeperController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/CreeperController.java
@@ -73,7 +73,6 @@ public class CreeperController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -98,7 +97,6 @@ public class CreeperController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -112,7 +110,6 @@ public class CreeperController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -123,7 +120,6 @@ public class CreeperController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -143,7 +139,6 @@ public class CreeperController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -151,7 +146,6 @@ public class CreeperController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new CreeperNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -186,7 +180,6 @@ public class CreeperController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -194,7 +187,6 @@ public class CreeperController extends MobEntityController {
             if (npc == null || !npc.isProtected()) {
                 super.ignite();
             }
-
         }
 
         @Override
@@ -217,7 +209,6 @@ public class CreeperController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -232,7 +223,6 @@ public class CreeperController extends MobEntityController {
             if (npc == null || allowPowered) {
                 super.onLightningStrike(entitylightning);
             }
-
         }
 
         public void setAllowPowered(boolean allowPowered) {
@@ -246,7 +236,6 @@ public class CreeperController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, justCreated);
             }
-
         }
     }
 }
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/DolphinController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/DolphinController.java
index fa140353c..dc18342a4 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/DolphinController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/DolphinController.java
@@ -71,7 +71,6 @@ public class DolphinController extends MobEntityController {
                 this.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED)
                         .setValue(this.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED).getBaseValue() / 10);
             }
-
         }
 
         @Override
@@ -84,7 +83,6 @@ public class DolphinController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -114,7 +112,6 @@ public class DolphinController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -128,7 +125,6 @@ public class DolphinController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -139,7 +135,6 @@ public class DolphinController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -158,11 +153,9 @@ public class DolphinController extends MobEntityController {
                 if (!NMSImpl.moveFish(npc, this, vec3d, dt())) {
                     super.e(vec3d);
                 }
-
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -170,7 +163,6 @@ public class DolphinController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new DolphinNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -205,7 +197,6 @@ public class DolphinController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -233,7 +224,6 @@ public class DolphinController extends MobEntityController {
             if (npc != null && npc.isProtected()) {
                 inProtectedTick = true;
             }
-
             super.tick();
             inProtectedTick = false;
             if (npc != null) {
@@ -241,14 +231,11 @@ public class DolphinController extends MobEntityController {
                 if (npc.useMinecraftAI() && this.moveController != this.oldMoveController) {
                     this.moveController = this.oldMoveController;
                 }
-
                 if (!npc.useMinecraftAI() && this.moveController == this.oldMoveController) {
                     this.moveController = new PlayerControllerMove(this);
                 }
-
                 npc.update();
             }
-
         }
     }
 }
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/DrownedController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/DrownedController.java
index 48bbb6b93..acd93fbd6 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/DrownedController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/DrownedController.java
@@ -70,7 +70,6 @@ public class DrownedController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -95,7 +94,6 @@ public class DrownedController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -109,7 +107,6 @@ public class DrownedController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -120,7 +117,6 @@ public class DrownedController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -140,7 +136,6 @@ public class DrownedController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -148,7 +143,6 @@ public class DrownedController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new DrownedNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -183,7 +177,6 @@ public class DrownedController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -206,7 +199,6 @@ public class DrownedController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EnderDragonController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EnderDragonController.java
index a86cdb53c..7305b9593 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EnderDragonController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EnderDragonController.java
@@ -84,7 +84,6 @@ public class EnderDragonController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -98,7 +97,6 @@ public class EnderDragonController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -109,7 +107,6 @@ public class EnderDragonController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -127,7 +124,6 @@ public class EnderDragonController extends MobEntityController {
             if (getDragonControllerManager().a().getControllerPhase() == DragonControllerPhase.HOVER) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -141,7 +137,6 @@ public class EnderDragonController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new EnderDragonNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -176,7 +171,6 @@ public class EnderDragonController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -190,25 +184,20 @@ public class EnderDragonController extends MobEntityController {
                 npc.update();
                 NMSImpl.updateMinecraftAIState(npc, this);
             }
-
             if (npc != null && !npc.useMinecraftAI()) {
                 if (getDragonControllerManager().a().getControllerPhase() == DragonControllerPhase.DYING) {
                     setHealth(0F);
                     return;
                 }
-
                 if (this.d < 0) {
                     for (int i = 0; i < this.c.length; ++i) {
                         this.c[i][0] = this.yaw;
                         this.c[i][1] = this.locY();
                     }
-
                 }
-
                 if (++this.d == this.c.length) {
                     this.d = 0;
                 }
-
                 this.c[this.d][0] = this.yaw;
                 this.c[this.d][1] = this.locY();
 
@@ -221,22 +210,18 @@ public class EnderDragonController extends MobEntityController {
                     children[j].lastY = children[j].F = vec3.y;
                     children[j].lastZ = children[j].G = vec3.z;
                 }
-
                 if (getRidingPassenger() != null) {
                     yaw = getRidingPassenger().getBukkitYaw() - 180;
                 }
-
                 Vec3D mot = getMot();
                 if (mot.getX() != 0 || mot.getY() != 0 || mot.getZ() != 0) {
                     mot = mot.d(0.98, 0.98, 0.98);
                     if (getRidingPassenger() == null) {
                         yaw = Util.getDragonYaw(getBukkitEntity(), mot.x, mot.z);
                     }
-
                     setPosition(locX() + mot.getX(), locY() + mot.getY(), locZ() + mot.getZ());
                     setMot(mot);
                 }
-
                 if (npc.hasTrait(EnderDragonTrait.class) && npc.getOrAddTrait(EnderDragonTrait.class).isDestroyWalls()
                         && NMSImpl.ENDERDRAGON_CHECK_WALLS != null) {
                     for (int i = 0; i < 3; i++) {
@@ -246,11 +231,8 @@ public class EnderDragonController extends MobEntityController {
                         } catch (Throwable e) {
                             e.printStackTrace();
                         }
-
                     }
-
                 }
-
                 if (npc.data().get(NPC.Metadata.COLLIDABLE, false)) {
                     try {
                         KNOCKBACK.invoke(this, this.world.getEntities(this,
@@ -264,13 +246,10 @@ public class EnderDragonController extends MobEntityController {
                     } catch (Throwable t) {
                         t.printStackTrace();
                     }
-
                 }
-
             } else {
                 super.movementTick();
             }
-
         }
 
         @Override
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EndermanController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EndermanController.java
index 5f116d878..6004f0792 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EndermanController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EndermanController.java
@@ -70,7 +70,6 @@ public class EndermanController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -102,7 +101,6 @@ public class EndermanController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -116,7 +114,6 @@ public class EndermanController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -127,7 +124,6 @@ public class EndermanController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -147,7 +143,6 @@ public class EndermanController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -155,7 +150,6 @@ public class EndermanController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new EndermanNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -190,7 +184,6 @@ public class EndermanController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -213,7 +206,6 @@ public class EndermanController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -230,7 +222,6 @@ public class EndermanController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, justCreated);
             }
-
         }
     }
 }
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EndermiteController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EndermiteController.java
index ed1ba7443..b3511d465 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EndermiteController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EndermiteController.java
@@ -70,7 +70,6 @@ public class EndermiteController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -95,7 +94,6 @@ public class EndermiteController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -109,7 +107,6 @@ public class EndermiteController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -120,7 +117,6 @@ public class EndermiteController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -140,7 +136,6 @@ public class EndermiteController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -148,7 +143,6 @@ public class EndermiteController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new EndermiteNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -183,7 +177,6 @@ public class EndermiteController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -206,7 +199,6 @@ public class EndermiteController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -223,7 +215,6 @@ public class EndermiteController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, justCreated);
             }
-
         }
     }
 }
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EntityHumanNPC.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EntityHumanNPC.java
index 5e578ef72..37d376860 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EntityHumanNPC.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EntityHumanNPC.java
@@ -88,7 +88,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         } else {
             skinTracker = null;
         }
-
     }
 
     @Override
@@ -96,7 +95,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         if (npc == null || !npc.isFlyable()) {
             super.a(d0, flag, block, blockposition);
         }
-
     }
 
     @Override
@@ -129,7 +127,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         if (npc != null) {
             Util.callCollisionEvent(npc, entity.getBukkitEntity());
         }
-
     }
 
     @Override
@@ -143,7 +140,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
             Bukkit.getScheduler().runTask(CitizensAPI.getPlugin(),
                     (Runnable) () -> EntityHumanNPC.this.velocityChanged = true);
         }
-
         return damaged;
     }
 
@@ -174,7 +170,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         } else {
             NMSImpl.flyingMoveLogic(this, vec3d);
         }
-
     }
 
     @Override
@@ -182,7 +177,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
             NMSImpl.setBukkitEntity(this, new PlayerNPC(this));
         }
-
         return super.getBukkitEntity();
     }
 
@@ -216,7 +210,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         if (skinName == null) {
             skinName = npc.getName();
         }
-
         return skinName.toLowerCase();
     }
 
@@ -241,7 +234,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         if (vector != null) {
             super.h(vector.getX(), vector.getY(), vector.getZ());
         }
-
     }
 
     @Override
@@ -259,12 +251,10 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         } catch (IOException e) {
             // swallow
         }
-
         AttributeInstance range = getAttributeInstance(GenericAttributes.FOLLOW_RANGE);
         if (range == null) {
             range = getAttributeMap().b(GenericAttributes.FOLLOW_RANGE);
         }
-
         range.setValue(Setting.DEFAULT_PATHFINDING_RANGE.asDouble());
         controllerJump = new PlayerControllerJump(this);
         controllerMove = new PlayerControllerMove(this);
@@ -302,11 +292,9 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
                 jump();
                 jumpTicks = 10;
             }
-
         } else {
             jumpTicks = 0;
         }
-
         aZ *= 0.98F;
         bb *= 0.98F;
         moveWithFallDamage(new Vec3D(this.aZ, this.ba, this.bb)); // movement method
@@ -314,7 +302,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         if (jumpTicks > 0) {
             jumpTicks--;
         }
-
     }
 
     private void moveWithFallDamage(Vec3D vec) {
@@ -323,7 +310,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         if (!npc.isProtected()) {
             a(this.locY() - y, onGround);
         }
-
     }
 
     @Override
@@ -332,7 +318,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
             super.playerTick();
             return;
         }
-
         entityBaseTick();
         boolean navigating = npc.getNavigator().isNavigating() || controllerMove.b();
         if (!navigating && getBukkitEntity() != null
@@ -341,20 +326,16 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
                 && (!npc.isProtected() || SpigotUtil.checkYSafe(locY(), getBukkitEntity().getWorld()))) {
             moveWithFallDamage(new Vec3D(0, 0, 0));
         }
-
         Vec3D mot = getMot();
         if (Math.abs(mot.getX()) < EPSILON && Math.abs(mot.getY()) < EPSILON && Math.abs(mot.getZ()) < EPSILON) {
             setMot(new Vec3D(0, 0, 0));
         }
-
         if (navigating) {
             if (!NMSImpl.isNavigationFinished(navigation)) {
                 NMSImpl.updateNavigation(navigation);
             }
-
             moveOnCurrentHeading();
         }
-
         updateAI();
         collideNearby();
     }
@@ -411,16 +392,12 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
             } else {
                 axisalignedbb = this.getBoundingBox().grow(1.0, 0.5, 1.0);
             }
-
             for (Entity entity : this.world.getEntities(this, axisalignedbb)) {
                 if (!entity.dead) {
                     entity.pickup(this);
                 }
-
             }
-
         }
-
     }
 
     public void updateAI() {
@@ -442,17 +419,13 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
                 if (cache != null && !cache.isEmpty()) {
                     this.getAttributeMap().a(cache.a(slot));
                 }
-
                 if (equipment != null && !equipment.isEmpty()) {
                     this.getAttributeMap().b(equipment.a(slot));
                 }
-
                 itemChanged = true;
             }
-
             equipmentCache.put(slot, equipment);
         }
-
         if (!itemChanged)
             return;
         Location current = getBukkitEntity().getLocation(packetLocationCache);
@@ -461,7 +434,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         for (EnumItemSlot slot : EnumItemSlot.values()) {
             packets[i++] = new PacketPlayOutEntityEquipment(getId(), slot, getEquipment(slot));
         }
-
         NMSImpl.sendPacketsNearby(getBukkitEntity(), current, packets);
     }
 
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EvokerController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EvokerController.java
index 82d85648f..fbc923476 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EvokerController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EvokerController.java
@@ -64,7 +64,6 @@ public class EvokerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -89,7 +88,6 @@ public class EvokerController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -103,7 +101,6 @@ public class EvokerController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -114,7 +111,6 @@ public class EvokerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -134,7 +130,6 @@ public class EvokerController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -142,7 +137,6 @@ public class EvokerController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new EvokerNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -177,7 +171,6 @@ public class EvokerController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -200,7 +193,6 @@ public class EvokerController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/FoxController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/FoxController.java
index 1a880178c..a5224b903 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/FoxController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/FoxController.java
@@ -66,7 +66,6 @@ public class FoxController extends MobEntityController {
                 super.a(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::a);
         }
 
@@ -75,7 +74,6 @@ public class FoxController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -100,7 +98,6 @@ public class FoxController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -114,7 +111,6 @@ public class FoxController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -125,7 +121,6 @@ public class FoxController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -145,7 +140,6 @@ public class FoxController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -153,7 +147,6 @@ public class FoxController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new FoxNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -188,7 +181,6 @@ public class FoxController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -211,7 +203,6 @@ public class FoxController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GhastController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GhastController.java
index ed4b59d3c..008b3690b 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GhastController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GhastController.java
@@ -72,7 +72,6 @@ public class GhastController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -86,7 +85,6 @@ public class GhastController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -97,7 +95,6 @@ public class GhastController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -115,7 +112,6 @@ public class GhastController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new GhastNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -150,7 +146,6 @@ public class GhastController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -169,7 +164,6 @@ public class GhastController extends MobEntityController {
                 npc.update();
                 NMSImpl.updateMinecraftAIState(npc, this);
             }
-
             super.mobTick();
         }
 
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GiantController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GiantController.java
index 0f3598384..04b3af0e8 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GiantController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GiantController.java
@@ -64,7 +64,6 @@ public class GiantController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -89,7 +88,6 @@ public class GiantController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -103,7 +101,6 @@ public class GiantController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -114,7 +111,6 @@ public class GiantController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -134,7 +130,6 @@ public class GiantController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -142,7 +137,6 @@ public class GiantController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new GiantNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -177,7 +171,6 @@ public class GiantController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -200,7 +193,6 @@ public class GiantController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -217,7 +209,6 @@ public class GiantController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, justCreated);
             }
-
         }
     }
 
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GuardianController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GuardianController.java
index 3137696e8..5b92d98c4 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GuardianController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GuardianController.java
@@ -64,7 +64,6 @@ public class GuardianController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -89,7 +88,6 @@ public class GuardianController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -103,7 +101,6 @@ public class GuardianController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -114,7 +111,6 @@ public class GuardianController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -134,7 +130,6 @@ public class GuardianController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -142,7 +137,6 @@ public class GuardianController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new GuardianNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -177,7 +171,6 @@ public class GuardianController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -204,10 +197,8 @@ public class GuardianController extends MobEntityController {
                 } else {
                     super.movementTick();
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
@@ -224,7 +215,6 @@ public class GuardianController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, justCreated);
             }
-
         }
     }
 
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GuardianElderController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GuardianElderController.java
index 5f385a24c..360b9b11d 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GuardianElderController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/GuardianElderController.java
@@ -64,7 +64,6 @@ public class GuardianElderController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -89,7 +88,6 @@ public class GuardianElderController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -103,7 +101,6 @@ public class GuardianElderController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -114,7 +111,6 @@ public class GuardianElderController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -134,7 +130,6 @@ public class GuardianElderController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -142,7 +137,6 @@ public class GuardianElderController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new GuardianElderNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -177,7 +171,6 @@ public class GuardianElderController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -204,10 +197,8 @@ public class GuardianElderController extends MobEntityController {
                 } else {
                     super.movementTick();
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
@@ -224,7 +215,6 @@ public class GuardianElderController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, justCreated);
             }
-
         }
     }
 
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseController.java
index 044dc18a2..dec425e4a 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseController.java
@@ -72,7 +72,6 @@ public class HorseController extends MobEntityController {
                 horse.setDomestication(horse.getMaxDomestication());
                 baseMovementSpeed = this.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED).getValue();
             }
-
         }
 
         @Override
@@ -86,7 +85,6 @@ public class HorseController extends MobEntityController {
                 super.a(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::a);
         }
 
@@ -95,7 +93,6 @@ public class HorseController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -120,7 +117,6 @@ public class HorseController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -134,7 +130,6 @@ public class HorseController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -152,7 +147,6 @@ public class HorseController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -177,7 +171,6 @@ public class HorseController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -185,7 +178,6 @@ public class HorseController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new HorseNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -220,7 +212,6 @@ public class HorseController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -249,16 +240,13 @@ public class HorseController extends MobEntityController {
             } else {
                 riding = false;
             }
-
             if (riding) {
                 if (npc.getNavigator().isNavigating()) {
                     org.bukkit.entity.Entity basePassenger = passengers.get(0).getBukkitEntity();
                     NMS.look(basePassenger, yaw, pitch);
                 }
-
                 d(4, true); // datawatcher method
             }
-
             NMS.setStepHeight(getBukkitEntity(), 1);
             npc.update();
         }
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseDonkeyController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseDonkeyController.java
index eb60892f1..ea8a37977 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseDonkeyController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseDonkeyController.java
@@ -71,7 +71,6 @@ public class HorseDonkeyController extends MobEntityController {
                 ((Donkey) getBukkitEntity()).setDomestication(((Donkey) getBukkitEntity()).getMaxDomestication());
                 baseMovementSpeed = this.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED).getValue();
             }
-
         }
 
         @Override
@@ -85,7 +84,6 @@ public class HorseDonkeyController extends MobEntityController {
                 super.a(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::a);
         }
 
@@ -94,7 +92,6 @@ public class HorseDonkeyController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -119,7 +116,6 @@ public class HorseDonkeyController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -133,7 +129,6 @@ public class HorseDonkeyController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -151,7 +146,6 @@ public class HorseDonkeyController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -176,7 +170,6 @@ public class HorseDonkeyController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -184,7 +177,6 @@ public class HorseDonkeyController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new HorseDonkeyNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -219,7 +211,6 @@ public class HorseDonkeyController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -247,20 +238,16 @@ public class HorseDonkeyController extends MobEntityController {
                 } else {
                     riding = false;
                 }
-
                 if (riding) {
                     if (npc.getNavigator().isNavigating()) {
                         org.bukkit.entity.Entity basePassenger = passengers.get(0).getBukkitEntity();
                         NMS.look(basePassenger, yaw, pitch);
                     }
-
                     d(4, true); // datawatcher method
                 }
-
                 NMS.setStepHeight(getBukkitEntity(), 1);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseMuleController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseMuleController.java
index ee9c34868..817773da7 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseMuleController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseMuleController.java
@@ -71,7 +71,6 @@ public class HorseMuleController extends MobEntityController {
                 ((Mule) getBukkitEntity()).setDomestication(((Mule) getBukkitEntity()).getMaxDomestication());
                 baseMovementSpeed = this.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED).getValue();
             }
-
         }
 
         @Override
@@ -85,7 +84,6 @@ public class HorseMuleController extends MobEntityController {
                 super.a(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::a);
         }
 
@@ -94,7 +92,6 @@ public class HorseMuleController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -119,7 +116,6 @@ public class HorseMuleController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -133,7 +129,6 @@ public class HorseMuleController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -151,7 +146,6 @@ public class HorseMuleController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -176,7 +170,6 @@ public class HorseMuleController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -184,7 +177,6 @@ public class HorseMuleController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new HorseMuleNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -219,7 +211,6 @@ public class HorseMuleController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -247,20 +238,16 @@ public class HorseMuleController extends MobEntityController {
                 } else {
                     riding = false;
                 }
-
                 if (riding) {
                     if (npc.getNavigator().isNavigating()) {
                         org.bukkit.entity.Entity basePassenger = passengers.get(0).getBukkitEntity();
                         NMS.look(basePassenger, yaw, pitch);
                     }
-
                     d(4, true); // datawatcher method
                 }
-
                 NMS.setStepHeight(getBukkitEntity(), 1);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseSkeletonController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseSkeletonController.java
index f004c13a9..33a07479c 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseSkeletonController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseSkeletonController.java
@@ -72,7 +72,6 @@ public class HorseSkeletonController extends MobEntityController {
                         .setDomestication(((SkeletonHorse) getBukkitEntity()).getMaxDomestication());
                 baseMovementSpeed = this.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED).getValue();
             }
-
         }
 
         @Override
@@ -86,7 +85,6 @@ public class HorseSkeletonController extends MobEntityController {
                 super.a(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::a);
         }
 
@@ -95,7 +93,6 @@ public class HorseSkeletonController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -120,7 +117,6 @@ public class HorseSkeletonController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -134,7 +130,6 @@ public class HorseSkeletonController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -152,7 +147,6 @@ public class HorseSkeletonController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -177,7 +171,6 @@ public class HorseSkeletonController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -185,7 +178,6 @@ public class HorseSkeletonController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new HorseSkeletonNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -220,7 +212,6 @@ public class HorseSkeletonController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -248,20 +239,16 @@ public class HorseSkeletonController extends MobEntityController {
                 } else {
                     riding = false;
                 }
-
                 if (riding) {
                     if (npc.getNavigator().isNavigating()) {
                         org.bukkit.entity.Entity basePassenger = passengers.get(0).getBukkitEntity();
                         NMS.look(basePassenger, yaw, pitch);
                     }
-
                     d(4, true); // datawatcher method
                 }
-
                 NMS.setStepHeight(getBukkitEntity(), 1);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseZombieController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseZombieController.java
index 4a5fbd49e..5434e6434 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseZombieController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HorseZombieController.java
@@ -72,7 +72,6 @@ public class HorseZombieController extends MobEntityController {
                         .setDomestication(((ZombieHorse) getBukkitEntity()).getMaxDomestication());
                 baseMovementSpeed = this.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED).getValue();
             }
-
         }
 
         @Override
@@ -86,7 +85,6 @@ public class HorseZombieController extends MobEntityController {
                 super.a(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::a);
         }
 
@@ -95,7 +93,6 @@ public class HorseZombieController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -120,7 +117,6 @@ public class HorseZombieController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -134,7 +130,6 @@ public class HorseZombieController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -152,7 +147,6 @@ public class HorseZombieController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -177,7 +171,6 @@ public class HorseZombieController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -185,7 +178,6 @@ public class HorseZombieController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new HorseZombieNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -220,7 +212,6 @@ public class HorseZombieController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -248,20 +239,16 @@ public class HorseZombieController extends MobEntityController {
                 } else {
                     riding = false;
                 }
-
                 if (riding) {
                     if (npc.getNavigator().isNavigating()) {
                         org.bukkit.entity.Entity basePassenger = passengers.get(0).getBukkitEntity();
                         NMS.look(basePassenger, yaw, pitch);
                     }
-
                     d(4, true); // datawatcher method
                 }
-
                 NMS.setStepHeight(getBukkitEntity(), 1);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HumanController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HumanController.java
index c8a858376..6b6180fd1 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HumanController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/HumanController.java
@@ -35,11 +35,9 @@ public class HumanController extends AbstractEntityController {
         if (npc.requiresNameHologram()) {
             name = teamName;
         }
-
         if (Setting.USE_SCOREBOARD_TEAMS.asBoolean()) {
             npc.getOrAddTrait(ScoreboardTrait.class).createTeam(name);
         }
-
         final GameProfile profile = new GameProfile(uuid, name);
         final EntityHumanNPC handle = new EntityHumanNPC(nmsWorld.getServer().getServer(), nmsWorld, profile,
                 new PlayerInteractManager(nmsWorld), npc);
@@ -47,7 +45,6 @@ public class HumanController extends AbstractEntityController {
         if (skin != null) {
             skin.apply(handle);
         }
-
         Bukkit.getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(), () -> {
             if (getBukkitEntity() == null || !getBukkitEntity().isValid()
                     || getBukkitEntity() != handle.getBukkitEntity())
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/IllusionerController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/IllusionerController.java
index ba4942b3b..039c67e84 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/IllusionerController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/IllusionerController.java
@@ -64,7 +64,6 @@ public class IllusionerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -89,7 +88,6 @@ public class IllusionerController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -103,7 +101,6 @@ public class IllusionerController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -114,7 +111,6 @@ public class IllusionerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -134,7 +130,6 @@ public class IllusionerController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -142,7 +137,6 @@ public class IllusionerController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new IllusionerNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -177,7 +171,6 @@ public class IllusionerController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -200,7 +193,6 @@ public class IllusionerController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/IronGolemController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/IronGolemController.java
index f04d487be..020acdfd3 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/IronGolemController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/IronGolemController.java
@@ -64,7 +64,6 @@ public class IronGolemController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -89,7 +88,6 @@ public class IronGolemController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -103,7 +101,6 @@ public class IronGolemController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -114,7 +111,6 @@ public class IronGolemController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -134,7 +130,6 @@ public class IronGolemController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -142,7 +137,6 @@ public class IronGolemController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new IronGolemNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -177,7 +171,6 @@ public class IronGolemController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -200,7 +193,6 @@ public class IronGolemController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -217,7 +209,6 @@ public class IronGolemController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, justCreated);
             }
-
         }
     }
 
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/LlamaController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/LlamaController.java
index dee465ba6..31eaea038 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/LlamaController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/LlamaController.java
@@ -71,7 +71,6 @@ public class LlamaController extends MobEntityController {
                 ((Llama) getBukkitEntity()).setDomestication(((Llama) getBukkitEntity()).getMaxDomestication());
                 baseMovementSpeed = this.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED).getValue();
             }
-
         }
 
         @Override
@@ -85,7 +84,6 @@ public class LlamaController extends MobEntityController {
                 super.a(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::a);
         }
 
@@ -94,7 +92,6 @@ public class LlamaController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -119,7 +116,6 @@ public class LlamaController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -133,7 +129,6 @@ public class LlamaController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -151,7 +146,6 @@ public class LlamaController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -171,7 +165,6 @@ public class LlamaController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -179,7 +172,6 @@ public class LlamaController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new LlamaNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -214,7 +206,6 @@ public class LlamaController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -242,20 +233,16 @@ public class LlamaController extends MobEntityController {
                 } else {
                     riding = false;
                 }
-
                 if (riding) {
                     if (npc.getNavigator().isNavigating()) {
                         org.bukkit.entity.Entity basePassenger = passengers.get(0).getBukkitEntity();
                         NMS.look(basePassenger, yaw, pitch);
                     }
-
                     d(4, true); // datawatcher method
                 }
-
                 NMS.setStepHeight(getBukkitEntity(), 1);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/MagmaCubeController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/MagmaCubeController.java
index 7619cba98..ba46cc259 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/MagmaCubeController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/MagmaCubeController.java
@@ -62,7 +62,6 @@ public class MagmaCubeController extends MobEntityController {
                 this.oldMoveController = this.moveController;
                 this.moveController = new PlayerControllerMove(this);
             }
-
         }
 
         @Override
@@ -75,7 +74,6 @@ public class MagmaCubeController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -100,7 +98,6 @@ public class MagmaCubeController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -114,7 +111,6 @@ public class MagmaCubeController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -125,7 +121,6 @@ public class MagmaCubeController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -145,7 +140,6 @@ public class MagmaCubeController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -153,7 +147,6 @@ public class MagmaCubeController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new MagmaCubeNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -188,7 +181,6 @@ public class MagmaCubeController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -216,7 +208,6 @@ public class MagmaCubeController extends MobEntityController {
             if (npc == null) {
                 super.pickup(human);
             }
-
         }
 
         @Override
@@ -227,14 +218,11 @@ public class MagmaCubeController extends MobEntityController {
                 if (npc.useMinecraftAI() && this.moveController != this.oldMoveController) {
                     this.moveController = this.oldMoveController;
                 }
-
                 if (!npc.useMinecraftAI() && this.moveController == this.oldMoveController) {
                     this.moveController = new PlayerControllerMove(this);
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
@@ -244,7 +232,6 @@ public class MagmaCubeController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, justCreated);
             }
-
         }
     }
 
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/MobEntityController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/MobEntityController.java
index 9854366d8..36de1644b 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/MobEntityController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/MobEntityController.java
@@ -42,9 +42,7 @@ public abstract class MobEntityController extends AbstractEntityController {
             if (mob.getControllerLook().getClass() == ControllerLook.class) {
                 NMSImpl.setLookControl(mob, new PitchableLookControl(mob));
             }
-
         }
-
         entity.setPositionRotation(at.getX(), at.getY(), at.getZ(), at.getYaw(), at.getPitch());
         if (npc != null) {
             // entity.onGround isn't updated right away - we approximate here so
@@ -53,19 +51,15 @@ public abstract class MobEntityController extends AbstractEntityController {
             if (beneath.isSolid()) {
                 entity.onGround = true;
             }
-
             try {
                 UUID_FIELD.invoke(entity, npc.getUniqueId());
             } catch (Throwable e) {
                 e.printStackTrace();
             }
-
             if (Setting.USE_SCOREBOARD_TEAMS.asBoolean()) {
                 npc.getOrAddTrait(ScoreboardTrait.class).createTeam(npc.getUniqueId().toString());
             }
-
         }
-
         return entity.getBukkitEntity();
     }
 
@@ -76,7 +70,6 @@ public abstract class MobEntityController extends AbstractEntityController {
             ex.printStackTrace();
             return null;
         }
-
     }
 
     private static Constructor<?> getConstructor(Class<?> clazz) {
@@ -89,7 +82,6 @@ public abstract class MobEntityController extends AbstractEntityController {
         } catch (Exception ex) {
             throw new IllegalStateException("unable to find an entity constructor");
         }
-
     }
 
     private static final Map<Class<?>, Constructor<?>> CONSTRUCTOR_CACHE = new WeakHashMap<>();
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/MushroomCowController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/MushroomCowController.java
index 6611e4a16..c9b5fa45a 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/MushroomCowController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/MushroomCowController.java
@@ -68,7 +68,6 @@ public class MushroomCowController extends MobEntityController {
                 super.a(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::a);
         }
 
@@ -77,7 +76,6 @@ public class MushroomCowController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -109,7 +107,6 @@ public class MushroomCowController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -123,7 +120,6 @@ public class MushroomCowController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -134,7 +130,6 @@ public class MushroomCowController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -154,7 +149,6 @@ public class MushroomCowController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -162,7 +156,6 @@ public class MushroomCowController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new MushroomCowNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -197,7 +190,6 @@ public class MushroomCowController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -220,7 +212,6 @@ public class MushroomCowController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/OcelotController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/OcelotController.java
index 0d7eb3be5..3bb34292e 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/OcelotController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/OcelotController.java
@@ -67,7 +67,6 @@ public class OcelotController extends MobEntityController {
                 super.a(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::a);
         }
 
@@ -76,7 +75,6 @@ public class OcelotController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -101,7 +99,6 @@ public class OcelotController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -115,7 +112,6 @@ public class OcelotController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -126,7 +122,6 @@ public class OcelotController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -146,7 +141,6 @@ public class OcelotController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -154,7 +148,6 @@ public class OcelotController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new OcelotNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -189,7 +182,6 @@ public class OcelotController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -213,12 +205,10 @@ public class OcelotController extends MobEntityController {
             if (restorePose) {
                 this.setPose(old);
             }
-
             if (npc != null) {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PandaController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PandaController.java
index 321e9f4c8..a35e62b33 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PandaController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PandaController.java
@@ -66,7 +66,6 @@ public class PandaController extends MobEntityController {
                 super.a(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::a);
         }
 
@@ -75,7 +74,6 @@ public class PandaController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -100,7 +98,6 @@ public class PandaController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -114,7 +111,6 @@ public class PandaController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -125,7 +121,6 @@ public class PandaController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -145,7 +140,6 @@ public class PandaController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -153,7 +147,6 @@ public class PandaController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new PandaNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -188,7 +181,6 @@ public class PandaController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -211,7 +203,6 @@ public class PandaController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ParrotController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ParrotController.java
index cb32bf3d3..6eacc3ea4 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ParrotController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ParrotController.java
@@ -82,7 +82,6 @@ public class ParrotController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -96,7 +95,6 @@ public class ParrotController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -107,7 +105,6 @@ public class ParrotController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -125,7 +122,6 @@ public class ParrotController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ParrotNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -160,7 +156,6 @@ public class ParrotController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -177,10 +172,8 @@ public class ParrotController extends MobEntityController {
                 if (npc.useMinecraftAI()) {
                     super.mobTick();
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PhantomController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PhantomController.java
index 60fddf3b5..6e0451847 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PhantomController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PhantomController.java
@@ -66,7 +66,6 @@ public class PhantomController extends MobEntityController {
                 this.lookController = new ControllerLook(this);
                 // TODO: phantom pitch reversed
             }
-
         }
 
         @Override
@@ -79,7 +78,6 @@ public class PhantomController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -104,7 +102,6 @@ public class PhantomController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -118,7 +115,6 @@ public class PhantomController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -129,7 +125,6 @@ public class PhantomController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -149,7 +144,6 @@ public class PhantomController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -164,7 +158,6 @@ public class PhantomController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new PhantomNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -199,7 +192,6 @@ public class PhantomController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -229,19 +221,15 @@ public class PhantomController extends MobEntityController {
                     this.moveController = this.oldMoveController;
                     this.lookController = this.oldLookController;
                 }
-
                 if (!npc.useMinecraftAI() && this.moveController == this.oldMoveController) {
                     this.moveController = new PlayerControllerMove(this);
                     this.lookController = new ControllerLook(this);
                 }
-
                 if (npc.isProtected()) {
                     this.setOnFire(0);
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PigController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PigController.java
index b0a4f1d1f..1fa62517f 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PigController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PigController.java
@@ -67,7 +67,6 @@ public class PigController extends MobEntityController {
                 super.a(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::a);
         }
 
@@ -76,7 +75,6 @@ public class PigController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -101,7 +99,6 @@ public class PigController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -115,7 +112,6 @@ public class PigController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -126,7 +122,6 @@ public class PigController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -152,7 +147,6 @@ public class PigController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -160,7 +154,6 @@ public class PigController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new PigNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -195,7 +188,6 @@ public class PigController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -218,7 +210,6 @@ public class PigController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -233,7 +224,6 @@ public class PigController extends MobEntityController {
             if (npc == null) {
                 super.onLightningStrike(entitylightning);
             }
-
         }
     }
 
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PigZombieController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PigZombieController.java
index 1f40dd87b..a34569c2f 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PigZombieController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PigZombieController.java
@@ -64,7 +64,6 @@ public class PigZombieController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -89,7 +88,6 @@ public class PigZombieController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -103,7 +101,6 @@ public class PigZombieController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -114,7 +111,6 @@ public class PigZombieController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -134,7 +130,6 @@ public class PigZombieController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -142,7 +137,6 @@ public class PigZombieController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new PigZombieNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -177,7 +171,6 @@ public class PigZombieController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -200,7 +193,6 @@ public class PigZombieController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PillagerController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PillagerController.java
index cf1feac6e..faee39674 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PillagerController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PillagerController.java
@@ -66,7 +66,6 @@ public class PillagerController extends MobEntityController {
                 super.a(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::a);
         }
 
@@ -75,7 +74,6 @@ public class PillagerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -100,7 +98,6 @@ public class PillagerController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -114,7 +111,6 @@ public class PillagerController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -125,7 +121,6 @@ public class PillagerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -145,7 +140,6 @@ public class PillagerController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -153,7 +147,6 @@ public class PillagerController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new PillagerNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -188,7 +181,6 @@ public class PillagerController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -211,7 +203,6 @@ public class PillagerController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PolarBearController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PolarBearController.java
index 3cecc6a0f..c42367601 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PolarBearController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PolarBearController.java
@@ -64,7 +64,6 @@ public class PolarBearController extends MobEntityController {
                 super.a(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::a);
         }
 
@@ -83,7 +82,6 @@ public class PolarBearController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -97,7 +95,6 @@ public class PolarBearController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -108,7 +105,6 @@ public class PolarBearController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -126,7 +122,6 @@ public class PolarBearController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new PolarBearNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -161,7 +156,6 @@ public class PolarBearController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -176,7 +170,6 @@ public class PolarBearController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PufferFishController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PufferFishController.java
index f0a66398f..4c4dce8f3 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PufferFishController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/PufferFishController.java
@@ -67,7 +67,6 @@ public class PufferFishController extends MobEntityController {
                 this.oldMoveController = this.moveController;
                 this.moveController = new ControllerMove(this);
             }
-
         }
 
         @Override
@@ -80,7 +79,6 @@ public class PufferFishController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -122,7 +120,6 @@ public class PufferFishController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -136,7 +133,6 @@ public class PufferFishController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -147,7 +143,6 @@ public class PufferFishController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -166,11 +161,9 @@ public class PufferFishController extends MobEntityController {
                 if (!NMSImpl.moveFish(npc, this, vec3d)) {
                     super.e(vec3d);
                 }
-
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -178,7 +171,6 @@ public class PufferFishController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new PufferFishNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -213,7 +205,6 @@ public class PufferFishController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -237,14 +228,11 @@ public class PufferFishController extends MobEntityController {
                 if (npc.useMinecraftAI() && this.moveController != this.oldMoveController) {
                     this.moveController = this.oldMoveController;
                 }
-
                 if (!npc.useMinecraftAI() && this.moveController == this.oldMoveController) {
                     this.moveController = new PlayerControllerMove(this);
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
@@ -255,13 +243,11 @@ public class PufferFishController extends MobEntityController {
                 this.v = false;
                 setPuffState(0);
             }
-
             super.movementTick();
             if (npc != null) {
                 this.v = lastInWater;
                 setPuffState(lastPuffState);
             }
-
         }
 
         @Override
@@ -276,12 +262,10 @@ public class PufferFishController extends MobEntityController {
             if (npc != null) {
                 NMSImpl.resetPuffTicks(this);
             }
-
             super.tick();
             if (npc != null && npc.hasTrait(PufferFishTrait.class)) {
                 setPuffState(npc.getOrAddTrait(PufferFishTrait.class).getPuffState());
             }
-
         }
 
         private static float s(int i) {
@@ -293,7 +277,6 @@ public class PufferFishController extends MobEntityController {
                 default:
                     return 1.0F;
             }
-
         }
     }
 
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/RabbitController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/RabbitController.java
index eb2bf1e29..7cadde5ef 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/RabbitController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/RabbitController.java
@@ -67,7 +67,6 @@ public class RabbitController extends MobEntityController {
                 super.a(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::a);
         }
 
@@ -76,7 +75,6 @@ public class RabbitController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -101,7 +99,6 @@ public class RabbitController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -115,7 +112,6 @@ public class RabbitController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -126,7 +122,6 @@ public class RabbitController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -146,7 +141,6 @@ public class RabbitController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -154,7 +148,6 @@ public class RabbitController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new RabbitNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -194,7 +187,6 @@ public class RabbitController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -218,10 +210,8 @@ public class RabbitController extends MobEntityController {
                 if (npc.getNavigator().isNavigating()) {
                     NMS.setShouldJump(getBukkitEntity());
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
@@ -239,7 +229,6 @@ public class RabbitController extends MobEntityController {
                 this.datawatcher.set(NMSImpl.getRabbitTypeField(), i);
                 return;
             }
-
             super.setRabbitType(i);
         }
     }
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/RavagerController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/RavagerController.java
index a8feb27b6..8f7fee052 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/RavagerController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/RavagerController.java
@@ -66,7 +66,6 @@ public class RavagerController extends MobEntityController {
                 super.a(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::a);
         }
 
@@ -75,7 +74,6 @@ public class RavagerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -100,7 +98,6 @@ public class RavagerController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -114,7 +111,6 @@ public class RavagerController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -125,7 +121,6 @@ public class RavagerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -145,7 +140,6 @@ public class RavagerController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -153,7 +147,6 @@ public class RavagerController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new RavagerNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -188,7 +181,6 @@ public class RavagerController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -211,7 +203,6 @@ public class RavagerController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SalmonController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SalmonController.java
index 915224a31..7341abb9f 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SalmonController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SalmonController.java
@@ -64,7 +64,6 @@ public class SalmonController extends MobEntityController {
                 this.oldMoveController = this.moveController;
                 this.moveController = new ControllerMove(this);
             }
-
         }
 
         @Override
@@ -77,7 +76,6 @@ public class SalmonController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -112,7 +110,6 @@ public class SalmonController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -126,7 +123,6 @@ public class SalmonController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -137,7 +133,6 @@ public class SalmonController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -156,11 +151,9 @@ public class SalmonController extends MobEntityController {
                 if (!NMSImpl.moveFish(npc, this, vec3d)) {
                     super.e(vec3d);
                 }
-
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -168,7 +161,6 @@ public class SalmonController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SalmonNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -203,7 +195,6 @@ public class SalmonController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -227,18 +218,14 @@ public class SalmonController extends MobEntityController {
                 if (npc.useMinecraftAI() && this.moveController != this.oldMoveController) {
                     this.moveController = this.oldMoveController;
                 }
-
                 if (!npc.useMinecraftAI() && this.moveController == this.oldMoveController) {
                     this.moveController = new PlayerControllerMove(this);
                 }
-
             }
-
             super.mobTick();
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -247,12 +234,10 @@ public class SalmonController extends MobEntityController {
             if (npc != null) {
                 this.v = false;
             }
-
             super.movementTick();
             if (npc != null) {
                 this.v = lastInWater;
             }
-
         }
 
         @Override
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SheepController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SheepController.java
index a6496da11..648f26b5d 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SheepController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SheepController.java
@@ -66,7 +66,6 @@ public class SheepController extends MobEntityController {
                 super.a(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::a);
         }
 
@@ -75,7 +74,6 @@ public class SheepController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -100,7 +98,6 @@ public class SheepController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -114,7 +111,6 @@ public class SheepController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -125,7 +121,6 @@ public class SheepController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -145,7 +140,6 @@ public class SheepController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -153,7 +147,6 @@ public class SheepController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SheepNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -188,7 +181,6 @@ public class SheepController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -211,7 +203,6 @@ public class SheepController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ShulkerController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ShulkerController.java
index 842fd8e48..ca83ed8a1 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ShulkerController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ShulkerController.java
@@ -65,7 +65,6 @@ public class ShulkerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -90,7 +89,6 @@ public class ShulkerController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -104,7 +102,6 @@ public class ShulkerController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -115,7 +112,6 @@ public class ShulkerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -135,7 +131,6 @@ public class ShulkerController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -143,7 +138,6 @@ public class ShulkerController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ShulkerNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -178,7 +172,6 @@ public class ShulkerController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -199,7 +192,6 @@ public class ShulkerController extends MobEntityController {
             if (npc == null || npc.useMinecraftAI()) {
                 super.movementTick();
             }
-
         }
 
         @Override
@@ -221,12 +213,10 @@ public class ShulkerController extends MobEntityController {
                 if (npc.useMinecraftAI()) {
                     super.tick();
                 }
-
                 npc.update();
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -236,7 +226,6 @@ public class ShulkerController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, justCreated);
             }
-
         }
     }
 
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SilverfishController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SilverfishController.java
index 947878798..a24d8216a 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SilverfishController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SilverfishController.java
@@ -64,7 +64,6 @@ public class SilverfishController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -89,7 +88,6 @@ public class SilverfishController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -103,7 +101,6 @@ public class SilverfishController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -114,7 +111,6 @@ public class SilverfishController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -134,7 +130,6 @@ public class SilverfishController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -142,7 +137,6 @@ public class SilverfishController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SilverfishNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -177,7 +171,6 @@ public class SilverfishController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -200,7 +193,6 @@ public class SilverfishController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -217,7 +209,6 @@ public class SilverfishController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, justCreated);
             }
-
         }
     }
 
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SkeletonController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SkeletonController.java
index 361dd5e7b..a4a4275f9 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SkeletonController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SkeletonController.java
@@ -64,7 +64,6 @@ public class SkeletonController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -89,7 +88,6 @@ public class SkeletonController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -103,7 +101,6 @@ public class SkeletonController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -114,7 +111,6 @@ public class SkeletonController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -134,7 +130,6 @@ public class SkeletonController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -142,7 +137,6 @@ public class SkeletonController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SkeletonNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -177,7 +171,6 @@ public class SkeletonController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -200,7 +193,6 @@ public class SkeletonController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -217,7 +209,6 @@ public class SkeletonController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, justCreated);
             }
-
         }
     }
 
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SkeletonStrayController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SkeletonStrayController.java
index c293a6a3d..2d3c30c75 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SkeletonStrayController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SkeletonStrayController.java
@@ -64,7 +64,6 @@ public class SkeletonStrayController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -89,7 +88,6 @@ public class SkeletonStrayController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -103,7 +101,6 @@ public class SkeletonStrayController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -114,7 +111,6 @@ public class SkeletonStrayController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -134,7 +130,6 @@ public class SkeletonStrayController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -142,7 +137,6 @@ public class SkeletonStrayController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new StrayNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -177,7 +171,6 @@ public class SkeletonStrayController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -200,7 +193,6 @@ public class SkeletonStrayController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -217,7 +209,6 @@ public class SkeletonStrayController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, justCreated);
             }
-
         }
     }
 
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SkeletonWitherController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SkeletonWitherController.java
index 5ae766f7e..d18782812 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SkeletonWitherController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SkeletonWitherController.java
@@ -64,7 +64,6 @@ public class SkeletonWitherController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -89,7 +88,6 @@ public class SkeletonWitherController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -103,7 +101,6 @@ public class SkeletonWitherController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -114,7 +111,6 @@ public class SkeletonWitherController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -134,7 +130,6 @@ public class SkeletonWitherController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -142,7 +137,6 @@ public class SkeletonWitherController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SkeletonWitherNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -177,7 +171,6 @@ public class SkeletonWitherController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -200,7 +193,6 @@ public class SkeletonWitherController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -217,7 +209,6 @@ public class SkeletonWitherController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, justCreated);
             }
-
         }
     }
 
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SlimeController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SlimeController.java
index 85c168e7f..8d08f4c0e 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SlimeController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SlimeController.java
@@ -62,7 +62,6 @@ public class SlimeController extends MobEntityController {
                 this.oldMoveController = this.moveController;
                 this.moveController = new PlayerControllerMove(this);
             }
-
         }
 
         @Override
@@ -75,7 +74,6 @@ public class SlimeController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -100,7 +98,6 @@ public class SlimeController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -114,7 +111,6 @@ public class SlimeController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -125,7 +121,6 @@ public class SlimeController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -145,7 +140,6 @@ public class SlimeController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -153,7 +147,6 @@ public class SlimeController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SlimeNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -188,7 +181,6 @@ public class SlimeController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -216,7 +208,6 @@ public class SlimeController extends MobEntityController {
             if (npc == null) {
                 super.pickup(human);
             }
-
         }
 
         @Override
@@ -227,14 +218,11 @@ public class SlimeController extends MobEntityController {
                 if (npc.useMinecraftAI() && this.moveController != this.oldMoveController) {
                     this.moveController = this.oldMoveController;
                 }
-
                 if (!npc.useMinecraftAI() && this.moveController == this.oldMoveController) {
                     this.moveController = new PlayerControllerMove(this);
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
@@ -244,7 +232,6 @@ public class SlimeController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, justCreated);
             }
-
         }
     }
 
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SnowmanController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SnowmanController.java
index e796e71d2..9c8638342 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SnowmanController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SnowmanController.java
@@ -64,7 +64,6 @@ public class SnowmanController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -89,7 +88,6 @@ public class SnowmanController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -103,7 +101,6 @@ public class SnowmanController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -114,7 +111,6 @@ public class SnowmanController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -134,7 +130,6 @@ public class SnowmanController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -142,7 +137,6 @@ public class SnowmanController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SnowmanNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -177,7 +171,6 @@ public class SnowmanController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -200,7 +193,6 @@ public class SnowmanController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -217,7 +209,6 @@ public class SnowmanController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, justCreated);
             }
-
         }
     }
 
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SpiderController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SpiderController.java
index d28b18627..cf7b63c4b 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SpiderController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SpiderController.java
@@ -64,7 +64,6 @@ public class SpiderController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -89,7 +88,6 @@ public class SpiderController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -103,7 +101,6 @@ public class SpiderController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -114,7 +111,6 @@ public class SpiderController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -134,7 +130,6 @@ public class SpiderController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -142,7 +137,6 @@ public class SpiderController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SpiderNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -177,7 +171,6 @@ public class SpiderController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -200,7 +193,6 @@ public class SpiderController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -217,7 +209,6 @@ public class SpiderController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, justCreated);
             }
-
         }
     }
 
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SquidController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SquidController.java
index b8cbc4d69..062c09c0b 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SquidController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/SquidController.java
@@ -64,7 +64,6 @@ public class SquidController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -89,7 +88,6 @@ public class SquidController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -103,7 +101,6 @@ public class SquidController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -114,7 +111,6 @@ public class SquidController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -134,7 +130,6 @@ public class SquidController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -142,7 +137,6 @@ public class SquidController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SquidNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -177,7 +171,6 @@ public class SquidController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -200,7 +193,6 @@ public class SquidController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -217,7 +209,6 @@ public class SquidController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, justCreated);
             }
-
         }
     }
 
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/TraderLlamaController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/TraderLlamaController.java
index 366956f54..524787ece 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/TraderLlamaController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/TraderLlamaController.java
@@ -67,7 +67,6 @@ public class TraderLlamaController extends MobEntityController {
                 ((TraderLlama) getBukkitEntity())
                         .setDomestication(((TraderLlama) getBukkitEntity()).getMaxDomestication());
             }
-
         }
 
         @Override
@@ -81,7 +80,6 @@ public class TraderLlamaController extends MobEntityController {
                 super.a(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::a);
         }
 
@@ -90,7 +88,6 @@ public class TraderLlamaController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -115,7 +112,6 @@ public class TraderLlamaController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -129,7 +125,6 @@ public class TraderLlamaController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -140,7 +135,6 @@ public class TraderLlamaController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -160,7 +154,6 @@ public class TraderLlamaController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -168,7 +161,6 @@ public class TraderLlamaController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new TraderLlamaNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -203,7 +195,6 @@ public class TraderLlamaController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -228,19 +219,15 @@ public class TraderLlamaController extends MobEntityController {
                 if (npc.useMinecraftAI()) {
                     super.mobTick();
                 }
-
                 try {
                     if (bF != null) {
                         bF.invoke(this, 10); // DespawnDelay
                     }
-
                 } catch (Throwable e) {
                 }
-
                 NMS.setStepHeight(getBukkitEntity(), 1);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/TropicalFishController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/TropicalFishController.java
index 9863ac786..8435edddc 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/TropicalFishController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/TropicalFishController.java
@@ -64,7 +64,6 @@ public class TropicalFishController extends MobEntityController {
                 this.oldMoveController = this.moveController;
                 this.moveController = new ControllerMove(this);
             }
-
         }
 
         @Override
@@ -77,7 +76,6 @@ public class TropicalFishController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -112,7 +110,6 @@ public class TropicalFishController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -126,7 +123,6 @@ public class TropicalFishController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -137,7 +133,6 @@ public class TropicalFishController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -156,11 +151,9 @@ public class TropicalFishController extends MobEntityController {
                 if (!NMSImpl.moveFish(npc, this, vec3d)) {
                     super.e(vec3d);
                 }
-
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -168,7 +161,6 @@ public class TropicalFishController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new TropicalFishNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -203,7 +195,6 @@ public class TropicalFishController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -225,23 +216,18 @@ public class TropicalFishController extends MobEntityController {
                 if (!npc.useMinecraftAI()) {
                     NMSImpl.setNotInSchool(this);
                 }
-
                 NMSImpl.updateMinecraftAIState(npc, this);
                 if (npc.useMinecraftAI() && this.moveController != this.oldMoveController) {
                     this.moveController = this.oldMoveController;
                 }
-
                 if (!npc.useMinecraftAI() && this.moveController == this.oldMoveController) {
                     this.moveController = new PlayerControllerMove(this);
                 }
-
             }
-
             super.mobTick();
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -250,12 +236,10 @@ public class TropicalFishController extends MobEntityController {
             if (npc != null) {
                 this.v = false;
             }
-
             super.movementTick();
             if (npc != null) {
                 this.v = lastInWater;
             }
-
         }
 
         @Override
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/TurtleController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/TurtleController.java
index b62cb1bbe..c0390a5da 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/TurtleController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/TurtleController.java
@@ -66,7 +66,6 @@ public class TurtleController extends MobEntityController {
                 this.moveController = new ControllerMove(this);
                 this.bq = new EmptyControllerJump(this);
             }
-
         }
 
         @Override
@@ -79,7 +78,6 @@ public class TurtleController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -104,7 +102,6 @@ public class TurtleController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -118,7 +115,6 @@ public class TurtleController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -129,7 +125,6 @@ public class TurtleController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -148,11 +143,9 @@ public class TurtleController extends MobEntityController {
                 if (!NMSImpl.moveFish(npc, this, vec3d)) {
                     super.e(vec3d);
                 }
-
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -160,7 +153,6 @@ public class TurtleController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new TurtleNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -195,7 +187,6 @@ public class TurtleController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -220,15 +211,12 @@ public class TurtleController extends MobEntityController {
                     this.moveController = this.oldMoveController;
                     this.bq = this.oldJumpController;
                 }
-
                 if (!npc.useMinecraftAI() && this.moveController == this.oldMoveController) {
                     this.moveController = new PlayerControllerMove(this);
                     this.bq = new EmptyControllerJump(this);
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/VexController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/VexController.java
index 8c7b4b6f8..1ba6b4ee7 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/VexController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/VexController.java
@@ -53,7 +53,6 @@ public class VexController extends MobEntityController {
             if (npc != null) {
                 setNoGravity(true);
             }
-
         }
 
         @Override
@@ -76,7 +75,6 @@ public class VexController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -90,7 +88,6 @@ public class VexController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -101,7 +98,6 @@ public class VexController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -119,7 +115,6 @@ public class VexController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new VexNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -154,7 +149,6 @@ public class VexController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -169,7 +163,6 @@ public class VexController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/VillagerController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/VillagerController.java
index 284e52222..e693391ab 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/VillagerController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/VillagerController.java
@@ -65,7 +65,6 @@ public class VillagerController extends MobEntityController {
             if (npc != null) {
                 getAttributeInstance(GenericAttributes.MOVEMENT_SPEED).setValue(0.3);
             }
-
         }
 
         @Override
@@ -79,7 +78,6 @@ public class VillagerController extends MobEntityController {
                 super.a(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::a);
         }
 
@@ -88,7 +86,6 @@ public class VillagerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -105,9 +102,7 @@ public class VillagerController extends MobEntityController {
                 if (list != null) {
                     list.clear();
                 }
-
             }
-
             return super.a(entityhuman, enumhand);
         }
 
@@ -127,7 +122,6 @@ public class VillagerController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -141,7 +135,6 @@ public class VillagerController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -152,7 +145,6 @@ public class VillagerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -172,7 +164,6 @@ public class VillagerController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -181,7 +172,6 @@ public class VillagerController extends MobEntityController {
                 blockingATrade = false;
                 return true;
             }
-
             return super.et();
         }
 
@@ -190,7 +180,6 @@ public class VillagerController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new VillagerNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -225,7 +214,6 @@ public class VillagerController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -246,12 +234,10 @@ public class VillagerController extends MobEntityController {
             if (npc != null) {
                 NMSImpl.updateMinecraftAIState(npc, this);
             }
-
             super.mobTick();
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -266,7 +252,6 @@ public class VillagerController extends MobEntityController {
             if (npc == null) {
                 super.onLightningStrike(entitylightning);
             }
-
         }
     }
 
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/VindicatorController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/VindicatorController.java
index 1014f1329..a04f1f051 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/VindicatorController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/VindicatorController.java
@@ -66,7 +66,6 @@ public class VindicatorController extends MobEntityController {
                 super.a(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::a);
         }
 
@@ -75,7 +74,6 @@ public class VindicatorController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -100,7 +98,6 @@ public class VindicatorController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -114,7 +111,6 @@ public class VindicatorController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -125,7 +121,6 @@ public class VindicatorController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -145,7 +140,6 @@ public class VindicatorController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -153,7 +147,6 @@ public class VindicatorController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new VindicatorNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -188,7 +181,6 @@ public class VindicatorController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -211,7 +203,6 @@ public class VindicatorController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WanderingTraderController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WanderingTraderController.java
index 0962af70d..e7ea14e99 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WanderingTraderController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WanderingTraderController.java
@@ -77,7 +77,6 @@ public class WanderingTraderController extends MobEntityController {
                 super.a(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::a);
         }
 
@@ -86,7 +85,6 @@ public class WanderingTraderController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -103,9 +101,7 @@ public class WanderingTraderController extends MobEntityController {
                 if (list != null) {
                     list.clear();
                 }
-
             }
-
             return super.a(entityhuman, enumhand);
         }
 
@@ -125,7 +121,6 @@ public class WanderingTraderController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -139,7 +134,6 @@ public class WanderingTraderController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -150,7 +144,6 @@ public class WanderingTraderController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -170,7 +163,6 @@ public class WanderingTraderController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -179,7 +171,6 @@ public class WanderingTraderController extends MobEntityController {
                 blockingATrade = false;
                 return true;
             }
-
             return super.et();
         }
 
@@ -188,7 +179,6 @@ public class WanderingTraderController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new WanderingTraderNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -223,7 +213,6 @@ public class WanderingTraderController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         public boolean isBlockingTrades() {
@@ -248,20 +237,16 @@ public class WanderingTraderController extends MobEntityController {
             if (npc != null) {
                 NMSImpl.updateMinecraftAIState(npc, this);
             }
-
             super.mobTick();
             if (npc != null) {
                 try {
                     if (by != null) {
                         by.invoke(this, 10); // DespawnDelay
                     }
-
                 } catch (Throwable e) {
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
@@ -276,7 +261,6 @@ public class WanderingTraderController extends MobEntityController {
             if (npc == null) {
                 super.onLightningStrike(entitylightning);
             }
-
         }
 
         public void setBlockTrades(boolean blocked) {
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WitchController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WitchController.java
index 01c1db18d..052b08ab1 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WitchController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WitchController.java
@@ -63,7 +63,6 @@ public class WitchController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -88,7 +87,6 @@ public class WitchController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -102,7 +100,6 @@ public class WitchController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -113,7 +110,6 @@ public class WitchController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -133,7 +129,6 @@ public class WitchController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -141,7 +136,6 @@ public class WitchController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new WitchNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -176,7 +170,6 @@ public class WitchController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -199,7 +192,6 @@ public class WitchController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -216,7 +208,6 @@ public class WitchController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, justCreated);
             }
-
         }
     }
 
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WitherController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WitherController.java
index 19fb012d3..b598c408b 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WitherController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WitherController.java
@@ -72,7 +72,6 @@ public class WitherController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -86,7 +85,6 @@ public class WitherController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -97,7 +95,6 @@ public class WitherController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -115,7 +112,6 @@ public class WitherController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new WitherNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -150,7 +146,6 @@ public class WitherController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -178,10 +173,8 @@ public class WitherController extends MobEntityController {
                 if (npc.useMinecraftAI()) {
                     super.mobTick();
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WolfController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WolfController.java
index e58047d16..742c04f6a 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WolfController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/WolfController.java
@@ -68,7 +68,6 @@ public class WolfController extends MobEntityController {
                 super.a(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::a);
         }
 
@@ -77,7 +76,6 @@ public class WolfController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -102,7 +100,6 @@ public class WolfController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -116,7 +113,6 @@ public class WolfController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -127,7 +123,6 @@ public class WolfController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -147,7 +142,6 @@ public class WolfController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -155,7 +149,6 @@ public class WolfController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new WolfNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -190,7 +183,6 @@ public class WolfController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -213,7 +205,6 @@ public class WolfController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ZombieController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ZombieController.java
index 37bd50493..f9eb0d952 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ZombieController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ZombieController.java
@@ -64,7 +64,6 @@ public class ZombieController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -89,7 +88,6 @@ public class ZombieController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -103,7 +101,6 @@ public class ZombieController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -114,7 +111,6 @@ public class ZombieController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -134,7 +130,6 @@ public class ZombieController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -142,7 +137,6 @@ public class ZombieController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ZombieNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -177,7 +171,6 @@ public class ZombieController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -200,7 +193,6 @@ public class ZombieController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ZombieHuskController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ZombieHuskController.java
index c9e03da80..be788d306 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ZombieHuskController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ZombieHuskController.java
@@ -64,7 +64,6 @@ public class ZombieHuskController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -89,7 +88,6 @@ public class ZombieHuskController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -103,7 +101,6 @@ public class ZombieHuskController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -114,7 +111,6 @@ public class ZombieHuskController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -134,7 +130,6 @@ public class ZombieHuskController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -142,7 +137,6 @@ public class ZombieHuskController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ZombieHuskNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -177,7 +171,6 @@ public class ZombieHuskController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -200,7 +193,6 @@ public class ZombieHuskController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ZombieVillagerController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ZombieVillagerController.java
index e8d25775c..3c7f1828f 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ZombieVillagerController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ZombieVillagerController.java
@@ -64,7 +64,6 @@ public class ZombieVillagerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -89,7 +88,6 @@ public class ZombieVillagerController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -103,7 +101,6 @@ public class ZombieVillagerController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -114,7 +111,6 @@ public class ZombieVillagerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -134,7 +130,6 @@ public class ZombieVillagerController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -142,7 +137,6 @@ public class ZombieVillagerController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ZombieVillagerNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -177,7 +171,6 @@ public class ZombieVillagerController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -200,7 +193,6 @@ public class ZombieVillagerController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/AreaEffectCloudController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/AreaEffectCloudController.java
index fc5664c82..416a606d5 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/AreaEffectCloudController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/AreaEffectCloudController.java
@@ -67,7 +67,6 @@ public class AreaEffectCloudController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -79,7 +78,6 @@ public class AreaEffectCloudController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -92,7 +90,6 @@ public class AreaEffectCloudController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new AreaEffectCloudNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -112,7 +109,6 @@ public class AreaEffectCloudController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -122,7 +118,6 @@ public class AreaEffectCloudController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
     }
 }
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/BoatController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/BoatController.java
index f3b3dd34f..8c20bff3a 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/BoatController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/BoatController.java
@@ -80,7 +80,6 @@ public class BoatController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -92,7 +91,6 @@ public class BoatController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -105,7 +103,6 @@ public class BoatController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new BoatNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -125,7 +122,6 @@ public class BoatController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         private EnumStatus s() {
@@ -134,7 +130,6 @@ public class BoatController extends MobEntityController {
                 this.aD = getBoundingBox().maxY;
                 return entityboat_enumstatus;
             }
-
             if (u())
                 return EnumStatus.IN_WATER;
             float f = l();
@@ -142,7 +137,6 @@ public class BoatController extends MobEntityController {
                 this.aE = f;
                 return EnumStatus.ON_LAND;
             }
-
             return EnumStatus.IN_AIR;
         }
 
@@ -177,9 +171,7 @@ public class BoatController extends MobEntityController {
                         if (getRidingPassenger() instanceof EntityHuman) {
                             this.aE /= 2.0F;
                         }
-
                     }
-
                     Vec3D vec3d = getMot();
                     setMot(vec3d.x * this.aq, vec3d.y + d1, vec3d.z * this.aq);
                     this.as *= this.aq;
@@ -187,18 +179,14 @@ public class BoatController extends MobEntityController {
                         Vec3D vec3d1 = getMot();
                         setMot(vec3d1.x, (vec3d1.y + d2 * 0.0615D) * 0.75D, vec3d1.z);
                     }
-
                 }
-
                 move(EnumMoveType.SELF, getMot());
                 if (isVehicle()) {
                     this.yaw += this.as;
                 }
-
             } else {
                 super.tick();
             }
-
         }
 
         private boolean u() {
@@ -225,13 +213,9 @@ public class BoatController extends MobEntityController {
                                 this.aD = Math.max(f, this.aD);
                                 m = flag | (axisalignedbb.minY < f ? true : false);
                             }
-
                         }
-
                     }
-
                 }
-
             } catch (Throwable throwable1) {
                 throwable = throwable1;
                 throw throwable1;
@@ -243,12 +227,10 @@ public class BoatController extends MobEntityController {
                         } catch (Throwable throwable2) {
                             throwable.addSuppressed(throwable2);
                         }
-
                     } else {
                         blockposition_pooledblockposition.close();
                     }
             }
-
             return m;
         }
 
@@ -259,7 +241,6 @@ public class BoatController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, justCreated);
             }
-
         }
 
         private EnumStatus v() {
@@ -286,16 +267,11 @@ public class BoatController extends MobEntityController {
                                     EnumStatus entityboat_enumstatus = EnumStatus.UNDER_FLOWING_WATER;
                                     return entityboat_enumstatus;
                                 }
-
                                 flag = true;
                             }
-
                         }
-
                     }
-
                 }
-
                 return flag ? EnumStatus.UNDER_WATER : null;
             } catch (Throwable throwable1) {
                 throwable = throwable1;
@@ -308,12 +284,10 @@ public class BoatController extends MobEntityController {
                         } catch (Throwable throwable2) {
                             throwable.addSuppressed(throwable2);
                         }
-
                     } else {
                         blockposition_pooledblockposition.close();
                     }
             }
-
         }
     }
 }
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/DragonFireballController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/DragonFireballController.java
index 3f392d6c5..79eab08cc 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/DragonFireballController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/DragonFireballController.java
@@ -67,7 +67,6 @@ public class DragonFireballController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -79,7 +78,6 @@ public class DragonFireballController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -92,7 +90,6 @@ public class DragonFireballController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new DragonFireballNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -112,7 +109,6 @@ public class DragonFireballController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -122,11 +118,9 @@ public class DragonFireballController extends MobEntityController {
                 if (!npc.isProtected()) {
                     super.tick();
                 }
-
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -136,7 +130,6 @@ public class DragonFireballController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, justCreated);
             }
-
         }
     }
 }
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/EggController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/EggController.java
index 83758ee30..68a790948 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/EggController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/EggController.java
@@ -83,7 +83,6 @@ public class EggController extends AbstractEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -95,7 +94,6 @@ public class EggController extends AbstractEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -108,7 +106,6 @@ public class EggController extends AbstractEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new EggNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -128,7 +125,6 @@ public class EggController extends AbstractEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -138,11 +134,9 @@ public class EggController extends AbstractEntityController {
                 if (!npc.isProtected()) {
                     super.tick();
                 }
-
             } else {
                 super.tick();
             }
-
         }
     }
 }
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/EnderCrystalController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/EnderCrystalController.java
index 878b4a2a0..fc5f95247 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/EnderCrystalController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/EnderCrystalController.java
@@ -67,7 +67,6 @@ public class EnderCrystalController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -79,7 +78,6 @@ public class EnderCrystalController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -92,7 +90,6 @@ public class EnderCrystalController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new EnderCrystalNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -112,7 +109,6 @@ public class EnderCrystalController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -122,7 +118,6 @@ public class EnderCrystalController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
     }
 }
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/EnderPearlController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/EnderPearlController.java
index ec2c727a8..854f4fec6 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/EnderPearlController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/EnderPearlController.java
@@ -67,7 +67,6 @@ public class EnderPearlController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -79,7 +78,6 @@ public class EnderPearlController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -92,7 +90,6 @@ public class EnderPearlController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new EnderPearlNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -112,7 +109,6 @@ public class EnderPearlController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -122,11 +118,9 @@ public class EnderPearlController extends MobEntityController {
                 if (!npc.isProtected()) {
                     super.tick();
                 }
-
             } else {
                 super.tick();
             }
-
         }
     }
 }
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/EnderSignalController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/EnderSignalController.java
index 415ee982b..bec36fcd6 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/EnderSignalController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/EnderSignalController.java
@@ -67,7 +67,6 @@ public class EnderSignalController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -79,7 +78,6 @@ public class EnderSignalController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -92,7 +90,6 @@ public class EnderSignalController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new EnderSignalNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -112,7 +109,6 @@ public class EnderSignalController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -122,7 +118,6 @@ public class EnderSignalController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
     }
 }
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/EvokerFangsController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/EvokerFangsController.java
index 48985db4d..345a0da0b 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/EvokerFangsController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/EvokerFangsController.java
@@ -76,7 +76,6 @@ public class EvokerFangsController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -88,7 +87,6 @@ public class EvokerFangsController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -101,7 +99,6 @@ public class EvokerFangsController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new EvokerFangsNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -121,7 +118,6 @@ public class EvokerFangsController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -130,7 +126,6 @@ public class EvokerFangsController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
     }
 
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ExperienceOrbController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ExperienceOrbController.java
index 86040a23c..f9628744d 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ExperienceOrbController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ExperienceOrbController.java
@@ -61,7 +61,6 @@ public class ExperienceOrbController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -73,7 +72,6 @@ public class ExperienceOrbController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -86,7 +84,6 @@ public class ExperienceOrbController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ExperienceOrbNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -106,7 +103,6 @@ public class ExperienceOrbController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -116,7 +112,6 @@ public class ExperienceOrbController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
     }
 
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/FallingBlockController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/FallingBlockController.java
index 31a9637ac..b95a77f13 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/FallingBlockController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/FallingBlockController.java
@@ -82,7 +82,6 @@ public class FallingBlockController extends AbstractEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -94,7 +93,6 @@ public class FallingBlockController extends AbstractEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -107,7 +105,6 @@ public class FallingBlockController extends AbstractEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new FallingBlockNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -127,7 +124,6 @@ public class FallingBlockController extends AbstractEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -141,11 +137,9 @@ public class FallingBlockController extends AbstractEntityController {
                     setMot(mot);
                     move(EnumMoveType.SELF, mot);
                 }
-
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -155,7 +149,6 @@ public class FallingBlockController extends AbstractEntityController {
             } else {
                 NMSImpl.setSize(this, justCreated);
             }
-
         }
 
         private static final double EPSILON = 0.001;
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/FireworkController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/FireworkController.java
index a48c34ca9..09b1fac24 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/FireworkController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/FireworkController.java
@@ -61,7 +61,6 @@ public class FireworkController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -73,7 +72,6 @@ public class FireworkController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -86,7 +84,6 @@ public class FireworkController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new FireworkNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -106,7 +103,6 @@ public class FireworkController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -116,7 +112,6 @@ public class FireworkController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
     }
 
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/FishingHookController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/FishingHookController.java
index 98cfb1dd7..43de2564b 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/FishingHookController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/FishingHookController.java
@@ -75,7 +75,6 @@ public class FishingHookController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -87,7 +86,6 @@ public class FishingHookController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -100,7 +98,6 @@ public class FishingHookController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new FishingHookNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -120,7 +117,6 @@ public class FishingHookController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -145,12 +141,10 @@ public class FishingHookController extends MobEntityController {
                 } catch (IllegalAccessException e) {
                     e.printStackTrace();
                 }
-
                 npc.update();
             } else {
                 super.tick();
             }
-
         }
     }
 
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ItemController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ItemController.java
index 74f73e968..a283eba6a 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ItemController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ItemController.java
@@ -73,7 +73,6 @@ public class ItemController extends AbstractEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -85,7 +84,6 @@ public class ItemController extends AbstractEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -98,7 +96,6 @@ public class ItemController extends AbstractEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ItemNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -118,7 +115,6 @@ public class ItemController extends AbstractEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -126,7 +122,6 @@ public class ItemController extends AbstractEntityController {
             if (npc == null) {
                 super.pickup(entityhuman);
             }
-
         }
 
         @Override
@@ -136,7 +131,6 @@ public class ItemController extends AbstractEntityController {
             } else {
                 super.tick();
             }
-
         }
     }
 
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ItemFrameController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ItemFrameController.java
index c58fd72d0..492d6afc2 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ItemFrameController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ItemFrameController.java
@@ -73,7 +73,6 @@ public class ItemFrameController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -85,7 +84,6 @@ public class ItemFrameController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -98,7 +96,6 @@ public class ItemFrameController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ItemFrameNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -118,7 +115,6 @@ public class ItemFrameController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -133,7 +129,6 @@ public class ItemFrameController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
     }
 
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/LargeFireballController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/LargeFireballController.java
index d53fa9647..6bd1793b6 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/LargeFireballController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/LargeFireballController.java
@@ -61,7 +61,6 @@ public class LargeFireballController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -73,7 +72,6 @@ public class LargeFireballController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -86,7 +84,6 @@ public class LargeFireballController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new LargeFireballNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -106,7 +103,6 @@ public class LargeFireballController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -116,11 +112,9 @@ public class LargeFireballController extends MobEntityController {
                 if (!npc.isProtected()) {
                     super.tick();
                 }
-
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -130,7 +124,6 @@ public class LargeFireballController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, justCreated);
             }
-
         }
     }
 
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/LeashController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/LeashController.java
index 78eac759c..9579d2457 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/LeashController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/LeashController.java
@@ -61,7 +61,6 @@ public class LeashController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -73,7 +72,6 @@ public class LeashController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -86,7 +84,6 @@ public class LeashController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new LeashNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -106,7 +103,6 @@ public class LeashController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -121,7 +117,6 @@ public class LeashController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
     }
 
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/LlamaSpitController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/LlamaSpitController.java
index 0d95b3c95..71608809c 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/LlamaSpitController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/LlamaSpitController.java
@@ -80,7 +80,6 @@ public class LlamaSpitController extends AbstractEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -92,7 +91,6 @@ public class LlamaSpitController extends AbstractEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -105,7 +103,6 @@ public class LlamaSpitController extends AbstractEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new LlamaSpitNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -125,7 +122,6 @@ public class LlamaSpitController extends AbstractEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -135,11 +131,9 @@ public class LlamaSpitController extends AbstractEntityController {
                 if (!npc.isProtected()) {
                     super.tick();
                 }
-
             } else {
                 super.tick();
             }
-
         }
     }
 
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartChestController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartChestController.java
index ee4e11b24..b56133652 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartChestController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartChestController.java
@@ -61,7 +61,6 @@ public class MinecartChestController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -73,7 +72,6 @@ public class MinecartChestController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -86,7 +84,6 @@ public class MinecartChestController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new MinecartChestNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -106,7 +103,6 @@ public class MinecartChestController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -116,7 +112,6 @@ public class MinecartChestController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
     }
 
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartCommandController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartCommandController.java
index fa93f49b4..cc57bc33c 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartCommandController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartCommandController.java
@@ -61,7 +61,6 @@ public class MinecartCommandController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -73,7 +72,6 @@ public class MinecartCommandController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -86,7 +84,6 @@ public class MinecartCommandController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new MinecartCommandNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -106,7 +103,6 @@ public class MinecartCommandController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -116,7 +112,6 @@ public class MinecartCommandController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
     }
 
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartFurnaceController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartFurnaceController.java
index 46ed15f2f..e06009e84 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartFurnaceController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartFurnaceController.java
@@ -61,7 +61,6 @@ public class MinecartFurnaceController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -73,7 +72,6 @@ public class MinecartFurnaceController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -86,7 +84,6 @@ public class MinecartFurnaceController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new MinecartFurnaceNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -106,7 +103,6 @@ public class MinecartFurnaceController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -116,7 +112,6 @@ public class MinecartFurnaceController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
     }
 
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartHopperController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartHopperController.java
index 6e81c2f00..95e0f9c3a 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartHopperController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartHopperController.java
@@ -56,7 +56,6 @@ public class MinecartHopperController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -68,7 +67,6 @@ public class MinecartHopperController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -92,7 +90,6 @@ public class MinecartHopperController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -102,7 +99,6 @@ public class MinecartHopperController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
     }
 }
\ No newline at end of file
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartRideableController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartRideableController.java
index e90d6fb7e..fe0229a4a 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartRideableController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartRideableController.java
@@ -61,7 +61,6 @@ public class MinecartRideableController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -73,7 +72,6 @@ public class MinecartRideableController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -86,7 +84,6 @@ public class MinecartRideableController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new MinecartRideableNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -106,7 +103,6 @@ public class MinecartRideableController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -116,7 +112,6 @@ public class MinecartRideableController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
     }
 
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartSpawnerController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartSpawnerController.java
index 70d5928a7..5f2cefd7e 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartSpawnerController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartSpawnerController.java
@@ -56,7 +56,6 @@ public class MinecartSpawnerController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -68,7 +67,6 @@ public class MinecartSpawnerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -92,7 +90,6 @@ public class MinecartSpawnerController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -102,7 +99,6 @@ public class MinecartSpawnerController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
     }
 }
\ No newline at end of file
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartTNTController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartTNTController.java
index 468111869..88c3f04b7 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartTNTController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/MinecartTNTController.java
@@ -56,7 +56,6 @@ public class MinecartTNTController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -68,7 +67,6 @@ public class MinecartTNTController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -92,7 +90,6 @@ public class MinecartTNTController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -102,7 +99,6 @@ public class MinecartTNTController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
     }
 }
\ No newline at end of file
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/PaintingController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/PaintingController.java
index e45d84d6b..ce3579bba 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/PaintingController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/PaintingController.java
@@ -61,7 +61,6 @@ public class PaintingController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -73,7 +72,6 @@ public class PaintingController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -86,7 +84,6 @@ public class PaintingController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new PaintingNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -106,7 +103,6 @@ public class PaintingController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -121,7 +117,6 @@ public class PaintingController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
     }
 
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ShulkerBulletController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ShulkerBulletController.java
index 2e7139491..77553a2f7 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ShulkerBulletController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ShulkerBulletController.java
@@ -61,7 +61,6 @@ public class ShulkerBulletController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -73,7 +72,6 @@ public class ShulkerBulletController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -86,7 +84,6 @@ public class ShulkerBulletController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ShulkerBulletNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -106,7 +103,6 @@ public class ShulkerBulletController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -116,7 +112,6 @@ public class ShulkerBulletController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
     }
 
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/SmallFireballController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/SmallFireballController.java
index 983cc3ea6..a9d4fc68a 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/SmallFireballController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/SmallFireballController.java
@@ -61,7 +61,6 @@ public class SmallFireballController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -73,7 +72,6 @@ public class SmallFireballController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -86,7 +84,6 @@ public class SmallFireballController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SmallFireballNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -106,7 +103,6 @@ public class SmallFireballController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -116,11 +112,9 @@ public class SmallFireballController extends MobEntityController {
                 if (!npc.isProtected()) {
                     super.tick();
                 }
-
             } else {
                 super.tick();
             }
-
         }
     }
 
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/SnowballController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/SnowballController.java
index 051f9bf65..d0c5ba28d 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/SnowballController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/SnowballController.java
@@ -61,7 +61,6 @@ public class SnowballController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -73,7 +72,6 @@ public class SnowballController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -86,7 +84,6 @@ public class SnowballController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SnowballNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -106,7 +103,6 @@ public class SnowballController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -116,7 +112,6 @@ public class SnowballController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
     }
 
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/SpectralArrowController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/SpectralArrowController.java
index 4137d3287..1e8a27c59 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/SpectralArrowController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/SpectralArrowController.java
@@ -61,7 +61,6 @@ public class SpectralArrowController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -73,7 +72,6 @@ public class SpectralArrowController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -86,7 +84,6 @@ public class SpectralArrowController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SpectralArrowNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -106,7 +103,6 @@ public class SpectralArrowController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -116,7 +112,6 @@ public class SpectralArrowController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
     }
 
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/TNTPrimedController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/TNTPrimedController.java
index a9521b721..efc170b41 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/TNTPrimedController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/TNTPrimedController.java
@@ -61,7 +61,6 @@ public class TNTPrimedController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -73,7 +72,6 @@ public class TNTPrimedController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -86,7 +84,6 @@ public class TNTPrimedController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new TNTPrimedNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -106,7 +103,6 @@ public class TNTPrimedController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -116,7 +112,6 @@ public class TNTPrimedController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
     }
 
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ThrownExpBottleController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ThrownExpBottleController.java
index ccc0a27e1..9335654c6 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ThrownExpBottleController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ThrownExpBottleController.java
@@ -61,7 +61,6 @@ public class ThrownExpBottleController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -73,7 +72,6 @@ public class ThrownExpBottleController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -86,7 +84,6 @@ public class ThrownExpBottleController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ThrownExpBottleNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -106,7 +103,6 @@ public class ThrownExpBottleController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -116,11 +112,9 @@ public class ThrownExpBottleController extends MobEntityController {
                 if (!npc.isProtected()) {
                     super.tick();
                 }
-
             } else {
                 super.tick();
             }
-
         }
     }
 
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ThrownPotionController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ThrownPotionController.java
index 2eda23262..ce9cc5e18 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ThrownPotionController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ThrownPotionController.java
@@ -62,7 +62,6 @@ public class ThrownPotionController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -74,7 +73,6 @@ public class ThrownPotionController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -90,9 +88,7 @@ public class ThrownPotionController extends MobEntityController {
                 } else {
                     NMSImpl.setBukkitEntity(this, new SplashThrownPotionNPC(this));
                 }
-
             }
-
             return super.getBukkitEntity();
         }
 
@@ -112,7 +108,6 @@ public class ThrownPotionController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -122,7 +117,6 @@ public class ThrownPotionController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
     }
 
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ThrownTridentController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ThrownTridentController.java
index 49eb91a45..20bff29f5 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ThrownTridentController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/ThrownTridentController.java
@@ -61,7 +61,6 @@ public class ThrownTridentController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -73,7 +72,6 @@ public class ThrownTridentController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -86,7 +84,6 @@ public class ThrownTridentController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ThrownTridentNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -106,7 +103,6 @@ public class ThrownTridentController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -116,7 +112,6 @@ public class ThrownTridentController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
     }
 
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/TippedArrowController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/TippedArrowController.java
index f9640bf94..2cb4ab72c 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/TippedArrowController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/TippedArrowController.java
@@ -61,7 +61,6 @@ public class TippedArrowController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -73,7 +72,6 @@ public class TippedArrowController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -86,7 +84,6 @@ public class TippedArrowController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new TippedArrowNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -106,7 +103,6 @@ public class TippedArrowController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -116,7 +112,6 @@ public class TippedArrowController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
     }
 
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/WitherSkullController.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/WitherSkullController.java
index 7f4de0ae6..aec53a684 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/WitherSkullController.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/WitherSkullController.java
@@ -61,7 +61,6 @@ public class WitherSkullController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -73,7 +72,6 @@ public class WitherSkullController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -86,7 +84,6 @@ public class WitherSkullController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new WitherSkullNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -106,7 +103,6 @@ public class WitherSkullController extends MobEntityController {
             if (vector != null) {
                 super.h(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -116,7 +112,6 @@ public class WitherSkullController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
     }
 
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/CitizensBlockBreaker.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/CitizensBlockBreaker.java
index e9a72e4f8..f6663655d 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/CitizensBlockBreaker.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/CitizensBlockBreaker.java
@@ -48,7 +48,6 @@ public class CitizensBlockBreaker extends AbstractBlockBreaker {
             ItemStack current = getCurrentItem();
             return current != null ? current.canDestroySpecialBlock(block) : false;
         }
-
     }
 
     @Override
@@ -66,13 +65,10 @@ public class CitizensBlockBreaker extends AbstractBlockBreaker {
                 if (i > 0) {
                     f += i * i + 1;
                 }
-
             }
-
             if (handle.hasEffect(MobEffects.FASTER_DIG)) {
                 f *= 1.0F + (handle.getEffect(MobEffects.FASTER_DIG).getAmplifier() + 1) * 0.2F;
             }
-
             if (handle.hasEffect(MobEffects.SLOWER_DIG)) {
                 float f1 = 1.0F;
                 switch (handle.getEffect(MobEffects.SLOWER_DIG).getAmplifier()) {
@@ -89,20 +85,15 @@ public class CitizensBlockBreaker extends AbstractBlockBreaker {
                     default:
                         f1 = 8.1E-4F;
                 }
-
                 f *= f1;
             }
-
             if (handle.a(TagsFluid.WATER) && !EnchantmentManager.h(handle)) {
                 f /= 5.0F;
             }
-
         }
-
         if (!getHandle().onGround) {
             f /= 5.0F;
         }
-
         return f;
     }
 }
\ No newline at end of file
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/EmptyAdvancementDataPlayer.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/EmptyAdvancementDataPlayer.java
index bd17f5cfe..bea1cf80e 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/EmptyAdvancementDataPlayer.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/EmptyAdvancementDataPlayer.java
@@ -64,7 +64,6 @@ public class EmptyAdvancementDataPlayer extends AdvancementDataPlayer {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     private static final MethodHandle G = NMS.getGetter(AdvancementDataPlayer.class, "g");
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/ForwardingNPCHolder.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/ForwardingNPCHolder.java
index 382b554a9..8b1232189 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/ForwardingNPCHolder.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/ForwardingNPCHolder.java
@@ -17,7 +17,6 @@ public interface ForwardingNPCHolder extends NPCHolder, Entity {
                     () -> Joiner.on(' ').join("ForwardingNPCHolder with an improper bukkit entity", this, handle));
             return null;
         }
-
         return ((NPCHolder) handle).getNPC();
     }
 }
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/NMSImpl.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/NMSImpl.java
index 204f5122f..7c3087baa 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/NMSImpl.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/NMSImpl.java
@@ -337,21 +337,17 @@ public class NMSImpl implements NMSBridge {
                 viewDistance = (int) PLAYER_CHUNK_MAP_VIEW_DISTANCE_GETTER.invoke(chunkMap);
                 PLAYER_CHUNK_MAP_VIEW_DISTANCE_SETTER.invoke(chunkMap, -1);
             }
-
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         boolean success = getHandle(entity).world.addEntity(getHandle(entity), custom);
         try {
             if (chunkMap != null) {
                 PLAYER_CHUNK_MAP_VIEW_DISTANCE_SETTER.invoke(chunkMap, viewDistance);
             }
-
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         return success;
     }
 
@@ -367,14 +363,12 @@ public class NMSImpl implements NMSBridge {
         } else if (!handle.world.getPlayers().contains(handle)) {
             ((List) handle.world.getPlayers()).add(handle);
         }
-
         try {
             CHUNKMAP_UPDATE_PLAYER_STATUS.invoke(((WorldServer) handle.world).getChunkProvider().playerChunkMap, handle,
                     !remove);
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         // PlayerUpdateTask.addOrRemove(entity, remove);
     }
 
@@ -388,12 +382,10 @@ public class NMSImpl implements NMSBridge {
             PlayerAnimation.ARM_SWING.play(humanHandle.getBukkitEntity());
             return;
         }
-
         if (handle instanceof EntityInsentient) {
             ((EntityInsentient) handle).B(target);
             return;
         }
-
         AttributeInstance attackDamage = handle.getAttributeInstance(GenericAttributes.ATTACK_DAMAGE);
         float f = (float) (attackDamage == null ? 1 : attackDamage.getValue());
         int i = 0;
@@ -401,7 +393,6 @@ public class NMSImpl implements NMSBridge {
             f += EnchantmentManager.a(handle.getItemInMainHand(), target.getMonsterType());
             i += EnchantmentManager.a(Enchantments.KNOCKBACK, handle);
         }
-
         boolean flag = target.damageEntity(DamageSource.mobAttack(handle), f);
         if (!flag)
             return;
@@ -410,12 +401,10 @@ public class NMSImpl implements NMSBridge {
                     Math.cos(handle.yaw * Math.PI / 180.0F) * i * 0.5F);
             handle.setMot(handle.getMot().d(0.6, 1, 0.6));
         }
-
         int fireAspectLevel = EnchantmentManager.getFireAspectEnchantmentLevel(handle);
         if (fireAspectLevel > 0) {
             target.setOnFire(fireAspectLevel * 4);
         }
-
     }
 
     @Override
@@ -427,11 +416,9 @@ public class NMSImpl implements NMSBridge {
             } catch (Throwable t) {
                 t.printStackTrace();
             }
-
         } else if (handle instanceof EntityHumanNPC) {
             ((EntityHumanNPC) handle).getControllerMove().f = false;
         }
-
     }
 
     @Override
@@ -464,19 +451,14 @@ public class NMSImpl implements NMSBridge {
                         if (!changed && !ItemStack.matches(old, curr)) {
                             changed = true;
                         }
-
                         equipment.put(slot, curr);
                     }
-
                     if (changed) {
                         for (EnumItemSlot slot : EnumItemSlot.values()) {
                             agg.send(new PacketPlayOutEntityEquipment(handle.getId(), slot, equipment.get(slot)));
                         }
-
                     }
-
                 }
-
                 tracker.a();
             }
 
@@ -497,9 +479,7 @@ public class NMSImpl implements NMSBridge {
                     if (callback != null) {
                         callback.accept(entity);
                     }
-
                 }
-
                 linked.clear();
             }
         };
@@ -550,11 +530,9 @@ public class NMSImpl implements NMSBridge {
                     return null;
                 bserver = ((EnderDragonBattle) battleObject).bossBattle;
             }
-
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         if (bserver == null)
             return null;
         BossBar ret = Bukkit.createBossBar("", BarColor.BLUE, BarStyle.SEGMENTED_10);
@@ -563,7 +541,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         return ret;
     }
 
@@ -673,13 +650,11 @@ public class NMSImpl implements NMSBridge {
             if (SKULL_PROFILE_FIELD == null)
                 return null;
         }
-
         try {
             return (GameProfile) SKULL_PROFILE_FIELD.get(meta);
         } catch (Exception e) {
             return null;
         }
-
     }
 
     @Override
@@ -692,7 +667,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Exception e) {
             throw new CommandException(Messages.INVALID_SOUND);
         }
-
     }
 
     @Override
@@ -708,7 +682,6 @@ public class NMSImpl implements NMSBridge {
         EntityLiving handle = NMSImpl.getHandle((LivingEntity) npc.getEntity());
         if (handle == null) {
         }
-
         return DEFAULT_SPEED;
         // return (float)
         // handle.getAttributeInstance(GenericAttributes.d).getValue();
@@ -753,9 +726,7 @@ public class NMSImpl implements NMSBridge {
             } else {
                 ((EntityInsentient) raw).a(PathType.WATER, oldWater + 1F);
             }
-
         }
-
         navigation.q().b(params.hasExaminer(DoorExaminer.class));
         return new MCNavigator() {
             float lastSpeed;
@@ -768,7 +739,6 @@ public class NMSImpl implements NMSBridge {
                     PathPoint pp = navigation.k().a(i);
                     blocks.add(entity.getWorld().getBlockAt(pp.a, pp.b, pp.c));
                 }
-
                 return blocks;
             }
 
@@ -788,16 +758,13 @@ public class NMSImpl implements NMSBridge {
                     List<org.bukkit.block.Block> blocks = getBlocks(entity, navigation);
                     Util.sendBlockChanges(blocks, null);
                 }
-
                 if (oldWater >= 0) {
                     if (raw instanceof EntityPlayer) {
                         ((EntityHumanNPC) raw).a(PathType.WATER, oldWater);
                     } else {
                         ((EntityInsentient) raw).a(PathType.WATER, oldWater);
                     }
-
                 }
-
                 stopNavigation(navigation);
             }
 
@@ -812,15 +779,12 @@ public class NMSImpl implements NMSBridge {
                             SIZE_FIELD_SETTER.invoke(handle,
                                     new EntitySize(Math.min(0.99F, size.width), size.height, false));
                         }
-
                     } catch (Throwable e) {
                         e.printStackTrace();
                     }
-
                     if (!function.apply(navigation)) {
                         reason = CancelReason.STUCK;
                     }
-
                     try {
                         SIZE_FIELD_SETTER.invoke(handle, size);
                     } catch (Throwable e) {
@@ -828,14 +792,11 @@ public class NMSImpl implements NMSBridge {
                         // minecraft requires that an entity fit onto both blocks if width >= 1f, but we'd prefer to
                         // make it just fit on 1 so hack around it a bit.
                     }
-
                     lastSpeed = params.speed();
                 }
-
                 if (params.debug() && !NMSImpl.isNavigationFinished(navigation)) {
                     Util.sendBlockChanges(getBlocks(entity, navigation), Material.DANDELION);
                 }
-
                 navigation.a((double) params.speed());
                 return NMSImpl.isNavigationFinished(navigation);
             }
@@ -1048,37 +1009,30 @@ public class NMSImpl implements NMSBridge {
             if (zDiff < 0.0) {
                 yaw += Math.abs(180 - yaw) * 2;
             }
-
             if (handle instanceof EntityEnderDragon) {
                 yaw = Util.getDragonYaw(handle.getBukkitEntity(), xDiff, zDiff);
             } else {
                 yaw = yaw - 90;
             }
-
             if (headOnly) {
                 setHeadYaw(entity, (float) yaw);
             } else {
                 look(entity, (float) yaw, (float) pitch);
             }
-
             return;
         }
-
         if (handle instanceof EntityInsentient) {
             ((EntityInsentient) handle).getControllerLook().a(to.getX(), to.getY(), to.getZ(),
                     ((EntityInsentient) handle).dW(), ((EntityInsentient) handle).dU());
             while (((EntityLiving) handle).aK >= 180F) {
                 ((EntityLiving) handle).aK -= 360F;
             }
-
             while (((EntityLiving) handle).aK < -180F) {
                 ((EntityLiving) handle).aK += 360F;
             }
-
         } else if (handle instanceof EntityHumanNPC) {
             ((EntityHumanNPC) handle).getNPC().getOrAddTrait(RotationTrait.class).getPhysicalSession().rotateToFace(to);
         }
-
     }
 
     @Override
@@ -1091,22 +1045,18 @@ public class NMSImpl implements NMSBridge {
             } else {
                 look(from, to.getLocation(), false, true);
             }
-
         } else if (handle instanceof EntityInsentient) {
             ((EntityInsentient) handle).getControllerLook().a(target, ((EntityInsentient) handle).dW(),
                     ((EntityInsentient) handle).dU());
             while (((EntityLiving) handle).aK >= 180F) {
                 ((EntityLiving) handle).aK -= 360F;
             }
-
             while (((EntityLiving) handle).aK < -180F) {
                 ((EntityLiving) handle).aK += 360F;
             }
-
         } else if (handle instanceof EntityHumanNPC) {
             ((EntityHumanNPC) handle).getNPC().getOrAddTrait(RotationTrait.class).getPhysicalSession().rotateToFace(to);
         }
-
     }
 
     @Override
@@ -1148,9 +1098,7 @@ public class NMSImpl implements NMSBridge {
                         e.printStackTrace();
                         return super.getBukkitView();
                     }
-
                 }
-
                 return this.bukkitEntity;
             }
         };
@@ -1197,13 +1145,11 @@ public class NMSImpl implements NMSBridge {
             if (key == null || type == null) {
                 continue;
             }
-
             CITIZENS_ENTITY_TYPES.put(clazz, type);
             int code = ENTITY_REGISTRY.a(type);
             ENTITY_REGISTRY.put(code, key, type);
             return;
         }
-
         throw new IllegalArgumentException("unable to find valid entity superclass for class " + clazz.toString());
     }
 
@@ -1242,7 +1188,6 @@ public class NMSImpl implements NMSBridge {
             hook.hooked = null;
             hook.getBukkitEntity().remove();
         }
-
     }
 
     @Override
@@ -1257,7 +1202,6 @@ public class NMSImpl implements NMSBridge {
         if (getHandle(entity) instanceof EntityHumanNPC) {
             ((EntityHumanNPC) getHandle(entity)).setTracked(replace);
         }
-
     }
 
     @Override
@@ -1267,11 +1211,9 @@ public class NMSImpl implements NMSBridge {
         if (bodyYaw == null) {
             bodyYaw = handle.yaw;
         }
-
         if (pitch == null) {
             pitch = handle.pitch;
         }
-
         List<Packet<?>> toSend = Lists.newArrayList();
         if (position) {
             EntityTracker entry = ((WorldServer) handle.world).getChunkProvider().playerChunkMap.trackedEntities
@@ -1283,7 +1225,6 @@ public class NMSImpl implements NMSBridge {
                 e.printStackTrace();
                 return;
             }
-
             Vec3D pos = handle.getPositionVector().d(ete.b());
             toSend.add(new PacketPlayOutRelEntityMoveLook(handle.getId(), (short) pos.x, (short) pos.y, (short) pos.z,
                     (byte) (bodyYaw * 256.0F / 360.0F), (byte) (pitch * 256.0F / 360.0F), handle.onGround));
@@ -1291,11 +1232,9 @@ public class NMSImpl implements NMSBridge {
             toSend.add(new PacketPlayOutEntityLook(handle.getId(), (byte) (bodyYaw * 256.0F / 360.0F),
                     (byte) (pitch * 256.0F / 360.0F), handle.onGround));
         }
-
         if (headYaw != null) {
             toSend.add(new PacketPlayOutEntityHeadRotation(handle, (byte) (headYaw * 256.0F / 360.0F)));
         }
-
         sendPacketsNearby(null, from.getLocation(), toSend, 64);
     }
 
@@ -1319,7 +1258,6 @@ public class NMSImpl implements NMSBridge {
             entities[i] = (EntityPlayer) skinnable;
             i++;
         }
-
         NMSImpl.sendPacket(recipient,
                 new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.REMOVE_PLAYER, entities));
     }
@@ -1340,14 +1278,12 @@ public class NMSImpl implements NMSBridge {
         if (TEAM_FIELD == null) {
             TEAM_FIELD = NMS.getGetter(team.getClass(), "team");
         }
-
         try {
             ScoreboardTeam nmsTeam = (ScoreboardTeam) TEAM_FIELD.invoke(team);
             sendPacket(recipient, new PacketPlayOutScoreboardTeam(nmsTeam, mode));
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     @Override
@@ -1383,7 +1319,6 @@ public class NMSImpl implements NMSBridge {
         } else if (handle instanceof EntityHumanNPC) {
             ((EntityHumanNPC) handle).setMoveDestination(x, y, z, speed);
         }
-
     }
 
     @Override
@@ -1396,7 +1331,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable ex) {
             ex.printStackTrace();
         }
-
     }
 
     @Override
@@ -1416,7 +1350,6 @@ public class NMSImpl implements NMSBridge {
         if (!(handle instanceof EntityHuman)) {
             handle.aI = yaw;
         }
-
         handle.aK = yaw;
     }
 
@@ -1462,11 +1395,9 @@ public class NMSImpl implements NMSBridge {
                         npc.data().get("flying-nogravity-float"));
                 npc.data().remove("flying-nogravity-float");
             }
-
         } catch (Throwable t) {
             t.printStackTrace();
         }
-
     }
 
     @Override
@@ -1496,13 +1427,11 @@ public class NMSImpl implements NMSBridge {
             if (SET_PROFILE_METHOD == null)
                 return;
         }
-
         try {
             SET_PROFILE_METHOD.invoke(meta, profile);
         } catch (Throwable t) {
             t.printStackTrace();
         }
-
     }
 
     @Override
@@ -1516,7 +1445,6 @@ public class NMSImpl implements NMSBridge {
         } else if (handle instanceof EntityHumanNPC) {
             ((EntityHumanNPC) handle).setShouldJump();
         }
-
     }
 
     @Override
@@ -1528,7 +1456,6 @@ public class NMSImpl implements NMSBridge {
             SET_POSE.invoke(getHandle(ocelot), pose);
         } catch (Throwable e) {
         }
-
     }
 
     @Override
@@ -1541,14 +1468,12 @@ public class NMSImpl implements NMSBridge {
         if (entity instanceof Player) {
             ((Player) entity).setSneaking(sneaking);
         }
-
         EntityPose pose = sneaking ? EntityPose.CROUCHING : EntityPose.STANDING;
         try {
             ENTITY_SETPOSE.invoke(getHandle(entity), pose);
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     @Override
@@ -1579,7 +1504,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         return false;
     }
 
@@ -1592,7 +1516,6 @@ public class NMSImpl implements NMSBridge {
             field.invoke(null, ENTITY_REGISTRY.get());
         } catch (Throwable e) {
         }
-
     }
 
     @Override
@@ -1602,7 +1525,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     @Override
@@ -1618,7 +1540,6 @@ public class NMSImpl implements NMSBridge {
         if (RANDOM.nextFloat() <= 0.85F && (handle.isInWater() || handle.aC())) {
             handle.setMot(handle.getMot().getX(), handle.getMot().getY() + power, handle.getMot().getZ());
         }
-
     }
 
     @Override
@@ -1705,7 +1626,6 @@ public class NMSImpl implements NMSBridge {
                 menuType = Containers.CRAFTING;
                 break;
         }
-
         Container active = handle.activeContainer;
         handle.playerConnection
                 .sendPacket(new PacketPlayOutOpenWindow(active.windowId, menuType, new ChatComponentText(newTitle)));
@@ -1728,7 +1648,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     @Override
@@ -1740,10 +1659,8 @@ public class NMSImpl implements NMSBridge {
             if (en instanceof EntityHumanNPC) {
                 ((EntityHumanNPC) en).updatePathfindingRange(pathfindingRange);
             }
-
             return;
         }
-
         if (PATHFINDING_RANGE == null)
             return;
         EntityInsentient handle = (EntityInsentient) en;
@@ -1754,7 +1671,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     private static class CitizensInventoryAnvil extends CraftInventoryAnvil implements ForwardingInventory {
@@ -1864,7 +1780,6 @@ public class NMSImpl implements NMSBridge {
             e.printStackTrace();
             return;
         }
-
         float oldw = size.width;
         float oldl = size.height;
         cb.accept(datawatcherobject);
@@ -1872,7 +1787,6 @@ public class NMSImpl implements NMSBridge {
             living.setPosition(living.locX() - 0.01, living.locY(), living.locZ() - 0.01);
             living.setPosition(living.locX() + 0.01, living.locY(), living.locZ() + 0.01);
         }
-
     }
 
     public static void clearGoals(NPC npc, PathfinderGoalSelector... goalSelectors) {
@@ -1885,17 +1799,14 @@ public class NMSImpl implements NMSBridge {
                 if (!list.isEmpty()) {
                     npc.data().set("selector" + i, Lists.newArrayList(list));
                 }
-
                 list.clear();
             } catch (Exception e) {
                 Messaging.logTr(Messages.ERROR_CLEARING_GOALS, e.getLocalizedMessage());
             } catch (Throwable e) {
                 Messaging.logTr(Messages.ERROR_CLEARING_GOALS, e.getLocalizedMessage());
             }
-
             i++;
         }
-
     }
 
     private static CompoundTag convertNBT(net.minecraft.server.v1_15_R1.NBTTagCompound tag) {
@@ -1905,7 +1816,6 @@ public class NMSImpl implements NMSBridge {
         for (String key : tag.getKeys()) {
             tags.put(key, convertNBT(key, tag.get(key)));
         }
-
         return new CompoundTag("", tags);
     }
 
@@ -1936,10 +1846,8 @@ public class NMSImpl implements NMSBridge {
                 for (int i = 0; i < list.size(); i++) {
                     converted.add(convertNBT("", list.get(i)));
                 }
-
                 return new ListTag(key, tagType, converted);
             }
-
         } else if (base instanceof net.minecraft.server.v1_15_R1.NBTTagCompound)
             return convertNBT((net.minecraft.server.v1_15_R1.NBTTagCompound) base);
         else if (base instanceof net.minecraft.server.v1_15_R1.NBTTagEnd)
@@ -1957,7 +1865,6 @@ public class NMSImpl implements NMSBridge {
                 d0 = 0.01D;
                 entity.fallDistance = 0.0F;
             }
-
             double d1;
             float f1;
             double d2;
@@ -1973,19 +1880,16 @@ public class NMSImpl implements NMSBridge {
                     if (!entity.isNoGravity()) {
                         entity.setMot(entity.getMot().add(0.0D, -d0 / 4.0D, 0.0D));
                     }
-
                     vec3d4 = entity.getMot();
                     if (entity.positionChanged
                             && entity.e(vec3d4.x, vec3d4.y + 0.6000000238418579D - entity.locY() + d1, vec3d4.z)) {
                         entity.setMot(vec3d4.x, 0.30000001192092896D, vec3d4.z);
                     }
-
                 } else if (entity.isGliding()) {
                     vec3d4 = entity.getMot();
                     if (vec3d4.y > -0.5D) {
                         entity.fallDistance = 1.0F;
                     }
-
                     vec3d5 = entity.getLookDirection();
                     f1 = entity.pitch * 0.017453292F;
                     double d3 = Math.sqrt(vec3d5.x * vec3d5.x + vec3d5.z * vec3d5.z);
@@ -1999,17 +1903,14 @@ public class NMSImpl implements NMSBridge {
                         d5 = vec3d4.y * -0.1D * f3;
                         vec3d4 = vec3d4.add(vec3d5.x * d5 / d3, d5, vec3d5.z * d5 / d3);
                     }
-
                     if (f1 < 0.0F && d3 > 0.0D) {
                         d5 = d4 * -MathHelper.sin(f1) * 0.04D;
                         vec3d4 = vec3d4.add(-vec3d5.x * d5 / d3, d5 * 3.2D, -vec3d5.z * d5 / d3);
                     }
-
                     if (d3 > 0.0D) {
                         vec3d4 = vec3d4.add((vec3d5.x / d3 * d4 - vec3d4.x) * 0.1D, 0.0D,
                                 (vec3d5.z / d3 * d4 - vec3d4.z) * 0.1D);
                     }
-
                     entity.setMot(vec3d4.d(0.9900000095367432D, 0.9800000190734863D, 0.9900000095367432D));
                     entity.move(EnumMoveType.SELF, entity.getMot());
                     if (entity.positionChanged && !entity.world.isClientSide) {
@@ -2022,17 +1923,13 @@ public class NMSImpl implements NMSBridge {
                             } catch (Throwable e) {
                                 e.printStackTrace();
                             }
-
                             entity.damageEntity(DamageSource.FLY_INTO_WALL, f4);
                         }
-
                     }
-
                     if (entity.onGround && !entity.world.isClientSide && entity.getFlag(7)
                             && !CraftEventFactory.callToggleGlideEvent(entity, false).isCancelled()) {
                         entity.setFlag(7, false);
                     }
-
                 } else {
                     BlockPosition blockposition = new BlockPosition(entity.locX(), entity.getBoundingBox().minY - 0.5D,
                             entity.locZ());
@@ -2044,18 +1941,15 @@ public class NMSImpl implements NMSBridge {
                     } catch (Throwable e) {
                         e.printStackTrace();
                     }
-
                     entity.move(EnumMoveType.SELF, entity.getMot());
                     vec3d2 = entity.getMot();
                     try {
                         if ((entity.positionChanged || (boolean) JUMP_FIELD.invoke(entity)) && entity.isClimbing()) {
                             vec3d2 = new Vec3D(vec3d2.x, 0.2D, vec3d2.z);
                         }
-
                     } catch (Throwable e) {
                         e.printStackTrace();
                     }
-
                     double d7 = vec3d2.y;
                     if (entity.hasEffect(MobEffects.LEVITATION)) {
                         d7 += (0.05D * (entity.getEffect(MobEffects.LEVITATION).getAmplifier() + 1) - vec3d2.y) * 0.2D;
@@ -2066,14 +1960,11 @@ public class NMSImpl implements NMSBridge {
                         } else {
                             d7 = 0.0D;
                         }
-
                     } else if (!entity.isNoGravity()) {
                         d7 -= d0;
                     }
-
                     entity.setMot(vec3d2.x * f1, d7 * 0.9800000190734863D, vec3d2.z * f1);
                 }
-
             } else {
                 d1 = entity.locY();
                 f1 = entity.isSprinting() ? 0.9F : 0.8F;
@@ -2082,27 +1973,22 @@ public class NMSImpl implements NMSBridge {
                 if (f2 > 3.0F) {
                     f2 = 3.0F;
                 }
-
                 if (!entity.onGround) {
                     f2 *= 0.5F;
                 }
-
                 if (f2 > 0.0F) {
                     f1 += (0.54600006F - f1) * f2 / 3.0F;
                     f += (entity.dt() - f) * f2 / 3.0F;
                 }
-
                 if (entity.hasEffect(MobEffects.DOLPHINS_GRACE)) {
                     f1 = 0.96F;
                 }
-
                 entity.a(f, vec3d);
                 entity.move(EnumMoveType.SELF, entity.getMot());
                 vec3d5 = entity.getMot();
                 if (entity.positionChanged && entity.isClimbing()) {
                     vec3d5 = new Vec3D(vec3d5.x, 0.2D, vec3d5.z);
                 }
-
                 entity.setMot(vec3d5.d(f1, 0.800000011920929D, f1));
                 if (!entity.isNoGravity() && !entity.isSprinting()) {
                     vec3d2 = entity.getMot();
@@ -2111,20 +1997,15 @@ public class NMSImpl implements NMSBridge {
                     } else {
                         d2 = vec3d2.y - d0 / 16.0D;
                     }
-
                     entity.setMot(vec3d2.x, d2, vec3d2.z);
                 }
-
                 vec3d2 = entity.getMot();
                 if (entity.positionChanged
                         && entity.e(vec3d2.x, vec3d2.y + 0.6000000238418579D - entity.locY() + d1, vec3d2.z)) {
                     entity.setMot(vec3d2.x, 0.30000001192092896D, vec3d2.z);
                 }
-
             }
-
         }
-
         entity.aC = entity.aD;
         d0 = entity.locX() - entity.lastX;
         double d8 = entity.locZ() - entity.lastZ;
@@ -2133,7 +2014,6 @@ public class NMSImpl implements NMSBridge {
         if (f > 1.0F) {
             f = 1.0F;
         }
-
         entity.aD += (f - entity.aD) * 0.4F;
         entity.aE += entity.aD;
     }
@@ -2144,7 +2024,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         return null;
     }
 
@@ -2180,7 +2059,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         return null;
     }
 
@@ -2217,7 +2095,6 @@ public class NMSImpl implements NMSBridge {
         if (mat != null) {
             minecart.setDisplayBlock(Block.getByCombinedId(mat.getId()).getBlock().getBlockData());
         }
-
         minecart.setDisplayBlockOffset(offset);
     }
 
@@ -2234,7 +2111,6 @@ public class NMSImpl implements NMSBridge {
             handle.setMot(handle.getMot().a(0.9));
             return true;
         }
-
         return false;
     }
 
@@ -2245,7 +2121,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     public static void restoreGoals(NPC npc, PathfinderGoalSelector... goalSelectors) {
@@ -2260,16 +2135,13 @@ public class NMSImpl implements NMSBridge {
                 if (old != null) {
                     list.addAll(old);
                 }
-
             } catch (Exception e) {
                 Messaging.logTr(Messages.ERROR_RESTORING_GOALS, e.getLocalizedMessage());
             } catch (Throwable e) {
                 Messaging.logTr(Messages.ERROR_RESTORING_GOALS, e.getLocalizedMessage());
             }
-
             i++;
         }
-
     }
 
     public static void sendPacket(Player player, Packet<?> packet) {
@@ -2296,13 +2168,10 @@ public class NMSImpl implements NMSBridge {
                     || location.distanceSquared(player.getLocation(PACKET_CACHE_LOCATION)) > radius) {
                 continue;
             }
-
             for (Packet<?> packet : packets) {
                 NMSImpl.sendPacket(player, packet);
             }
-
         }
-
     }
 
     public static void sendPacketsNearby(Player from, Location location, Packet<?>... packets) {
@@ -2315,7 +2184,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     public static void setBukkitEntity(Entity entity, CraftEntity bukkitEntity) {
@@ -2324,7 +2192,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     public static void setLookControl(EntityInsentient mob, ControllerLook control) {
@@ -2333,7 +2200,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     public static void setNotInSchool(EntityFish entity) {
@@ -2341,11 +2207,9 @@ public class NMSImpl implements NMSBridge {
             if (ENTITY_FISH_NUM_IN_SCHOOL != null) {
                 ENTITY_FISH_NUM_IN_SCHOOL.invoke(entity, 2);
             }
-
         } catch (Throwable ex) {
             ex.printStackTrace();
         }
-
     }
 
     public static void setSize(Entity entity, boolean justCreated) {
@@ -2368,13 +2232,10 @@ public class NMSImpl implements NMSBridge {
                     float f = entitysize.width - entitysize1.width;
                     entity.move(EnumMoveType.SELF, new Vec3D(f, 0.0D, f));
                 }
-
             }
-
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     public static void stopNavigation(NavigationAbstract navigation) {
@@ -2392,7 +2253,6 @@ public class NMSImpl implements NMSBridge {
         } else if (entity instanceof EntityHumanNPC) {
             ((EntityHumanNPC) entity).updateAI();
         }
-
     }
 
     public static void updateMinecraftAIState(NPC npc, EntityInsentient entity) {
@@ -2405,7 +2265,6 @@ public class NMSImpl implements NMSBridge {
                 getBehaviorMap(entity).putAll(behavior);
                 npc.data().remove("behavior-map");
             }
-
         } else {
             NMSImpl.clearGoals(npc, entity.goalSelector, entity.targetSelector);
             TreeMap behaviorMap = getBehaviorMap(entity);
@@ -2413,9 +2272,7 @@ public class NMSImpl implements NMSBridge {
                 npc.data().set("behavior-map", new TreeMap(behaviorMap));
                 behaviorMap.clear();
             }
-
         }
-
     }
 
     public static void updateNavigation(NavigationAbstract navigation) {
@@ -2495,7 +2352,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             Messaging.logTr(Messages.ERROR_GETTING_ID_MAPPING, e.getMessage());
         }
-
         try {
             ENDERMAN_ANGRY = (DataWatcherObject<Boolean>) NMS.getField(EntityEnderman.class, "bw").get(null);
         } catch (IllegalArgumentException e) {
@@ -2503,6 +2359,5 @@ public class NMSImpl implements NMSBridge {
         } catch (IllegalAccessException e) {
             e.printStackTrace();
         }
-
     }
 }
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/PitchableLookControl.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/PitchableLookControl.java
index f49c53946..76c4c31d3 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/PitchableLookControl.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/PitchableLookControl.java
@@ -18,7 +18,6 @@ public class PitchableLookControl extends ControllerLook {
         } else {
             resetOnTick = () -> true;
         }
-
     }
 
     @Override
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/PlayerAnimationImpl.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/PlayerAnimationImpl.java
index af805681b..9317fd293 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/PlayerAnimationImpl.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/PlayerAnimationImpl.java
@@ -20,7 +20,6 @@ public class PlayerAnimationImpl {
             playDefaultAnimation(player, to, DEFAULTS.get(animation));
             return;
         }
-
         switch (animation) {
             case SNEAK:
                 player.getBukkitEntity().setSneaking(true);
@@ -51,7 +50,6 @@ public class PlayerAnimationImpl {
             default:
                 throw new UnsupportedOperationException();
         }
-
     }
 
     protected static void playDefaultAnimation(EntityPlayer player, Iterable<Player> to, int code) {
@@ -63,7 +61,6 @@ public class PlayerAnimationImpl {
         for (Player player : to) {
             NMSImpl.sendPacket(player, packet);
         }
-
     }
 
     private static EnumMap<PlayerAnimation, Integer> DEFAULTS = Maps.newEnumMap(PlayerAnimation.class);
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/PlayerControllerMove.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/PlayerControllerMove.java
index 38b5a9adb..b6a41257d 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/PlayerControllerMove.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/PlayerControllerMove.java
@@ -45,7 +45,6 @@ public class PlayerControllerMove extends ControllerMove {
                 this.a.bb = 0.0F;
                 return;
             }
-
             float f = (float) Math.toDegrees(Math.atan2(d1, d0)) - 90.0F;
             this.a.yaw = a(this.a.yaw, f, 90.0F);
             NMS.setHeadYaw(a.getBukkitEntity(), this.a.yaw);
@@ -63,11 +62,8 @@ public class PlayerControllerMove extends ControllerMove {
                 } else {
                     ((EntityInsentient) this.a).getControllerJump().jump();
                 }
-
             }
-
         }
-
     }
 
     @Override
@@ -85,18 +81,15 @@ public class PlayerControllerMove extends ControllerMove {
         if (f3 > f2) {
             f3 = f2;
         }
-
         if (f3 < -f2) {
             f3 = -f2;
         }
-
         float f4 = f + f3;
         if (f4 < 0.0F) {
             f4 += 360.0F;
         } else if (f4 > 360.0F) {
             f4 -= 360.0F;
         }
-
         return f4;
     }
 
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/PlayerNavigation.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/PlayerNavigation.java
index 6a18f9f94..800686169 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/PlayerNavigation.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/PlayerNavigation.java
@@ -88,26 +88,21 @@ public class PlayerNavigation extends NavigationAbstract {
         if (this.b.getType(var0).isAir()) {
             for (var2 = var0.down(); var2.getY() > 0 && this.b.getType(var2).isAir(); var2 = var2.down()) {
             }
-
             if (var2.getY() > 0)
                 return supera(var2.up(), var1);
             while (var2.getY() < this.b.getBuildHeight() && this.b.getType(var2).isAir()) {
                 var2 = var2.up();
             }
-
             var0 = var2;
         }
-
         if (!this.b.getType(var0).getMaterial().isBuildable())
             return supera(var0, var1);
         else {
             for (var2 = var0.up(); var2.getY() < this.b.getBuildHeight()
                     && this.b.getType(var2).getMaterial().isBuildable(); var2 = var2.up()) {
             }
-
             return supera(var2, var1);
         }
-
     }
 
     public void a(boolean var0) {
@@ -168,14 +163,10 @@ public class PlayerNavigation extends NavigationAbstract {
                                 || var19 == PathType.DAMAGE_OTHER)
                             return false;
                     }
-
                 }
-
             }
-
             return true;
         }
-
     }
 
     @Override
@@ -187,7 +178,6 @@ public class PlayerNavigation extends NavigationAbstract {
             if (!var0.a(this.c)) {
                 this.c = var0;
             }
-
             if (this.m())
                 return false;
             else {
@@ -201,11 +191,8 @@ public class PlayerNavigation extends NavigationAbstract {
                     this.g = var3;
                     return true;
                 }
-
             }
-
         }
-
     }
 
     @Override
@@ -226,7 +213,6 @@ public class PlayerNavigation extends NavigationAbstract {
                 this.q = var8.k();
                 this.r = var3;
             }
-
             return var8;
         }
     }
@@ -242,11 +228,9 @@ public class PlayerNavigation extends NavigationAbstract {
             if (var0.distanceSquared(this.g) < 2.25D) {
                 this.o();
             }
-
             this.f = this.e;
             this.g = var0;
         }
-
         if (this.c != null && !this.c.b()) {
             Vec3D var1 = this.c.g();
             if (var1.equals(this.h)) {
@@ -256,17 +240,14 @@ public class PlayerNavigation extends NavigationAbstract {
                 double var2 = var0.f(this.h);
                 this.k = this.a.dt() > 0.0F ? var2 / this.a.dt() * 1000.0D : 0.0D;
             }
-
             if (this.k > 0.0D && this.i > this.k * 3.0D) {
                 this.h = Vec3D.a;
                 this.i = 0L;
                 this.k = 0.0D;
                 this.o();
             }
-
             this.j = SystemUtils.getMonotonicMillis();
         }
-
     }
 
     @Override
@@ -294,11 +275,9 @@ public class PlayerNavigation extends NavigationAbstract {
                 if (var7 >= 0.0D) {
                     ++var19;
                 }
-
                 if (var9 >= 0.0D) {
                     ++var21;
                 }
-
                 var19 /= var7;
                 var21 /= var9;
                 int var23 = var7 < 0.0D ? -1 : 1;
@@ -319,14 +298,10 @@ public class PlayerNavigation extends NavigationAbstract {
                         var6 += var24;
                         var28 = var26 - var6;
                     }
-
                 } while (this.a(var5, MathHelper.floor(var0.y), var6, var2, var3, var4, var0, var7, var9));
-
             }
-
             return false;
         }
-
     }
 
     @Override
@@ -343,9 +318,7 @@ public class PlayerNavigation extends NavigationAbstract {
             if (var0.a(var2, this.c.e() - this.c.f())) {
                 this.j();
             }
-
         }
-
     }
 
     private boolean b(int var0, int var1, int var2, int var3, int var4, int var5, Vec3D var6, double var7,
@@ -362,7 +335,6 @@ public class PlayerNavigation extends NavigationAbstract {
             var13 = var11.getX() + 0.5D - var6.x;
             var15 = var11.getZ() + 0.5D - var6.z;
         } while (var13 * var7 + var15 * var9 < 0.0D || this.b.getType(var11).a(this.b, var11, PathMode.LAND));
-
         return false;
     }
 
@@ -372,7 +344,6 @@ public class PlayerNavigation extends NavigationAbstract {
         if (this.m) {
             this.j();
         }
-
         if (!this.m()) {
             Vec3D var0;
             if (this.a()) {
@@ -384,9 +355,7 @@ public class PlayerNavigation extends NavigationAbstract {
                         && MathHelper.floor(var0.z) == MathHelper.floor(var1.z)) {
                     this.c.c(this.c.f() + 1);
                 }
-
             }
-
             if (!this.m()) {
                 var0 = this.c.a(this.a);
                 BlockPosition var1 = new BlockPosition(var0);
@@ -394,9 +363,7 @@ public class PlayerNavigation extends NavigationAbstract {
                         this.b.getType(var1.down()).isAir() ? var0.y : PathfinderNormal.a(this.b, var1), var0.z,
                         this.d);
             }
-
         }
-
     }
 
     public void c(boolean var0) {
@@ -424,11 +391,8 @@ public class PlayerNavigation extends NavigationAbstract {
                     this.c.b(var0);
                     return;
                 }
-
             }
-
         }
-
     }
 
     @Override
@@ -455,11 +419,9 @@ public class PlayerNavigation extends NavigationAbstract {
                 this.n = this.b.getTime();
                 this.m = false;
             }
-
         } else {
             this.m = true;
         }
-
     }
 
     @Override
@@ -476,7 +438,6 @@ public class PlayerNavigation extends NavigationAbstract {
                 && Math.abs(this.a.locY() - var1.y) < 1.0D) {
             this.c.c(this.c.f() + 1);
         }
-
         this.a(var0);
     }
 
@@ -530,13 +491,9 @@ public class PlayerNavigation extends NavigationAbstract {
                     if (var2 != null && var1.b >= var2.b) {
                         this.c.a(var0 + 1, var2.a(var2.a, var1.b + 1, var2.c));
                     }
-
                 }
-
             }
-
         }
-
     }
 
     private int t() {
@@ -551,11 +508,9 @@ public class PlayerNavigation extends NavigationAbstract {
                 var1 = this.b.getType(new BlockPosition(this.a.locX(), var0, this.a.locZ())).getBlock();
                 ++var2;
             } while (var2 <= 16);
-
             return MathHelper.floor(this.a.locY());
         } else
             return MathHelper.floor(this.a.locY() + 0.5D);
-
     }
 
     private static EntityInsentient getDummyInsentient(EntityHumanNPC from, World world) {
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/PlayerPathfinder.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/PlayerPathfinder.java
index 1f118887c..1ce651c4f 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/PlayerPathfinder.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/PlayerPathfinder.java
@@ -74,7 +74,6 @@ public class PlayerPathfinder extends Pathfinder {
             var4 = var4.h;
             var3.add(0, var4);
         }
-
         return new PathEntity(var3, var1, var2);
     }
 
@@ -93,14 +92,12 @@ public class PlayerPathfinder extends Pathfinder {
             if (var6 >= var7) {
                 break;
             }
-
             PathPoint var8 = this.a.c();
             var8.i = true;
             var5.stream().filter(var2x -> (var8.c(var2x) <= var3)).forEach(PathDestination::e);
             if (var5.stream().anyMatch(PathDestination::f)) {
                 break;
             }
-
             if (var8.a(var0) < var2) {
                 int var9 = this.e.a(this.c, var8);
                 for (int var10 = 0; var10 < var9; ++var10) {
@@ -118,15 +115,10 @@ public class PlayerPathfinder extends Pathfinder {
                             var11.g = var11.e + var11.f;
                             this.a.a(var11);
                         }
-
                     }
-
                 }
-
             }
-
         }
-
         Stream var8;
         if (var5.stream().anyMatch(PathDestination::f)) {
             var8 = var5.stream().filter(PathDestination::f).map(var1x -> this.a(var1x.d(), var1.get(var1x), true))
@@ -134,7 +126,6 @@ public class PlayerPathfinder extends Pathfinder {
         } else {
             var8 = getFallbackDestinations(var1, var5);
         }
-
         Optional var9 = var8.findFirst();
         if (!var9.isPresent())
             return null;
@@ -142,7 +133,6 @@ public class PlayerPathfinder extends Pathfinder {
             PathEntity var10 = (PathEntity) var9.get();
             return var10;
         }
-
     }
 
     private float a(PathPoint var0, Set var1) {
@@ -153,7 +143,6 @@ public class PlayerPathfinder extends Pathfinder {
             var5 = var0.a(var6);
             var6.a(var5, var0);
         }
-
         return var2;
     }
 
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/PlayerPathfinderNormal.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/PlayerPathfinderNormal.java
index 9ec427aec..7eb8f8232 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/PlayerPathfinderNormal.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/PlayerPathfinderNormal.java
@@ -71,20 +71,16 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
         if (var4 == PathType.DOOR_WOOD_CLOSED && var1 && var2) {
             var4 = PathType.WALKABLE;
         }
-
         if (var4 == PathType.DOOR_OPEN && !var2) {
             var4 = PathType.BLOCKED;
         }
-
         if (var4 == PathType.RAIL && !(var0.getType(var3).getBlock() instanceof BlockMinecartTrackAbstract)
                 && !(var0.getType(var3.down()).getBlock() instanceof BlockMinecartTrackAbstract)) {
             var4 = PathType.FENCE;
         }
-
         if (var4 == PathType.LEAVES) {
             var4 = PathType.BLOCKED;
         }
-
         return var4;
     }
 
@@ -112,15 +108,12 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                 if (var4.a(var18) >= var4.a(var15)) {
                     var15 = var18;
                 }
-
             }
-
             if (var11 == PathType.OPEN && var4.a(var15) == 0.0F)
                 return PathType.OPEN;
             else
                 return var15;
         }
-
     }
 
     @Override
@@ -143,15 +136,12 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                 if (var4.a(var18) >= var4.a(var15)) {
                     var15 = var18;
                 }
-
             }
-
             if (var11 == PathType.OPEN && var4.a(var15) == 0.0F)
                 return PathType.OPEN;
             else
                 return var15;
         }
-
     }
 
     public PathType a(IBlockAccess var0, int var1, int var2, int var3, int var4, int var5, int var6, boolean var7,
@@ -167,14 +157,10 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                     if (var12 == 0 && var13 == 0 && var14 == 0) {
                         var10 = var18;
                     }
-
                     var9.add(var18);
                 }
-
             }
-
         }
-
         return var10;
     }
 
@@ -193,7 +179,6 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                 var7.l = var11;
                 var7.k = Math.max(var7.k, var12);
             }
-
             if ((var11 != PathType.WALKABLE)) {
                 if ((var7 == null || var7.k < 0.0F) && var3 > 0 && var11 != PathType.FENCE
                         && var11 != PathType.TRAPDOOR) {
@@ -210,11 +195,8 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                         if (!this.a.getCubes(this.b, var19)) {
                             var7 = null;
                         }
-
                     }
-
                 }
-
                 if (var11 == PathType.WATER && !this.e()) {
                     if (this.a(this.b, var0, var1 - 1, var2) != PathType.WATER)
                         return var7;
@@ -227,9 +209,7 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                         var7.l = var11;
                         var7.k = Math.max(var7.k, this.b.a(var11));
                     }
-
                 }
-
                 if (var11 == PathType.OPEN) {
                     AxisAlignedBB var15 = new AxisAlignedBB(var0 - var13 + 0.5D, var1 + 0.001D, var2 - var13 + 0.5D,
                             var0 + var13 + 0.5D, var1 + this.b.getHeight(), var2 + var13 + 0.5D);
@@ -243,9 +223,7 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                             var7.k = Math.max(var7.k, var12);
                             return var7;
                         }
-
                     }
-
                     int var16 = 0;
                     int var17 = var1;
                     while (var11 == PathType.OPEN) {
@@ -257,14 +235,12 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                             var18.k = -1.0F;
                             return var18;
                         }
-
                         var18 = this.a(var0, var1, var2);
                         if (var16++ >= this.b.bD()) {
                             var18.l = PathType.BLOCKED;
                             var18.k = -1.0F;
                             return var18;
                         }
-
                         var11 = this.a(this.b, var0, var1, var2);
                         var12 = this.b.a(var11);
                         if (var11 != PathType.OPEN && var12 >= 0.0F) {
@@ -273,22 +249,16 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                             var18.k = Math.max(var18.k, var12);
                             break;
                         }
-
                         if (var12 < 0.0F) {
                             var18.l = PathType.BLOCKED;
                             var18.k = -1.0F;
                             return var18;
                         }
-
                     }
-
                 }
-
             }
-
             return var7;
         }
-
     }
 
     private boolean a(PathPoint var0, PathPoint var1, PathPoint var2, PathPoint var3) {
@@ -312,50 +282,40 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
             } else {
                 var3 = MathHelper.d(Math.max(1.0F, this.b.H));
             }
-
         }
-
         double var5 = a(this.a, new BlockPosition(var1.a, var1.b, var1.c));
         PathPoint var7 = this.a(var1.a, var1.b, var1.c + 1, var3, var5, EnumDirection.SOUTH);
         if (var7 != null && !var7.i && var7.k >= 0.0F) {
             var0[var2++] = var7;
         }
-
         PathPoint var8 = this.a(var1.a - 1, var1.b, var1.c, var3, var5, EnumDirection.WEST);
         if (var8 != null && !var8.i && var8.k >= 0.0F) {
             var0[var2++] = var8;
         }
-
         PathPoint var9 = this.a(var1.a + 1, var1.b, var1.c, var3, var5, EnumDirection.EAST);
         if (var9 != null && !var9.i && var9.k >= 0.0F) {
             var0[var2++] = var9;
         }
-
         PathPoint var10 = this.a(var1.a, var1.b, var1.c - 1, var3, var5, EnumDirection.NORTH);
         if (var10 != null && !var10.i && var10.k >= 0.0F) {
             var0[var2++] = var10;
         }
-
         PathPoint var11 = this.a(var1.a - 1, var1.b, var1.c - 1, var3, var5, EnumDirection.NORTH);
         if (this.a(var1, var8, var10, var11)) {
             var0[var2++] = var11;
         }
-
         PathPoint var12 = this.a(var1.a + 1, var1.b, var1.c - 1, var3, var5, EnumDirection.NORTH);
         if (this.a(var1, var9, var10, var12)) {
             var0[var2++] = var12;
         }
-
         PathPoint var13 = this.a(var1.a - 1, var1.b, var1.c + 1, var3, var5, EnumDirection.SOUTH);
         if (this.a(var1, var8, var7, var13)) {
             var0[var2++] = var13;
         }
-
         PathPoint var14 = this.a(var1.a + 1, var1.b, var1.c + 1, var3, var5, EnumDirection.SOUTH);
         if (this.a(var1, var9, var7, var14)) {
             var0[var2++] = var14;
         }
-
         return var2;
     }
 
@@ -371,7 +331,6 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                 ++var0;
                 varx.c(this.b.locX(), var0, this.b.locZ());
             }
-
             --var0;
         } else if (this.b.onGround) {
             var0 = MathHelper.floor(this.b.locY() + 0.5D);
@@ -380,10 +339,8 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                     this.b); (this.a.getType(var1).isAir() || this.a.getType(var1).a(this.a, var1, PathMode.LAND))
                             && var1.getY() > 0; var1 = var1.down()) {
             }
-
             var0 = var1.up().getY();
         }
-
         var1 = new BlockPosition(this.b);
         PathType var2 = this.a(this.b, var1.getX(), var0, var1.getZ());
         if (this.b.a(var2) < 0.0F) {
@@ -399,9 +356,7 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                 if (this.b.a(var6) >= 0.0F)
                     return this.a(varb.getX(), varb.getY(), varb.getZ());
             }
-
         }
-
         return this.a(var1.getX(), var0, var1.getZ());
     }
 
@@ -426,19 +381,13 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                                 if (var10 == Blocks.SWEET_BERRY_BUSH) {
                                     var4 = PathType.DANGER_OTHER;
                                 }
-
                             } else {
                                 var4 = PathType.DANGER_FIRE;
                             }
-
                         }
-
                     }
-
                 }
-
             }
-
         } catch (Throwable var18) {
             var6 = var18;
             throw var18;
@@ -450,15 +399,11 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                     } catch (Throwable var17) {
                         var6.addSuppressed(var17);
                     }
-
                 } else {
                     var5.close();
                 }
-
             }
-
         }
-
         return var4;
     }
 
@@ -473,25 +418,19 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
             if (var6 == PathType.DAMAGE_FIRE || var5 == Blocks.MAGMA_BLOCK || var5 == Blocks.CAMPFIRE) {
                 var4 = PathType.DAMAGE_FIRE;
             }
-
             if (var6 == PathType.DAMAGE_CACTUS) {
                 var4 = PathType.DAMAGE_CACTUS;
             }
-
             if (var6 == PathType.DAMAGE_OTHER) {
                 var4 = PathType.DAMAGE_OTHER;
             }
-
             if (var6 == PathType.STICKY_HONEY) {
                 var4 = PathType.STICKY_HONEY;
             }
-
         }
-
         if (var4 == PathType.WALKABLE) {
             var4 = a(var0, var1, var2, var3, var4);
         }
-
         return var4;
     }
 
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/PlayerlistTracker.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/PlayerlistTracker.java
index 0c77423f7..af6d1dfb9 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/PlayerlistTracker.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/PlayerlistTracker.java
@@ -44,14 +44,12 @@ public class PlayerlistTracker extends PlayerChunkMap.EntityTracker {
                         if (res == null) {
                             updateLastPlayer(player);
                         }
-
                         return res;
                     }
                 });
             } catch (Throwable e) {
                 e.printStackTrace();
             }
-
         } else {
             try {
                 Set<EntityPlayer> delegate = super.trackedPlayers;
@@ -62,7 +60,6 @@ public class PlayerlistTracker extends PlayerChunkMap.EntityTracker {
                         if (res) {
                             updateLastPlayer(player);
                         }
-
                         return res;
                     }
 
@@ -74,9 +71,7 @@ public class PlayerlistTracker extends PlayerChunkMap.EntityTracker {
             } catch (Throwable e) {
                 e.printStackTrace();
             }
-
         }
-
     }
 
     public PlayerlistTracker(PlayerChunkMap map, EntityTracker entry) {
@@ -92,7 +87,6 @@ public class PlayerlistTracker extends PlayerChunkMap.EntityTracker {
             Bukkit.getPluginManager().callEvent(
                     new NPCLinkToPlayerEvent(((NPCHolder) tracker).getNPC(), lastUpdatedPlayer.getBukkitEntity()));
         }
-
     }
 
     @Override
@@ -116,11 +110,8 @@ public class PlayerlistTracker extends PlayerChunkMap.EntityTracker {
                 } catch (Throwable e) {
                     e.printStackTrace();
                 }
-
             }
-
         }
-
         super.updatePlayer(entityplayer);
     }
 
@@ -130,7 +121,6 @@ public class PlayerlistTracker extends PlayerChunkMap.EntityTracker {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         return 0;
     }
 
@@ -140,7 +130,6 @@ public class PlayerlistTracker extends PlayerChunkMap.EntityTracker {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         return false;
     }
 
@@ -150,7 +139,6 @@ public class PlayerlistTracker extends PlayerChunkMap.EntityTracker {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         return null;
     }
 
@@ -160,7 +148,6 @@ public class PlayerlistTracker extends PlayerChunkMap.EntityTracker {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         return 0;
     }
 
@@ -180,9 +167,7 @@ public class PlayerlistTracker extends PlayerChunkMap.EntityTracker {
                 TRACKING_MAP_SETTER = NMS.getFirstSetter(EntityTracker.class, Map.class);
                 TRACKING_MAP_GETTER = NMS.getFirstGetter(EntityTracker.class, Map.class);
             }
-
         } catch (Exception e) {
         }
-
     }
 }
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ArmorStandController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ArmorStandController.java
index a4c5ec2c9..5860a25d8 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ArmorStandController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ArmorStandController.java
@@ -60,7 +60,6 @@ public class ArmorStandController extends MobEntityController {
             if (npc != null) {
                 ai = new BasicMobAI(this);
             }
-
         }
 
         @Override
@@ -87,7 +86,6 @@ public class ArmorStandController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -99,7 +97,6 @@ public class ArmorStandController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -117,7 +114,6 @@ public class ArmorStandController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ArmorStandNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -132,7 +128,6 @@ public class ArmorStandController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -142,7 +137,6 @@ public class ArmorStandController extends MobEntityController {
                 npc.update();
                 ai.tickAI();
             }
-
         }
     }
 }
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BatController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BatController.java
index 27ee76009..1c677b891 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BatController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BatController.java
@@ -59,7 +59,6 @@ public class BatController extends MobEntityController {
             if (npc != null) {
                 setAsleep(false);
             }
-
         }
 
         @Override
@@ -82,7 +81,6 @@ public class BatController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -96,7 +94,6 @@ public class BatController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -107,7 +104,6 @@ public class BatController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -125,7 +121,6 @@ public class BatController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new BatNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -160,7 +155,6 @@ public class BatController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -177,10 +171,8 @@ public class BatController extends MobEntityController {
                 if (npc.useMinecraftAI()) {
                     super.mobTick();
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BeeController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BeeController.java
index 89f463e12..285a1017e 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BeeController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BeeController.java
@@ -78,7 +78,6 @@ public class BeeController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -92,7 +91,6 @@ public class BeeController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -103,7 +101,6 @@ public class BeeController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -121,7 +118,6 @@ public class BeeController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new BeeNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -156,7 +152,6 @@ public class BeeController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -173,10 +168,8 @@ public class BeeController extends MobEntityController {
                 if (npc.useMinecraftAI()) {
                     super.mobTick();
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BlazeController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BlazeController.java
index 7a9242e05..64ada45c2 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BlazeController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/BlazeController.java
@@ -78,7 +78,6 @@ public class BlazeController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -92,7 +91,6 @@ public class BlazeController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -103,7 +101,6 @@ public class BlazeController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -121,7 +118,6 @@ public class BlazeController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new BlazeNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -156,7 +152,6 @@ public class BlazeController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -170,7 +165,6 @@ public class BlazeController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CatController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CatController.java
index 51f27eeff..32dd286b1 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CatController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CatController.java
@@ -72,7 +72,6 @@ public class CatController extends MobEntityController {
                 super.a(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::a);
         }
 
@@ -81,7 +80,6 @@ public class CatController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -99,7 +97,6 @@ public class CatController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -120,7 +117,6 @@ public class CatController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -131,7 +127,6 @@ public class CatController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -151,7 +146,6 @@ public class CatController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -159,7 +153,6 @@ public class CatController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new CatNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -194,7 +187,6 @@ public class CatController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -217,7 +209,6 @@ public class CatController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CaveSpiderController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CaveSpiderController.java
index a9dd685c8..5c7e22fdd 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CaveSpiderController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CaveSpiderController.java
@@ -70,7 +70,6 @@ public class CaveSpiderController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -88,7 +87,6 @@ public class CaveSpiderController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -109,7 +107,6 @@ public class CaveSpiderController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -120,7 +117,6 @@ public class CaveSpiderController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -140,7 +136,6 @@ public class CaveSpiderController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -148,7 +143,6 @@ public class CaveSpiderController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new CaveSpiderNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -183,7 +177,6 @@ public class CaveSpiderController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -206,7 +199,6 @@ public class CaveSpiderController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -223,7 +215,6 @@ public class CaveSpiderController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, justCreated);
             }
-
         }
     }
 }
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ChickenController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ChickenController.java
index 5eba7e82d..e49d15e4e 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ChickenController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ChickenController.java
@@ -72,7 +72,6 @@ public class ChickenController extends MobEntityController {
                 super.a(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::a);
         }
 
@@ -81,7 +80,6 @@ public class ChickenController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -99,7 +97,6 @@ public class ChickenController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -120,7 +117,6 @@ public class ChickenController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -131,7 +127,6 @@ public class ChickenController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -151,7 +146,6 @@ public class ChickenController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -159,7 +153,6 @@ public class ChickenController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ChickenNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -194,7 +187,6 @@ public class ChickenController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -217,7 +209,6 @@ public class ChickenController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -225,7 +216,6 @@ public class ChickenController extends MobEntityController {
             if (npc != null) {
                 this.eggLayTime = 100; // egg timer
             }
-
             super.movementTick();
         }
 
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CodController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CodController.java
index 72f05e83d..c74e6dc88 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CodController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CodController.java
@@ -71,7 +71,6 @@ public class CodController extends MobEntityController {
                 this.oldMoveController = this.moveController;
                 this.moveController = new ControllerMove(this);
             }
-
         }
 
         @Override
@@ -84,7 +83,6 @@ public class CodController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -102,7 +100,6 @@ public class CodController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -133,7 +130,6 @@ public class CodController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -144,7 +140,6 @@ public class CodController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -163,11 +158,9 @@ public class CodController extends MobEntityController {
                 if (!NMSImpl.moveFish(npc, this, vec3d)) {
                     super.g(vec3d);
                 }
-
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -175,7 +168,6 @@ public class CodController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new CodNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -210,7 +202,6 @@ public class CodController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -232,23 +223,18 @@ public class CodController extends MobEntityController {
                 if (!npc.useMinecraftAI()) {
                     NMSImpl.setNotInSchool(this);
                 }
-
                 NMSImpl.updateMinecraftAIState(npc, this);
                 if (npc.useMinecraftAI() && this.moveController != this.oldMoveController) {
                     this.moveController = this.oldMoveController;
                 }
-
                 if (!npc.useMinecraftAI() && this.moveController == this.oldMoveController) {
                     this.moveController = new EntityMoveControl(this);
                 }
-
             }
-
             super.mobTick();
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -257,12 +243,10 @@ public class CodController extends MobEntityController {
             if (npc != null) {
                 this.v = false;
             }
-
             super.movementTick();
             if (npc != null) {
                 this.v = lastInWater;
             }
-
         }
 
         @Override
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CowController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CowController.java
index def7e6450..938966bd1 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CowController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CowController.java
@@ -77,7 +77,6 @@ public class CowController extends MobEntityController {
                 super.a(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::a);
         }
 
@@ -86,7 +85,6 @@ public class CowController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -104,7 +102,6 @@ public class CowController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -135,7 +132,6 @@ public class CowController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -146,7 +142,6 @@ public class CowController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -166,7 +161,6 @@ public class CowController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -174,7 +168,6 @@ public class CowController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new CowNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -209,7 +202,6 @@ public class CowController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -232,7 +224,6 @@ public class CowController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CreeperController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CreeperController.java
index 56649a37a..f4aea327d 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CreeperController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/CreeperController.java
@@ -74,7 +74,6 @@ public class CreeperController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -92,7 +91,6 @@ public class CreeperController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -113,7 +111,6 @@ public class CreeperController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -124,7 +121,6 @@ public class CreeperController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -144,7 +140,6 @@ public class CreeperController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -152,7 +147,6 @@ public class CreeperController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new CreeperNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -187,7 +181,6 @@ public class CreeperController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -195,7 +188,6 @@ public class CreeperController extends MobEntityController {
             if (npc == null || !npc.isProtected()) {
                 super.ignite();
             }
-
         }
 
         @Override
@@ -218,7 +210,6 @@ public class CreeperController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -233,7 +224,6 @@ public class CreeperController extends MobEntityController {
             if (npc == null || allowPowered) {
                 super.onLightningStrike(server, entitylightning);
             }
-
         }
 
         public void setAllowPowered(boolean allowPowered) {
@@ -247,7 +237,6 @@ public class CreeperController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, justCreated);
             }
-
         }
     }
 }
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/DolphinController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/DolphinController.java
index ea767798e..1f37216e3 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/DolphinController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/DolphinController.java
@@ -71,7 +71,6 @@ public class DolphinController extends MobEntityController {
                 this.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED)
                         .setValue(this.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED).getBaseValue() / 10);
             }
-
         }
 
         @Override
@@ -84,7 +83,6 @@ public class DolphinController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -102,7 +100,6 @@ public class DolphinController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -128,7 +125,6 @@ public class DolphinController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -139,7 +135,6 @@ public class DolphinController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -158,11 +153,9 @@ public class DolphinController extends MobEntityController {
                 if (!NMSImpl.moveFish(npc, this, vec3d, dM())) {
                     super.g(vec3d);
                 }
-
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -170,7 +163,6 @@ public class DolphinController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new DolphinNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -205,7 +197,6 @@ public class DolphinController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -233,7 +224,6 @@ public class DolphinController extends MobEntityController {
             if (npc != null && npc.isProtected()) {
                 inProtectedTick = true;
             }
-
             super.tick();
             inProtectedTick = false;
             if (npc != null) {
@@ -241,14 +231,11 @@ public class DolphinController extends MobEntityController {
                 if (npc.useMinecraftAI() && this.moveController != this.oldMoveController) {
                     this.moveController = this.oldMoveController;
                 }
-
                 if (!npc.useMinecraftAI() && this.moveController == this.oldMoveController) {
                     this.moveController = new EntityMoveControl(this);
                 }
-
                 npc.update();
             }
-
         }
     }
 }
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/DrownedController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/DrownedController.java
index 6d2d62693..ee8ae7e38 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/DrownedController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/DrownedController.java
@@ -70,7 +70,6 @@ public class DrownedController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -88,7 +87,6 @@ public class DrownedController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -109,7 +107,6 @@ public class DrownedController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -120,7 +117,6 @@ public class DrownedController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -140,7 +136,6 @@ public class DrownedController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -148,7 +143,6 @@ public class DrownedController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new DrownedNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -183,7 +177,6 @@ public class DrownedController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -206,7 +199,6 @@ public class DrownedController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EnderDragonController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EnderDragonController.java
index ed218ceeb..3b04f077e 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EnderDragonController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EnderDragonController.java
@@ -84,7 +84,6 @@ public class EnderDragonController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -98,7 +97,6 @@ public class EnderDragonController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -109,7 +107,6 @@ public class EnderDragonController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -127,7 +124,6 @@ public class EnderDragonController extends MobEntityController {
             if (getDragonControllerManager().a().getControllerPhase() == DragonControllerPhase.HOVER) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -141,7 +137,6 @@ public class EnderDragonController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new EnderDragonNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -176,7 +171,6 @@ public class EnderDragonController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -190,25 +184,20 @@ public class EnderDragonController extends MobEntityController {
                 npc.update();
                 NMSImpl.updateMinecraftAIState(npc, this);
             }
-
             if (npc != null && !npc.useMinecraftAI()) {
                 if (dl()) {
                     setHealth(0F);
                     return;
                 }
-
                 if (this.d < 0) {
                     for (int i = 0; i < this.c.length; ++i) {
                         this.c[i][0] = this.yaw;
                         this.c[i][1] = this.locY();
                     }
-
                 }
-
                 if (++this.d == this.c.length) {
                     this.d = 0;
                 }
-
                 this.c[this.d][0] = this.yaw;
                 this.c[this.d][1] = this.locY();
 
@@ -221,22 +210,18 @@ public class EnderDragonController extends MobEntityController {
                     children[j].lastY = children[j].E = vec3.y;
                     children[j].lastZ = children[j].F = vec3.z;
                 }
-
                 if (getRidingPassenger() != null) {
                     yaw = getRidingPassenger().getBukkitYaw() - 180;
                 }
-
                 Vec3D mot = getMot();
                 if (mot.getX() != 0 || mot.getY() != 0 || mot.getZ() != 0) {
                     mot = mot.d(0.98, 0.98, 0.98);
                     if (getRidingPassenger() == null) {
                         yaw = Util.getDragonYaw(getBukkitEntity(), mot.x, mot.z);
                     }
-
                     setPosition(locX() + mot.getX(), locY() + mot.getY(), locZ() + mot.getZ());
                     setMot(mot);
                 }
-
                 if (npc.hasTrait(EnderDragonTrait.class) && npc.getOrAddTrait(EnderDragonTrait.class).isDestroyWalls()
                         && NMSImpl.ENDERDRAGON_CHECK_WALLS != null) {
                     for (int i = 0; i < 3; i++) {
@@ -246,11 +231,8 @@ public class EnderDragonController extends MobEntityController {
                         } catch (Throwable e) {
                             e.printStackTrace();
                         }
-
                     }
-
                 }
-
                 if (npc.data().get(NPC.Metadata.COLLIDABLE, false)) {
                     try {
                         KNOCKBACK.invoke(this, this.world.getEntities(this,
@@ -264,13 +246,10 @@ public class EnderDragonController extends MobEntityController {
                     } catch (Throwable t) {
                         t.printStackTrace();
                     }
-
                 }
-
             } else {
                 super.movementTick();
             }
-
         }
 
         @Override
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EndermanController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EndermanController.java
index 07543db8c..41a6c34ea 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EndermanController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EndermanController.java
@@ -70,7 +70,6 @@ public class EndermanController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -95,7 +94,6 @@ public class EndermanController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -116,7 +114,6 @@ public class EndermanController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -127,7 +124,6 @@ public class EndermanController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -147,7 +143,6 @@ public class EndermanController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -155,7 +150,6 @@ public class EndermanController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new EndermanNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -190,7 +184,6 @@ public class EndermanController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -214,11 +207,9 @@ public class EndermanController extends MobEntityController {
                 } catch (Throwable e) {
                     e.printStackTrace();
                 }
-
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -235,7 +226,6 @@ public class EndermanController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, justCreated);
             }
-
         }
     }
 }
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EndermiteController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EndermiteController.java
index 4f8be2e44..facd50291 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EndermiteController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EndermiteController.java
@@ -70,7 +70,6 @@ public class EndermiteController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -88,7 +87,6 @@ public class EndermiteController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -109,7 +107,6 @@ public class EndermiteController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -120,7 +117,6 @@ public class EndermiteController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -140,7 +136,6 @@ public class EndermiteController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -148,7 +143,6 @@ public class EndermiteController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new EndermiteNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -183,7 +177,6 @@ public class EndermiteController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -206,7 +199,6 @@ public class EndermiteController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -223,7 +215,6 @@ public class EndermiteController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, justCreated);
             }
-
         }
     }
 }
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EntityHumanNPC.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EntityHumanNPC.java
index 7a06a6581..5407dd056 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EntityHumanNPC.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EntityHumanNPC.java
@@ -84,7 +84,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         } else {
             skinTracker = null;
         }
-
     }
 
     @Override
@@ -92,7 +91,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         if (npc == null || !npc.isFlyable()) {
             super.a(d0, flag, block, blockposition);
         }
-
     }
 
     @Override
@@ -117,7 +115,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         if (npc != null) {
             Util.callCollisionEvent(npc, entity.getBukkitEntity());
         }
-
     }
 
     @Override
@@ -131,7 +128,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
             Bukkit.getScheduler().runTask(CitizensAPI.getPlugin(),
                     (Runnable) () -> EntityHumanNPC.this.velocityChanged = true);
         }
-
         return damaged;
     }
 
@@ -162,7 +158,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         } else {
             NMSImpl.flyingMoveLogic(this, vec3d);
         }
-
     }
 
     @Override
@@ -175,7 +170,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
             NMSImpl.setBukkitEntity(this, new PlayerNPC(this));
         }
-
         return super.getBukkitEntity();
     }
 
@@ -197,7 +191,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         if (skinName == null) {
             skinName = npc.getName();
         }
-
         return skinName.toLowerCase();
     }
 
@@ -222,7 +215,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         if (vector != null) {
             super.i(vector.getX(), vector.getY(), vector.getZ());
         }
-
     }
 
     @Override
@@ -239,7 +231,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
             conn.setPacketListener(playerConnection);
         } catch (IOException e) {
         }
-
         invulnerableTicks = 0;
         NMS.setStepHeight(getBukkitEntity(), 1); // the default (0) breaks step climbing
         setSkinFlags((byte) 0xFF);
@@ -270,11 +261,9 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
                 jump();
                 jumpTicks = 10;
             }
-
         } else {
             jumpTicks = 0;
         }
-
         aR *= 0.98F;
         aT *= 0.98F;
         moveWithFallDamage(new Vec3D(this.aR, this.aS, this.aT)); // movement method
@@ -282,7 +271,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         if (jumpTicks > 0) {
             jumpTicks--;
         }
-
     }
 
     private void moveWithFallDamage(Vec3D vec) {
@@ -291,7 +279,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         if (!npc.isProtected()) {
             a(this.locY() - y, onGround);
         }
-
     }
 
     @Override
@@ -305,7 +292,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
             super.playerTick();
             return;
         }
-
         entityBaseTick();
         boolean navigating = npc.getNavigator().isNavigating() || ai.getMoveControl().b();
         if (!navigating && getBukkitEntity() != null
@@ -314,20 +300,16 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
                 && (!npc.isProtected() || SpigotUtil.checkYSafe(locY(), getBukkitEntity().getWorld()))) {
             moveWithFallDamage(new Vec3D(0, 0, 0));
         }
-
         Vec3D mot = getMot();
         if (Math.abs(mot.getX()) < EPSILON && Math.abs(mot.getY()) < EPSILON && Math.abs(mot.getZ()) < EPSILON) {
             setMot(new Vec3D(0, 0, 0));
         }
-
         if (navigating) {
             if (!NMSImpl.isNavigationFinished(ai.getNavigation())) {
                 NMSImpl.updateNavigation(ai.getNavigation());
             }
-
             moveOnCurrentHeading();
         }
-
         ai.getMoveControl().a();
         ai.getJumpControl().b();
         collideNearby();
@@ -375,16 +357,12 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
             } else {
                 axisalignedbb = this.getBoundingBox().grow(1.0, 0.5, 1.0);
             }
-
             for (Entity entity : this.world.getEntities(this, axisalignedbb)) {
                 if (!entity.dead) {
                     entity.pickup(this);
                 }
-
             }
-
         }
-
         /*
          double diff = this.yaw - this.aK;
          if (diff != 40 && diff != -40) {
@@ -412,17 +390,13 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
                 if (cache != null && !cache.isEmpty()) {
                     this.getAttributeMap().a(cache.a(slot));
                 }
-
                 if (equipment != null && !equipment.isEmpty()) {
                     this.getAttributeMap().b(equipment.a(slot));
                 }
-
                 itemChanged = true;
             }
-
             equipmentCache.put(slot, equipment);
         }
-
         if (!itemChanged)
             return;
         Location current = getBukkitEntity().getLocation();
@@ -430,7 +404,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         for (EnumItemSlot slot : EnumItemSlot.values()) {
             list.add(Pair.of(slot, getEquipment(slot)));
         }
-
         NMSImpl.sendPacketsNearby(getBukkitEntity(), current, new PacketPlayOutEntityEquipment(getId(), list));
     }
 
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EvokerController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EvokerController.java
index 5c2020c8a..5893122c0 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EvokerController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/EvokerController.java
@@ -64,7 +64,6 @@ public class EvokerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -82,7 +81,6 @@ public class EvokerController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -103,7 +101,6 @@ public class EvokerController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -114,7 +111,6 @@ public class EvokerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -134,7 +130,6 @@ public class EvokerController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -142,7 +137,6 @@ public class EvokerController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new EvokerNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -177,7 +171,6 @@ public class EvokerController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -200,7 +193,6 @@ public class EvokerController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/FoxController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/FoxController.java
index 35d83f83d..eff0b20c7 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/FoxController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/FoxController.java
@@ -66,7 +66,6 @@ public class FoxController extends MobEntityController {
                 super.a(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::a);
         }
 
@@ -75,7 +74,6 @@ public class FoxController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -93,7 +91,6 @@ public class FoxController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -114,7 +111,6 @@ public class FoxController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -125,7 +121,6 @@ public class FoxController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -145,7 +140,6 @@ public class FoxController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -153,7 +147,6 @@ public class FoxController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new FoxNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -188,7 +181,6 @@ public class FoxController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -211,7 +203,6 @@ public class FoxController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GhastController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GhastController.java
index d58af687c..924dd7990 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GhastController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GhastController.java
@@ -72,7 +72,6 @@ public class GhastController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -86,7 +85,6 @@ public class GhastController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -97,7 +95,6 @@ public class GhastController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -115,7 +112,6 @@ public class GhastController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new GhastNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -150,7 +146,6 @@ public class GhastController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -169,7 +164,6 @@ public class GhastController extends MobEntityController {
                 npc.update();
                 NMSImpl.updateMinecraftAIState(npc, this);
             }
-
             super.mobTick();
         }
 
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GiantController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GiantController.java
index 3f27da33c..5b0b3cc08 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GiantController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GiantController.java
@@ -64,7 +64,6 @@ public class GiantController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -82,7 +81,6 @@ public class GiantController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -103,7 +101,6 @@ public class GiantController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -114,7 +111,6 @@ public class GiantController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -134,7 +130,6 @@ public class GiantController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -142,7 +137,6 @@ public class GiantController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new GiantNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -177,7 +171,6 @@ public class GiantController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -200,7 +193,6 @@ public class GiantController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -217,7 +209,6 @@ public class GiantController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, justCreated);
             }
-
         }
     }
 
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GuardianController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GuardianController.java
index ca178cb29..3903d5b40 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GuardianController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GuardianController.java
@@ -64,7 +64,6 @@ public class GuardianController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -82,7 +81,6 @@ public class GuardianController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -103,7 +101,6 @@ public class GuardianController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -114,7 +111,6 @@ public class GuardianController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -134,7 +130,6 @@ public class GuardianController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -142,7 +137,6 @@ public class GuardianController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new GuardianNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -177,7 +171,6 @@ public class GuardianController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -204,10 +197,8 @@ public class GuardianController extends MobEntityController {
                 } else {
                     super.movementTick();
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
@@ -224,7 +215,6 @@ public class GuardianController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, justCreated);
             }
-
         }
     }
 
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GuardianElderController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GuardianElderController.java
index f60c09b53..dbcb365ee 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GuardianElderController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/GuardianElderController.java
@@ -64,7 +64,6 @@ public class GuardianElderController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -82,7 +81,6 @@ public class GuardianElderController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -103,7 +101,6 @@ public class GuardianElderController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -114,7 +111,6 @@ public class GuardianElderController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -134,7 +130,6 @@ public class GuardianElderController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -142,7 +137,6 @@ public class GuardianElderController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new GuardianElderNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -177,7 +171,6 @@ public class GuardianElderController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -204,10 +197,8 @@ public class GuardianElderController extends MobEntityController {
                 } else {
                     super.movementTick();
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
@@ -224,7 +215,6 @@ public class GuardianElderController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, justCreated);
             }
-
         }
     }
 
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HoglinController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HoglinController.java
index 1bc45006c..45e07d821 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HoglinController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HoglinController.java
@@ -64,7 +64,6 @@ public class HoglinController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -82,7 +81,6 @@ public class HoglinController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -103,7 +101,6 @@ public class HoglinController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -114,7 +111,6 @@ public class HoglinController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -134,7 +130,6 @@ public class HoglinController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -142,7 +137,6 @@ public class HoglinController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new HoglinNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -177,7 +171,6 @@ public class HoglinController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -199,12 +192,10 @@ public class HoglinController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 setImmuneToZombification(true);
             }
-
             super.mobTick();
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseController.java
index a250c4e19..6cc945c96 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseController.java
@@ -72,7 +72,6 @@ public class HorseController extends MobEntityController {
                 horse.setDomestication(horse.getMaxDomestication());
                 baseMovementSpeed = this.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED).getValue();
             }
-
         }
 
         @Override
@@ -86,7 +85,6 @@ public class HorseController extends MobEntityController {
                 super.a(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::a);
         }
 
@@ -95,7 +93,6 @@ public class HorseController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -113,7 +110,6 @@ public class HorseController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -134,7 +130,6 @@ public class HorseController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -145,7 +140,6 @@ public class HorseController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -177,7 +171,6 @@ public class HorseController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -185,7 +178,6 @@ public class HorseController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new HorseNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -220,7 +212,6 @@ public class HorseController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -249,16 +240,13 @@ public class HorseController extends MobEntityController {
             } else {
                 riding = false;
             }
-
             if (riding) {
                 if (npc.getNavigator().isNavigating()) {
                     org.bukkit.entity.Entity basePassenger = passengers.get(0).getBukkitEntity();
                     NMS.look(basePassenger, yaw, pitch);
                 }
-
                 d(4, true); // datawatcher method
             }
-
             NMS.setStepHeight(getBukkitEntity(), 1);
             npc.update();
         }
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseDonkeyController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseDonkeyController.java
index f0f69bc2f..1d1149955 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseDonkeyController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseDonkeyController.java
@@ -71,7 +71,6 @@ public class HorseDonkeyController extends MobEntityController {
                 ((Donkey) getBukkitEntity()).setDomestication(((Donkey) getBukkitEntity()).getMaxDomestication());
                 baseMovementSpeed = this.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED).getValue();
             }
-
         }
 
         @Override
@@ -85,7 +84,6 @@ public class HorseDonkeyController extends MobEntityController {
                 super.a(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::a);
         }
 
@@ -94,7 +92,6 @@ public class HorseDonkeyController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -112,7 +109,6 @@ public class HorseDonkeyController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -133,7 +129,6 @@ public class HorseDonkeyController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -144,7 +139,6 @@ public class HorseDonkeyController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -176,7 +170,6 @@ public class HorseDonkeyController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -184,7 +177,6 @@ public class HorseDonkeyController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new HorseDonkeyNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -219,7 +211,6 @@ public class HorseDonkeyController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -247,20 +238,16 @@ public class HorseDonkeyController extends MobEntityController {
                 } else {
                     riding = false;
                 }
-
                 if (riding) {
                     if (npc.getNavigator().isNavigating()) {
                         org.bukkit.entity.Entity basePassenger = passengers.get(0).getBukkitEntity();
                         NMS.look(basePassenger, yaw, pitch);
                     }
-
                     d(4, true); // datawatcher method
                 }
-
                 NMS.setStepHeight(getBukkitEntity(), 1);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseMuleController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseMuleController.java
index 3a2f42478..08849a71f 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseMuleController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseMuleController.java
@@ -71,7 +71,6 @@ public class HorseMuleController extends MobEntityController {
                 ((Mule) getBukkitEntity()).setDomestication(((Mule) getBukkitEntity()).getMaxDomestication());
                 baseMovementSpeed = this.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED).getValue();
             }
-
         }
 
         @Override
@@ -85,7 +84,6 @@ public class HorseMuleController extends MobEntityController {
                 super.a(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::a);
         }
 
@@ -94,7 +92,6 @@ public class HorseMuleController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -112,7 +109,6 @@ public class HorseMuleController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -133,7 +129,6 @@ public class HorseMuleController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -144,7 +139,6 @@ public class HorseMuleController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -176,7 +170,6 @@ public class HorseMuleController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -184,7 +177,6 @@ public class HorseMuleController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new HorseMuleNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -219,7 +211,6 @@ public class HorseMuleController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -247,20 +238,16 @@ public class HorseMuleController extends MobEntityController {
                 } else {
                     riding = false;
                 }
-
                 if (riding) {
                     if (npc.getNavigator().isNavigating()) {
                         org.bukkit.entity.Entity basePassenger = passengers.get(0).getBukkitEntity();
                         NMS.look(basePassenger, yaw, pitch);
                     }
-
                     d(4, true); // datawatcher method
                 }
-
                 NMS.setStepHeight(getBukkitEntity(), 1);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseSkeletonController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseSkeletonController.java
index 76d729f30..55e9bd646 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseSkeletonController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseSkeletonController.java
@@ -72,7 +72,6 @@ public class HorseSkeletonController extends MobEntityController {
                         .setDomestication(((SkeletonHorse) getBukkitEntity()).getMaxDomestication());
                 baseMovementSpeed = this.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED).getValue();
             }
-
         }
 
         @Override
@@ -86,7 +85,6 @@ public class HorseSkeletonController extends MobEntityController {
                 super.a(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::a);
         }
 
@@ -95,7 +93,6 @@ public class HorseSkeletonController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -113,7 +110,6 @@ public class HorseSkeletonController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -134,7 +130,6 @@ public class HorseSkeletonController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -145,7 +140,6 @@ public class HorseSkeletonController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -177,7 +171,6 @@ public class HorseSkeletonController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -185,7 +178,6 @@ public class HorseSkeletonController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new HorseSkeletonNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -220,7 +212,6 @@ public class HorseSkeletonController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -248,20 +239,16 @@ public class HorseSkeletonController extends MobEntityController {
                 } else {
                     riding = false;
                 }
-
                 if (riding) {
                     if (npc.getNavigator().isNavigating()) {
                         org.bukkit.entity.Entity basePassenger = passengers.get(0).getBukkitEntity();
                         NMS.look(basePassenger, yaw, pitch);
                     }
-
                     d(4, true); // datawatcher method
                 }
-
                 NMS.setStepHeight(getBukkitEntity(), 1);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseZombieController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseZombieController.java
index 8283717b2..b1f0aed59 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseZombieController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HorseZombieController.java
@@ -72,7 +72,6 @@ public class HorseZombieController extends MobEntityController {
                         .setDomestication(((ZombieHorse) getBukkitEntity()).getMaxDomestication());
                 baseMovementSpeed = this.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED).getValue();
             }
-
         }
 
         @Override
@@ -86,7 +85,6 @@ public class HorseZombieController extends MobEntityController {
                 super.a(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::a);
         }
 
@@ -95,7 +93,6 @@ public class HorseZombieController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -113,7 +110,6 @@ public class HorseZombieController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -134,7 +130,6 @@ public class HorseZombieController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -145,7 +140,6 @@ public class HorseZombieController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -177,7 +171,6 @@ public class HorseZombieController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -185,7 +178,6 @@ public class HorseZombieController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new HorseZombieNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -220,7 +212,6 @@ public class HorseZombieController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -248,20 +239,16 @@ public class HorseZombieController extends MobEntityController {
                 } else {
                     riding = false;
                 }
-
                 if (riding) {
                     if (npc.getNavigator().isNavigating()) {
                         org.bukkit.entity.Entity basePassenger = passengers.get(0).getBukkitEntity();
                         NMS.look(basePassenger, yaw, pitch);
                     }
-
                     d(4, true); // datawatcher method
                 }
-
                 NMS.setStepHeight(getBukkitEntity(), 1);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HumanController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HumanController.java
index 878988f66..4185feabd 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HumanController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/HumanController.java
@@ -35,11 +35,9 @@ public class HumanController extends AbstractEntityController {
         if (npc.requiresNameHologram()) {
             name = teamName;
         }
-
         if (Setting.USE_SCOREBOARD_TEAMS.asBoolean()) {
             npc.getOrAddTrait(ScoreboardTrait.class).createTeam(name);
         }
-
         final GameProfile profile = new GameProfile(uuid, name);
         final EntityHumanNPC handle = new EntityHumanNPC(nmsWorld.getServer().getServer(), nmsWorld, profile,
                 new PlayerInteractManager(nmsWorld), npc);
@@ -47,7 +45,6 @@ public class HumanController extends AbstractEntityController {
         if (skin != null) {
             skin.apply(handle);
         }
-
         Bukkit.getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(), () -> {
             if (getBukkitEntity() == null || !getBukkitEntity().isValid()
                     || getBukkitEntity() != handle.getBukkitEntity())
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/IllusionerController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/IllusionerController.java
index c136a117e..84a13e585 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/IllusionerController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/IllusionerController.java
@@ -64,7 +64,6 @@ public class IllusionerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -82,7 +81,6 @@ public class IllusionerController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -103,7 +101,6 @@ public class IllusionerController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -114,7 +111,6 @@ public class IllusionerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -134,7 +130,6 @@ public class IllusionerController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -142,7 +137,6 @@ public class IllusionerController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new IllusionerNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -177,7 +171,6 @@ public class IllusionerController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -200,7 +193,6 @@ public class IllusionerController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/IronGolemController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/IronGolemController.java
index c2edce5df..3075d8853 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/IronGolemController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/IronGolemController.java
@@ -64,7 +64,6 @@ public class IronGolemController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -82,7 +81,6 @@ public class IronGolemController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -103,7 +101,6 @@ public class IronGolemController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -114,7 +111,6 @@ public class IronGolemController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -134,7 +130,6 @@ public class IronGolemController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -142,7 +137,6 @@ public class IronGolemController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new IronGolemNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -177,7 +171,6 @@ public class IronGolemController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -200,7 +193,6 @@ public class IronGolemController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -217,7 +209,6 @@ public class IronGolemController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, justCreated);
             }
-
         }
     }
 
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/LlamaController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/LlamaController.java
index cf696fccc..0bf4b266a 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/LlamaController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/LlamaController.java
@@ -71,7 +71,6 @@ public class LlamaController extends MobEntityController {
                 ((Llama) getBukkitEntity()).setDomestication(((Llama) getBukkitEntity()).getMaxDomestication());
                 baseMovementSpeed = this.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED).getValue();
             }
-
         }
 
         @Override
@@ -85,7 +84,6 @@ public class LlamaController extends MobEntityController {
                 super.a(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::a);
         }
 
@@ -94,7 +92,6 @@ public class LlamaController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -112,7 +109,6 @@ public class LlamaController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -133,7 +129,6 @@ public class LlamaController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -144,7 +139,6 @@ public class LlamaController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -171,7 +165,6 @@ public class LlamaController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -179,7 +172,6 @@ public class LlamaController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new LlamaNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -214,7 +206,6 @@ public class LlamaController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -242,20 +233,16 @@ public class LlamaController extends MobEntityController {
                 } else {
                     riding = false;
                 }
-
                 if (riding) {
                     if (npc.getNavigator().isNavigating()) {
                         org.bukkit.entity.Entity basePassenger = passengers.get(0).getBukkitEntity();
                         NMS.look(basePassenger, yaw, pitch);
                     }
-
                     d(4, true); // datawatcher method
                 }
-
                 NMS.setStepHeight(getBukkitEntity(), 1);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/MagmaCubeController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/MagmaCubeController.java
index 7319df464..bb5417acb 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/MagmaCubeController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/MagmaCubeController.java
@@ -62,7 +62,6 @@ public class MagmaCubeController extends MobEntityController {
                 this.oldMoveController = this.moveController;
                 this.moveController = new EntityMoveControl(this);
             }
-
         }
 
         @Override
@@ -75,7 +74,6 @@ public class MagmaCubeController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -93,7 +91,6 @@ public class MagmaCubeController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -114,7 +111,6 @@ public class MagmaCubeController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -125,7 +121,6 @@ public class MagmaCubeController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -145,7 +140,6 @@ public class MagmaCubeController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -153,7 +147,6 @@ public class MagmaCubeController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new MagmaCubeNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -188,7 +181,6 @@ public class MagmaCubeController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -216,7 +208,6 @@ public class MagmaCubeController extends MobEntityController {
             if (npc == null) {
                 super.pickup(human);
             }
-
         }
 
         @Override
@@ -227,14 +218,11 @@ public class MagmaCubeController extends MobEntityController {
                 if (npc.useMinecraftAI() && this.moveController != this.oldMoveController) {
                     this.moveController = this.oldMoveController;
                 }
-
                 if (!npc.useMinecraftAI() && this.moveController == this.oldMoveController) {
                     this.moveController = new EntityMoveControl(this);
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
@@ -244,7 +232,6 @@ public class MagmaCubeController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, justCreated);
             }
-
         }
     }
 
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/MobEntityController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/MobEntityController.java
index 73e30dfe0..3be5737df 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/MobEntityController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/MobEntityController.java
@@ -42,9 +42,7 @@ public abstract class MobEntityController extends AbstractEntityController {
             if (mob.getControllerLook().getClass() == ControllerLook.class) {
                 NMSImpl.setLookControl(mob, new PitchableLookControl(mob));
             }
-
         }
-
         entity.setPositionRotation(at.getX(), at.getY(), at.getZ(), at.getYaw(), at.getPitch());
         if (npc != null) {
             // entity.onGround isn't updated right away - we approximate here so
@@ -53,19 +51,15 @@ public abstract class MobEntityController extends AbstractEntityController {
             if (beneath.isSolid()) {
                 entity.setOnGround(true);
             }
-
             try {
                 UUID_FIELD.invoke(entity, npc.getUniqueId());
             } catch (Throwable e) {
                 e.printStackTrace();
             }
-
             if (Setting.USE_SCOREBOARD_TEAMS.asBoolean()) {
                 npc.getOrAddTrait(ScoreboardTrait.class).createTeam(npc.getUniqueId().toString());
             }
-
         }
-
         return entity.getBukkitEntity();
     }
 
@@ -76,7 +70,6 @@ public abstract class MobEntityController extends AbstractEntityController {
             ex.printStackTrace();
             return null;
         }
-
     }
 
     private static Constructor<?> getConstructor(Class<?> clazz) {
@@ -89,7 +82,6 @@ public abstract class MobEntityController extends AbstractEntityController {
         } catch (Exception ex) {
             throw new IllegalStateException("unable to find an entity constructor");
         }
-
     }
 
     private static final Map<Class<?>, Constructor<?>> CONSTRUCTOR_CACHE = new WeakHashMap<>();
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/MushroomCowController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/MushroomCowController.java
index 05c518145..244f193ec 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/MushroomCowController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/MushroomCowController.java
@@ -69,7 +69,6 @@ public class MushroomCowController extends MobEntityController {
                 super.a(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::a);
         }
 
@@ -78,7 +77,6 @@ public class MushroomCowController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -96,7 +94,6 @@ public class MushroomCowController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -124,7 +121,6 @@ public class MushroomCowController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -135,7 +131,6 @@ public class MushroomCowController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -155,7 +150,6 @@ public class MushroomCowController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -163,7 +157,6 @@ public class MushroomCowController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new MushroomCowNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -198,7 +191,6 @@ public class MushroomCowController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -221,7 +213,6 @@ public class MushroomCowController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/OcelotController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/OcelotController.java
index 1980c2cc7..91c65c3ca 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/OcelotController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/OcelotController.java
@@ -67,7 +67,6 @@ public class OcelotController extends MobEntityController {
                 super.a(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::a);
         }
 
@@ -76,7 +75,6 @@ public class OcelotController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -94,7 +92,6 @@ public class OcelotController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -115,7 +112,6 @@ public class OcelotController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -126,7 +122,6 @@ public class OcelotController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -146,7 +141,6 @@ public class OcelotController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -154,7 +148,6 @@ public class OcelotController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new OcelotNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -189,7 +182,6 @@ public class OcelotController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -213,12 +205,10 @@ public class OcelotController extends MobEntityController {
             if (restorePose) {
                 this.setPose(old);
             }
-
             if (npc != null) {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PandaController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PandaController.java
index 2f20e9709..e878d30a4 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PandaController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PandaController.java
@@ -66,7 +66,6 @@ public class PandaController extends MobEntityController {
                 super.a(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::a);
         }
 
@@ -75,7 +74,6 @@ public class PandaController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -93,7 +91,6 @@ public class PandaController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -114,7 +111,6 @@ public class PandaController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -125,7 +121,6 @@ public class PandaController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -145,7 +140,6 @@ public class PandaController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -153,7 +147,6 @@ public class PandaController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new PandaNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -188,7 +181,6 @@ public class PandaController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -211,7 +203,6 @@ public class PandaController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ParrotController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ParrotController.java
index 921b51883..6a2e65cb7 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ParrotController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ParrotController.java
@@ -75,7 +75,6 @@ public class ParrotController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -97,7 +96,6 @@ public class ParrotController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -108,7 +106,6 @@ public class ParrotController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -126,7 +123,6 @@ public class ParrotController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ParrotNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -161,7 +157,6 @@ public class ParrotController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -178,10 +173,8 @@ public class ParrotController extends MobEntityController {
                 if (npc.useMinecraftAI()) {
                     super.mobTick();
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PhantomController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PhantomController.java
index db4696f31..4c63261bd 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PhantomController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PhantomController.java
@@ -67,7 +67,6 @@ public class PhantomController extends MobEntityController {
                 this.lookController = new ControllerLook(this);
                 // TODO: phantom pitch reversed
             }
-
         }
 
         @Override
@@ -81,7 +80,6 @@ public class PhantomController extends MobEntityController {
                 super.a(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::a);
         }
 
@@ -90,7 +88,6 @@ public class PhantomController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -108,7 +105,6 @@ public class PhantomController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -129,7 +125,6 @@ public class PhantomController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -140,7 +135,6 @@ public class PhantomController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -167,7 +161,6 @@ public class PhantomController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -175,7 +168,6 @@ public class PhantomController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new PhantomNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -210,7 +202,6 @@ public class PhantomController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -240,19 +231,15 @@ public class PhantomController extends MobEntityController {
                     this.moveController = this.oldMoveController;
                     this.lookController = this.oldLookController;
                 }
-
                 if (!npc.useMinecraftAI() && this.moveController == this.oldMoveController) {
                     this.moveController = new EntityMoveControl(this);
                     this.lookController = new ControllerLook(this);
                 }
-
                 if (npc.isProtected()) {
                     setOnFire(0);
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PigController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PigController.java
index 31e5619fd..4c2f561d9 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PigController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PigController.java
@@ -68,7 +68,6 @@ public class PigController extends MobEntityController {
                 super.a(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::a);
         }
 
@@ -77,7 +76,6 @@ public class PigController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -95,7 +93,6 @@ public class PigController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -116,7 +113,6 @@ public class PigController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -127,7 +123,6 @@ public class PigController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -153,7 +148,6 @@ public class PigController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -161,7 +155,6 @@ public class PigController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new PigNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -196,7 +189,6 @@ public class PigController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -219,7 +211,6 @@ public class PigController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -234,7 +225,6 @@ public class PigController extends MobEntityController {
             if (npc == null) {
                 super.onLightningStrike(server, entitylightning);
             }
-
         }
     }
 
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PigZombieController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PigZombieController.java
index 1f1d3b4f0..fb36b1f3a 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PigZombieController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PigZombieController.java
@@ -64,7 +64,6 @@ public class PigZombieController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -82,7 +81,6 @@ public class PigZombieController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -103,7 +101,6 @@ public class PigZombieController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -114,7 +111,6 @@ public class PigZombieController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -134,7 +130,6 @@ public class PigZombieController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -142,7 +137,6 @@ public class PigZombieController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new PigZombieNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -177,7 +171,6 @@ public class PigZombieController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -200,7 +193,6 @@ public class PigZombieController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PiglinBruteController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PiglinBruteController.java
index 46c8399ec..8cadb5333 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PiglinBruteController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PiglinBruteController.java
@@ -64,7 +64,6 @@ public class PiglinBruteController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -82,7 +81,6 @@ public class PiglinBruteController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -103,7 +101,6 @@ public class PiglinBruteController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -114,7 +111,6 @@ public class PiglinBruteController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -134,7 +130,6 @@ public class PiglinBruteController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -142,7 +137,6 @@ public class PiglinBruteController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new PiglinBruteNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -177,7 +171,6 @@ public class PiglinBruteController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -199,12 +192,10 @@ public class PiglinBruteController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 setImmuneToZombification(true);
             }
-
             super.mobTick();
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PiglinController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PiglinController.java
index ee4a774d8..e868d9d4f 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PiglinController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PiglinController.java
@@ -64,7 +64,6 @@ public class PiglinController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -82,7 +81,6 @@ public class PiglinController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -103,7 +101,6 @@ public class PiglinController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -114,7 +111,6 @@ public class PiglinController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -134,7 +130,6 @@ public class PiglinController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -142,7 +137,6 @@ public class PiglinController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new PiglinNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -177,7 +171,6 @@ public class PiglinController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -199,12 +192,10 @@ public class PiglinController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 setImmuneToZombification(true);
             }
-
             super.mobTick();
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PillagerController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PillagerController.java
index cc9c79654..f85ac88ba 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PillagerController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PillagerController.java
@@ -66,7 +66,6 @@ public class PillagerController extends MobEntityController {
                 super.a(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::a);
         }
 
@@ -75,7 +74,6 @@ public class PillagerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -93,7 +91,6 @@ public class PillagerController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -114,7 +111,6 @@ public class PillagerController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -125,7 +121,6 @@ public class PillagerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -145,7 +140,6 @@ public class PillagerController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -153,7 +147,6 @@ public class PillagerController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new PillagerNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -188,7 +181,6 @@ public class PillagerController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -211,7 +203,6 @@ public class PillagerController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PolarBearController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PolarBearController.java
index 4a8d4a4bf..dfc811ced 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PolarBearController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PolarBearController.java
@@ -64,7 +64,6 @@ public class PolarBearController extends MobEntityController {
                 super.a(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::a);
         }
 
@@ -83,7 +82,6 @@ public class PolarBearController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -97,7 +95,6 @@ public class PolarBearController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -108,7 +105,6 @@ public class PolarBearController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -126,7 +122,6 @@ public class PolarBearController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new PolarBearNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -161,7 +156,6 @@ public class PolarBearController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -176,7 +170,6 @@ public class PolarBearController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PufferFishController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PufferFishController.java
index 3d8a901ac..df8bd0e72 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PufferFishController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/PufferFishController.java
@@ -68,7 +68,6 @@ public class PufferFishController extends MobEntityController {
                 this.oldMoveController = this.moveController;
                 this.moveController = new ControllerMove(this);
             }
-
         }
 
         @Override
@@ -81,7 +80,6 @@ public class PufferFishController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -106,7 +104,6 @@ public class PufferFishController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -137,7 +134,6 @@ public class PufferFishController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -148,7 +144,6 @@ public class PufferFishController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -167,11 +162,9 @@ public class PufferFishController extends MobEntityController {
                 if (!NMSImpl.moveFish(npc, this, vec3d)) {
                     super.g(vec3d);
                 }
-
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -179,7 +172,6 @@ public class PufferFishController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new PufferFishNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -214,7 +206,6 @@ public class PufferFishController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -238,14 +229,11 @@ public class PufferFishController extends MobEntityController {
                 if (npc.useMinecraftAI() && this.moveController != this.oldMoveController) {
                     this.moveController = this.oldMoveController;
                 }
-
                 if (!npc.useMinecraftAI() && this.moveController == this.oldMoveController) {
                     this.moveController = new EntityMoveControl(this);
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
@@ -256,13 +244,11 @@ public class PufferFishController extends MobEntityController {
                 this.v = false;
                 setPuffState(0);
             }
-
             super.movementTick();
             if (npc != null) {
                 this.v = lastInWater;
                 setPuffState(lastPuffState);
             }
-
         }
 
         @Override
@@ -277,13 +263,11 @@ public class PufferFishController extends MobEntityController {
             if (npc != null) {
                 NMSImpl.resetPuffTicks(this);
             }
-
             super.tick();
             PufferFishTrait trait = null;
             if (npc != null && (trait = npc.getTraitNullable(PufferFishTrait.class)) != null) {
                 setPuffState(trait.getPuffState());
             }
-
         }
 
         private static float s(int i) {
@@ -295,7 +279,6 @@ public class PufferFishController extends MobEntityController {
                 default:
                     return 1.0F;
             }
-
         }
     }
 
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/RabbitController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/RabbitController.java
index 196751bff..8b5fcb668 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/RabbitController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/RabbitController.java
@@ -67,7 +67,6 @@ public class RabbitController extends MobEntityController {
                 super.a(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::a);
         }
 
@@ -76,7 +75,6 @@ public class RabbitController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -94,7 +92,6 @@ public class RabbitController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -115,7 +112,6 @@ public class RabbitController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -126,7 +122,6 @@ public class RabbitController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -146,7 +141,6 @@ public class RabbitController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -154,7 +148,6 @@ public class RabbitController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new RabbitNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -194,7 +187,6 @@ public class RabbitController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -218,10 +210,8 @@ public class RabbitController extends MobEntityController {
                 if (npc.getNavigator().isNavigating()) {
                     NMS.setShouldJump(getBukkitEntity());
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
@@ -239,7 +229,6 @@ public class RabbitController extends MobEntityController {
                 this.datawatcher.set(NMSImpl.getRabbitTypeField(), i);
                 return;
             }
-
             super.setRabbitType(i);
         }
     }
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/RavagerController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/RavagerController.java
index 01c6e1876..a0818e758 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/RavagerController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/RavagerController.java
@@ -66,7 +66,6 @@ public class RavagerController extends MobEntityController {
                 super.a(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::a);
         }
 
@@ -75,7 +74,6 @@ public class RavagerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -93,7 +91,6 @@ public class RavagerController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -114,7 +111,6 @@ public class RavagerController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -125,7 +121,6 @@ public class RavagerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -145,7 +140,6 @@ public class RavagerController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -153,7 +147,6 @@ public class RavagerController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new RavagerNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -188,7 +181,6 @@ public class RavagerController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -211,7 +203,6 @@ public class RavagerController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SalmonController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SalmonController.java
index 6f10df49e..3cf18dae0 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SalmonController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SalmonController.java
@@ -65,7 +65,6 @@ public class SalmonController extends MobEntityController {
                 this.oldMoveController = this.moveController;
                 this.moveController = new ControllerMove(this);
             }
-
         }
 
         @Override
@@ -78,7 +77,6 @@ public class SalmonController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -96,7 +94,6 @@ public class SalmonController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -127,7 +124,6 @@ public class SalmonController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -138,7 +134,6 @@ public class SalmonController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -157,11 +152,9 @@ public class SalmonController extends MobEntityController {
                 if (!NMSImpl.moveFish(npc, this, vec3d)) {
                     super.g(vec3d);
                 }
-
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -169,7 +162,6 @@ public class SalmonController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SalmonNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -204,7 +196,6 @@ public class SalmonController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -228,18 +219,14 @@ public class SalmonController extends MobEntityController {
                 if (npc.useMinecraftAI() && this.moveController != this.oldMoveController) {
                     this.moveController = this.oldMoveController;
                 }
-
                 if (!npc.useMinecraftAI() && this.moveController == this.oldMoveController) {
                     this.moveController = new EntityMoveControl(this);
                 }
-
             }
-
             super.mobTick();
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -248,12 +235,10 @@ public class SalmonController extends MobEntityController {
             if (npc != null) {
                 this.v = false;
             }
-
             super.movementTick();
             if (npc != null) {
                 this.v = lastInWater;
             }
-
         }
 
         @Override
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SheepController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SheepController.java
index 1dbef1f9e..4420f3232 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SheepController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SheepController.java
@@ -66,7 +66,6 @@ public class SheepController extends MobEntityController {
                 super.a(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::a);
         }
 
@@ -75,7 +74,6 @@ public class SheepController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -93,7 +91,6 @@ public class SheepController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -114,7 +111,6 @@ public class SheepController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -125,7 +121,6 @@ public class SheepController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -145,7 +140,6 @@ public class SheepController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -153,7 +147,6 @@ public class SheepController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SheepNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -188,7 +181,6 @@ public class SheepController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -211,7 +203,6 @@ public class SheepController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ShulkerController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ShulkerController.java
index 19de619a5..bbfd86165 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ShulkerController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ShulkerController.java
@@ -65,7 +65,6 @@ public class ShulkerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -83,7 +82,6 @@ public class ShulkerController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -104,7 +102,6 @@ public class ShulkerController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -115,7 +112,6 @@ public class ShulkerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -135,7 +131,6 @@ public class ShulkerController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -143,7 +138,6 @@ public class ShulkerController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ShulkerNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -178,7 +172,6 @@ public class ShulkerController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -199,7 +192,6 @@ public class ShulkerController extends MobEntityController {
             if (npc == null || npc.useMinecraftAI()) {
                 super.movementTick();
             }
-
         }
 
         @Override
@@ -221,12 +213,10 @@ public class ShulkerController extends MobEntityController {
                 if (npc.useMinecraftAI()) {
                     super.tick();
                 }
-
                 npc.update();
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -236,7 +226,6 @@ public class ShulkerController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, justCreated);
             }
-
         }
     }
 
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SilverfishController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SilverfishController.java
index 96b668076..9bd0581c9 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SilverfishController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SilverfishController.java
@@ -64,7 +64,6 @@ public class SilverfishController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -82,7 +81,6 @@ public class SilverfishController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -103,7 +101,6 @@ public class SilverfishController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -114,7 +111,6 @@ public class SilverfishController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -134,7 +130,6 @@ public class SilverfishController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -142,7 +137,6 @@ public class SilverfishController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SilverfishNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -177,7 +171,6 @@ public class SilverfishController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -200,7 +193,6 @@ public class SilverfishController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -217,7 +209,6 @@ public class SilverfishController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, justCreated);
             }
-
         }
     }
 
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonController.java
index 73165a44f..87776cf5c 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonController.java
@@ -64,7 +64,6 @@ public class SkeletonController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -82,7 +81,6 @@ public class SkeletonController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -103,7 +101,6 @@ public class SkeletonController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -114,7 +111,6 @@ public class SkeletonController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -134,7 +130,6 @@ public class SkeletonController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -142,7 +137,6 @@ public class SkeletonController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SkeletonNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -177,7 +171,6 @@ public class SkeletonController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -200,7 +193,6 @@ public class SkeletonController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -217,7 +209,6 @@ public class SkeletonController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, justCreated);
             }
-
         }
     }
 
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonStrayController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonStrayController.java
index 1b8edf688..c37e701b5 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonStrayController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonStrayController.java
@@ -64,7 +64,6 @@ public class SkeletonStrayController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -82,7 +81,6 @@ public class SkeletonStrayController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -103,7 +101,6 @@ public class SkeletonStrayController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -114,7 +111,6 @@ public class SkeletonStrayController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -134,7 +130,6 @@ public class SkeletonStrayController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -142,7 +137,6 @@ public class SkeletonStrayController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new StrayNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -177,7 +171,6 @@ public class SkeletonStrayController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -200,7 +193,6 @@ public class SkeletonStrayController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -217,7 +209,6 @@ public class SkeletonStrayController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, justCreated);
             }
-
         }
     }
 
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonWitherController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonWitherController.java
index fabde813e..5c8d95dcb 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonWitherController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SkeletonWitherController.java
@@ -64,7 +64,6 @@ public class SkeletonWitherController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -82,7 +81,6 @@ public class SkeletonWitherController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -103,7 +101,6 @@ public class SkeletonWitherController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -114,7 +111,6 @@ public class SkeletonWitherController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -134,7 +130,6 @@ public class SkeletonWitherController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -142,7 +137,6 @@ public class SkeletonWitherController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SkeletonWitherNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -177,7 +171,6 @@ public class SkeletonWitherController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -200,7 +193,6 @@ public class SkeletonWitherController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -217,7 +209,6 @@ public class SkeletonWitherController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, justCreated);
             }
-
         }
     }
 
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SlimeController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SlimeController.java
index f6602e08e..c77d73fbb 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SlimeController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SlimeController.java
@@ -62,7 +62,6 @@ public class SlimeController extends MobEntityController {
                 this.oldMoveController = this.moveController;
                 this.moveController = new EntityMoveControl(this);
             }
-
         }
 
         @Override
@@ -75,7 +74,6 @@ public class SlimeController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -93,7 +91,6 @@ public class SlimeController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -114,7 +111,6 @@ public class SlimeController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -125,7 +121,6 @@ public class SlimeController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -145,7 +140,6 @@ public class SlimeController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -153,7 +147,6 @@ public class SlimeController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SlimeNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -188,7 +181,6 @@ public class SlimeController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -216,7 +208,6 @@ public class SlimeController extends MobEntityController {
             if (npc == null) {
                 super.pickup(human);
             }
-
         }
 
         @Override
@@ -227,14 +218,11 @@ public class SlimeController extends MobEntityController {
                 if (npc.useMinecraftAI() && this.moveController != this.oldMoveController) {
                     this.moveController = this.oldMoveController;
                 }
-
                 if (!npc.useMinecraftAI() && this.moveController == this.oldMoveController) {
                     this.moveController = new EntityMoveControl(this);
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
@@ -244,7 +232,6 @@ public class SlimeController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, justCreated);
             }
-
         }
     }
 
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SnowmanController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SnowmanController.java
index 8edeb88af..91a1342a9 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SnowmanController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SnowmanController.java
@@ -64,7 +64,6 @@ public class SnowmanController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -82,7 +81,6 @@ public class SnowmanController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -103,7 +101,6 @@ public class SnowmanController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -114,7 +111,6 @@ public class SnowmanController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -134,7 +130,6 @@ public class SnowmanController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -142,7 +137,6 @@ public class SnowmanController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SnowmanNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -177,7 +171,6 @@ public class SnowmanController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -200,7 +193,6 @@ public class SnowmanController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -217,7 +209,6 @@ public class SnowmanController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, justCreated);
             }
-
         }
     }
 
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SpiderController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SpiderController.java
index df3646ca7..eb4483a30 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SpiderController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SpiderController.java
@@ -64,7 +64,6 @@ public class SpiderController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -82,7 +81,6 @@ public class SpiderController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -103,7 +101,6 @@ public class SpiderController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -114,7 +111,6 @@ public class SpiderController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -134,7 +130,6 @@ public class SpiderController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -142,7 +137,6 @@ public class SpiderController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SpiderNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -177,7 +171,6 @@ public class SpiderController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -200,7 +193,6 @@ public class SpiderController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -217,7 +209,6 @@ public class SpiderController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, justCreated);
             }
-
         }
     }
 
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SquidController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SquidController.java
index 18c604c05..ddb111b7b 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SquidController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/SquidController.java
@@ -64,7 +64,6 @@ public class SquidController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -82,7 +81,6 @@ public class SquidController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -103,7 +101,6 @@ public class SquidController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -114,7 +111,6 @@ public class SquidController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -134,7 +130,6 @@ public class SquidController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -142,7 +137,6 @@ public class SquidController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SquidNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -177,7 +171,6 @@ public class SquidController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -200,7 +193,6 @@ public class SquidController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -217,7 +209,6 @@ public class SquidController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, justCreated);
             }
-
         }
     }
 
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/StriderController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/StriderController.java
index 1dea2b8a9..eede9b797 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/StriderController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/StriderController.java
@@ -64,7 +64,6 @@ public class StriderController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -82,7 +81,6 @@ public class StriderController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -103,7 +101,6 @@ public class StriderController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -114,7 +111,6 @@ public class StriderController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -134,7 +130,6 @@ public class StriderController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -142,7 +137,6 @@ public class StriderController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new StriderNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -177,7 +171,6 @@ public class StriderController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -200,7 +193,6 @@ public class StriderController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TraderLlamaController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TraderLlamaController.java
index 2c1da6d55..222928859 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TraderLlamaController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TraderLlamaController.java
@@ -67,7 +67,6 @@ public class TraderLlamaController extends MobEntityController {
                 ((TraderLlama) getBukkitEntity())
                         .setDomestication(((TraderLlama) getBukkitEntity()).getMaxDomestication());
             }
-
         }
 
         @Override
@@ -81,7 +80,6 @@ public class TraderLlamaController extends MobEntityController {
                 super.a(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::a);
         }
 
@@ -90,7 +88,6 @@ public class TraderLlamaController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -108,7 +105,6 @@ public class TraderLlamaController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -129,7 +125,6 @@ public class TraderLlamaController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -140,7 +135,6 @@ public class TraderLlamaController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -160,7 +154,6 @@ public class TraderLlamaController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -168,7 +161,6 @@ public class TraderLlamaController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new TraderLlamaNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -203,7 +195,6 @@ public class TraderLlamaController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -228,19 +219,15 @@ public class TraderLlamaController extends MobEntityController {
                 if (npc.useMinecraftAI()) {
                     super.mobTick();
                 }
-
                 try {
                     if (bw != null) {
                         bw.invoke(this, 10); // DespawnDelay
                     }
-
                 } catch (Throwable e) {
                 }
-
                 NMS.setStepHeight(getBukkitEntity(), 1);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TropicalFishController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TropicalFishController.java
index 080eceac2..f651261c7 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TropicalFishController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TropicalFishController.java
@@ -65,7 +65,6 @@ public class TropicalFishController extends MobEntityController {
                 this.oldMoveController = this.moveController;
                 this.moveController = new ControllerMove(this);
             }
-
         }
 
         @Override
@@ -78,7 +77,6 @@ public class TropicalFishController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -96,7 +94,6 @@ public class TropicalFishController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -127,7 +124,6 @@ public class TropicalFishController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -138,7 +134,6 @@ public class TropicalFishController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -157,11 +152,9 @@ public class TropicalFishController extends MobEntityController {
                 if (!NMSImpl.moveFish(npc, this, vec3d)) {
                     super.g(vec3d);
                 }
-
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -169,7 +162,6 @@ public class TropicalFishController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new TropicalFishNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -204,7 +196,6 @@ public class TropicalFishController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -226,23 +217,18 @@ public class TropicalFishController extends MobEntityController {
                 if (!npc.useMinecraftAI()) {
                     NMSImpl.setNotInSchool(this);
                 }
-
                 NMSImpl.updateMinecraftAIState(npc, this);
                 if (npc.useMinecraftAI() && this.moveController != this.oldMoveController) {
                     this.moveController = this.oldMoveController;
                 }
-
                 if (!npc.useMinecraftAI() && this.moveController == this.oldMoveController) {
                     this.moveController = new EntityMoveControl(this);
                 }
-
             }
-
             super.mobTick();
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -251,12 +237,10 @@ public class TropicalFishController extends MobEntityController {
             if (npc != null) {
                 this.v = false;
             }
-
             super.movementTick();
             if (npc != null) {
                 this.v = lastInWater;
             }
-
         }
 
         @Override
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TurtleController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TurtleController.java
index 6e95aab91..38512b439 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TurtleController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/TurtleController.java
@@ -66,7 +66,6 @@ public class TurtleController extends MobEntityController {
                 this.moveController = new ControllerMove(this);
                 this.bi = new EmptyControllerJump(this);
             }
-
         }
 
         @Override
@@ -79,7 +78,6 @@ public class TurtleController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -97,7 +95,6 @@ public class TurtleController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -118,7 +115,6 @@ public class TurtleController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -129,7 +125,6 @@ public class TurtleController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -148,11 +143,9 @@ public class TurtleController extends MobEntityController {
                 if (!NMSImpl.moveFish(npc, this, vec3d)) {
                     super.g(vec3d);
                 }
-
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -160,7 +153,6 @@ public class TurtleController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new TurtleNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -195,7 +187,6 @@ public class TurtleController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -220,15 +211,12 @@ public class TurtleController extends MobEntityController {
                     this.moveController = this.oldMoveController;
                     this.bi = this.oldJumpController;
                 }
-
                 if (!npc.useMinecraftAI() && this.moveController == this.oldMoveController) {
                     this.moveController = new EntityMoveControl(this);
                     this.bi = new EmptyControllerJump(this);
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VexController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VexController.java
index 30f078b5d..f7cacf41e 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VexController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VexController.java
@@ -53,7 +53,6 @@ public class VexController extends MobEntityController {
             if (npc != null) {
                 setNoGravity(true);
             }
-
         }
 
         @Override
@@ -76,7 +75,6 @@ public class VexController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -90,7 +88,6 @@ public class VexController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -101,7 +98,6 @@ public class VexController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -119,7 +115,6 @@ public class VexController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new VexNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -154,7 +149,6 @@ public class VexController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -169,7 +163,6 @@ public class VexController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VillagerController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VillagerController.java
index 57575eb6d..8906ad46f 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VillagerController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VillagerController.java
@@ -67,7 +67,6 @@ public class VillagerController extends MobEntityController {
             if (npc != null) {
                 getAttributeInstance(GenericAttributes.MOVEMENT_SPEED).setValue(0.3);
             }
-
         }
 
         @Override
@@ -81,7 +80,6 @@ public class VillagerController extends MobEntityController {
                 super.a(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::a);
         }
 
@@ -90,7 +88,6 @@ public class VillagerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -108,7 +105,6 @@ public class VillagerController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -120,9 +116,7 @@ public class VillagerController extends MobEntityController {
                 if (list != null) {
                     list.clear();
                 }
-
             }
-
             return super.b(entityhuman, enumhand);
         }
 
@@ -143,7 +137,6 @@ public class VillagerController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -154,7 +147,6 @@ public class VillagerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -173,7 +165,6 @@ public class VillagerController extends MobEntityController {
                 blockingATrade = false;
                 return true;
             }
-
             return super.eN();
         }
 
@@ -184,7 +175,6 @@ public class VillagerController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -192,7 +182,6 @@ public class VillagerController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new VillagerNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -227,7 +216,6 @@ public class VillagerController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -248,12 +236,10 @@ public class VillagerController extends MobEntityController {
             if (npc != null) {
                 NMSImpl.updateMinecraftAIState(npc, this);
             }
-
             super.mobTick();
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -268,7 +254,6 @@ public class VillagerController extends MobEntityController {
             if (npc == null) {
                 super.onLightningStrike(server, entitylightning);
             }
-
         }
     }
 
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VindicatorController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VindicatorController.java
index 560efa0f3..33a560554 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VindicatorController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/VindicatorController.java
@@ -66,7 +66,6 @@ public class VindicatorController extends MobEntityController {
                 super.a(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::a);
         }
 
@@ -75,7 +74,6 @@ public class VindicatorController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -93,7 +91,6 @@ public class VindicatorController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -114,7 +111,6 @@ public class VindicatorController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -125,7 +121,6 @@ public class VindicatorController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -145,7 +140,6 @@ public class VindicatorController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -153,7 +147,6 @@ public class VindicatorController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new VindicatorNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -188,7 +181,6 @@ public class VindicatorController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -211,7 +203,6 @@ public class VindicatorController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WanderingTraderController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WanderingTraderController.java
index d665c67ae..d7ef5e408 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WanderingTraderController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WanderingTraderController.java
@@ -79,7 +79,6 @@ public class WanderingTraderController extends MobEntityController {
                 super.a(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::a);
         }
 
@@ -88,7 +87,6 @@ public class WanderingTraderController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -106,7 +104,6 @@ public class WanderingTraderController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -118,9 +115,7 @@ public class WanderingTraderController extends MobEntityController {
                 if (list != null) {
                     list.clear();
                 }
-
             }
-
             return super.b(entityhuman, enumhand);
         }
 
@@ -141,7 +136,6 @@ public class WanderingTraderController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -152,7 +146,6 @@ public class WanderingTraderController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -171,7 +164,6 @@ public class WanderingTraderController extends MobEntityController {
                 blockingATrade = false;
                 return true;
             }
-
             return super.eN();
         }
 
@@ -182,7 +174,6 @@ public class WanderingTraderController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -190,7 +181,6 @@ public class WanderingTraderController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new WanderingTraderNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -225,7 +215,6 @@ public class WanderingTraderController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         public boolean isBlockingTrades() {
@@ -250,20 +239,16 @@ public class WanderingTraderController extends MobEntityController {
             if (npc != null) {
                 NMSImpl.updateMinecraftAIState(npc, this);
             }
-
             super.mobTick();
             if (npc != null) {
                 try {
                     if (bq != null) {
                         bq.invoke(this, 10); // DespawnDelay
                     }
-
                 } catch (Throwable e) {
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
@@ -278,7 +263,6 @@ public class WanderingTraderController extends MobEntityController {
             if (npc == null) {
                 super.onLightningStrike(server, entitylightning);
             }
-
         }
 
         public void setBlockTrades(boolean blocked) {
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WitchController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WitchController.java
index 483fdb79a..e1f191d39 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WitchController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WitchController.java
@@ -64,7 +64,6 @@ public class WitchController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -82,7 +81,6 @@ public class WitchController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -103,7 +101,6 @@ public class WitchController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -114,7 +111,6 @@ public class WitchController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -134,7 +130,6 @@ public class WitchController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -142,7 +137,6 @@ public class WitchController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new WitchNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -177,7 +171,6 @@ public class WitchController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -200,7 +193,6 @@ public class WitchController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -217,7 +209,6 @@ public class WitchController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, justCreated);
             }
-
         }
     }
 
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WitherController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WitherController.java
index deb16cecd..9dee01464 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WitherController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WitherController.java
@@ -72,7 +72,6 @@ public class WitherController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -86,7 +85,6 @@ public class WitherController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -97,7 +95,6 @@ public class WitherController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -115,7 +112,6 @@ public class WitherController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new WitherNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -150,7 +146,6 @@ public class WitherController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -172,10 +167,8 @@ public class WitherController extends MobEntityController {
                 if (npc.useMinecraftAI()) {
                     super.mobTick();
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WolfController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WolfController.java
index a8b3bdbc5..3dcae1684 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WolfController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/WolfController.java
@@ -68,7 +68,6 @@ public class WolfController extends MobEntityController {
                 super.a(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::a);
         }
 
@@ -77,7 +76,6 @@ public class WolfController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -95,7 +93,6 @@ public class WolfController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -116,7 +113,6 @@ public class WolfController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -127,7 +123,6 @@ public class WolfController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -147,7 +142,6 @@ public class WolfController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -155,7 +149,6 @@ public class WolfController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new WolfNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -190,7 +183,6 @@ public class WolfController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -213,7 +205,6 @@ public class WolfController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZoglinController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZoglinController.java
index 292df7122..d3781e7ea 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZoglinController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZoglinController.java
@@ -64,7 +64,6 @@ public class ZoglinController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -82,7 +81,6 @@ public class ZoglinController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -103,7 +101,6 @@ public class ZoglinController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -114,7 +111,6 @@ public class ZoglinController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -134,7 +130,6 @@ public class ZoglinController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -142,7 +137,6 @@ public class ZoglinController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ZoglinNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -177,7 +171,6 @@ public class ZoglinController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -198,12 +191,10 @@ public class ZoglinController extends MobEntityController {
             if (npc != null) {
                 NMSImpl.updateMinecraftAIState(npc, this);
             }
-
             super.mobTick();
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieController.java
index ed2f71c5f..f44b6ff9c 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieController.java
@@ -64,7 +64,6 @@ public class ZombieController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -82,7 +81,6 @@ public class ZombieController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -103,7 +101,6 @@ public class ZombieController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -114,7 +111,6 @@ public class ZombieController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -134,7 +130,6 @@ public class ZombieController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -142,7 +137,6 @@ public class ZombieController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ZombieNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -177,7 +171,6 @@ public class ZombieController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -200,7 +193,6 @@ public class ZombieController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieHuskController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieHuskController.java
index de8138f1f..97d5e5eac 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieHuskController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieHuskController.java
@@ -64,7 +64,6 @@ public class ZombieHuskController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -82,7 +81,6 @@ public class ZombieHuskController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -103,7 +101,6 @@ public class ZombieHuskController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -114,7 +111,6 @@ public class ZombieHuskController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -134,7 +130,6 @@ public class ZombieHuskController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -142,7 +137,6 @@ public class ZombieHuskController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ZombieHuskNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -177,7 +171,6 @@ public class ZombieHuskController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -200,7 +193,6 @@ public class ZombieHuskController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieVillagerController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieVillagerController.java
index 9600935f8..c01bba771 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieVillagerController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ZombieVillagerController.java
@@ -64,7 +64,6 @@ public class ZombieVillagerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -82,7 +81,6 @@ public class ZombieVillagerController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -103,7 +101,6 @@ public class ZombieVillagerController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -114,7 +111,6 @@ public class ZombieVillagerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -134,7 +130,6 @@ public class ZombieVillagerController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -142,7 +137,6 @@ public class ZombieVillagerController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ZombieVillagerNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -177,7 +171,6 @@ public class ZombieVillagerController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -200,7 +193,6 @@ public class ZombieVillagerController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/AreaEffectCloudController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/AreaEffectCloudController.java
index b42b905b1..eed610887 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/AreaEffectCloudController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/AreaEffectCloudController.java
@@ -67,7 +67,6 @@ public class AreaEffectCloudController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -79,7 +78,6 @@ public class AreaEffectCloudController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -92,7 +90,6 @@ public class AreaEffectCloudController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new AreaEffectCloudNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -112,7 +109,6 @@ public class AreaEffectCloudController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -122,7 +118,6 @@ public class AreaEffectCloudController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
     }
 }
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/BoatController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/BoatController.java
index a1c5699e5..5153fea8a 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/BoatController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/BoatController.java
@@ -80,7 +80,6 @@ public class BoatController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -92,7 +91,6 @@ public class BoatController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -105,7 +103,6 @@ public class BoatController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new BoatNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -125,7 +122,6 @@ public class BoatController extends MobEntityController {
                 this.aC = getBoundingBox().maxY;
                 return entityboat_enumstatus;
             }
-
             if (t())
                 return EnumStatus.IN_WATER;
             float f = k();
@@ -133,7 +129,6 @@ public class BoatController extends MobEntityController {
                 this.aD = f;
                 return EnumStatus.ON_LAND;
             }
-
             return EnumStatus.IN_AIR;
         }
 
@@ -143,7 +138,6 @@ public class BoatController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         private boolean t() {
@@ -168,13 +162,9 @@ public class BoatController extends MobEntityController {
                             this.aC = Math.max(f, this.aC);
                             m = flag | (axisalignedbb.minY < f ? true : false);
                         }
-
                     }
-
                 }
-
             }
-
             return m;
         }
 
@@ -209,9 +199,7 @@ public class BoatController extends MobEntityController {
                         if (getRidingPassenger() instanceof EntityHuman) {
                             this.aD /= 2.0F;
                         }
-
                     }
-
                     Vec3D vec3d = getMot();
                     setMot(vec3d.x * this.ap, vec3d.y + d1, vec3d.z * this.ap);
                     this.ar *= this.ap;
@@ -219,18 +207,14 @@ public class BoatController extends MobEntityController {
                         Vec3D vec3d1 = getMot();
                         setMot(vec3d1.x, vec3d1.y + d2 * 0.0615D, vec3d1.z);
                     }
-
                 }
-
                 move(EnumMoveType.SELF, getMot());
                 if (isVehicle()) {
                     this.yaw += this.ar;
                 }
-
             } else {
                 super.tick();
             }
-
         }
 
         private EnumStatus u() {
@@ -255,13 +239,9 @@ public class BoatController extends MobEntityController {
                                 return EnumStatus.UNDER_FLOWING_WATER;
                             flag = true;
                         }
-
                     }
-
                 }
-
             }
-
             return flag ? EnumStatus.UNDER_WATER : null;
         }
 
@@ -272,7 +252,6 @@ public class BoatController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, justCreated);
             }
-
         }
     }
 }
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/DragonFireballController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/DragonFireballController.java
index cff4ad832..b7ca835bf 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/DragonFireballController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/DragonFireballController.java
@@ -67,7 +67,6 @@ public class DragonFireballController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -79,7 +78,6 @@ public class DragonFireballController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -92,7 +90,6 @@ public class DragonFireballController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new DragonFireballNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -112,7 +109,6 @@ public class DragonFireballController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -122,11 +118,9 @@ public class DragonFireballController extends MobEntityController {
                 if (!npc.isProtected()) {
                     super.tick();
                 }
-
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -136,7 +130,6 @@ public class DragonFireballController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, justCreated);
             }
-
         }
     }
 }
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EggController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EggController.java
index 3b3799c50..48f6f36ae 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EggController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EggController.java
@@ -83,7 +83,6 @@ public class EggController extends AbstractEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -95,7 +94,6 @@ public class EggController extends AbstractEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -108,7 +106,6 @@ public class EggController extends AbstractEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new EggNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -128,7 +125,6 @@ public class EggController extends AbstractEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -138,11 +134,9 @@ public class EggController extends AbstractEntityController {
                 if (!npc.isProtected()) {
                     super.tick();
                 }
-
             } else {
                 super.tick();
             }
-
         }
     }
 }
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EnderCrystalController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EnderCrystalController.java
index b05a97eab..ba7138012 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EnderCrystalController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EnderCrystalController.java
@@ -67,7 +67,6 @@ public class EnderCrystalController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -79,7 +78,6 @@ public class EnderCrystalController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -92,7 +90,6 @@ public class EnderCrystalController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new EnderCrystalNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -112,7 +109,6 @@ public class EnderCrystalController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -122,7 +118,6 @@ public class EnderCrystalController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
     }
 }
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EnderPearlController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EnderPearlController.java
index fa7108627..865e12072 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EnderPearlController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EnderPearlController.java
@@ -67,7 +67,6 @@ public class EnderPearlController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -79,7 +78,6 @@ public class EnderPearlController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -92,7 +90,6 @@ public class EnderPearlController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new EnderPearlNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -112,7 +109,6 @@ public class EnderPearlController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -122,11 +118,9 @@ public class EnderPearlController extends MobEntityController {
                 if (!npc.isProtected()) {
                     super.tick();
                 }
-
             } else {
                 super.tick();
             }
-
         }
     }
 }
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EnderSignalController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EnderSignalController.java
index 16bb9621d..af1da93e5 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EnderSignalController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EnderSignalController.java
@@ -67,7 +67,6 @@ public class EnderSignalController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -79,7 +78,6 @@ public class EnderSignalController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -92,7 +90,6 @@ public class EnderSignalController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new EnderSignalNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -112,7 +109,6 @@ public class EnderSignalController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -122,7 +118,6 @@ public class EnderSignalController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
     }
 }
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EvokerFangsController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EvokerFangsController.java
index 80378864f..d3f3da26e 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EvokerFangsController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/EvokerFangsController.java
@@ -76,7 +76,6 @@ public class EvokerFangsController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -88,7 +87,6 @@ public class EvokerFangsController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -101,7 +99,6 @@ public class EvokerFangsController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new EvokerFangsNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -121,7 +118,6 @@ public class EvokerFangsController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -130,7 +126,6 @@ public class EvokerFangsController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
     }
 
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ExperienceOrbController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ExperienceOrbController.java
index d667b8feb..5d4573f8f 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ExperienceOrbController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ExperienceOrbController.java
@@ -61,7 +61,6 @@ public class ExperienceOrbController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -73,7 +72,6 @@ public class ExperienceOrbController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -86,7 +84,6 @@ public class ExperienceOrbController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ExperienceOrbNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -106,7 +103,6 @@ public class ExperienceOrbController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -116,7 +112,6 @@ public class ExperienceOrbController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
     }
 
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/FallingBlockController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/FallingBlockController.java
index f94aa879e..18c4b4ca4 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/FallingBlockController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/FallingBlockController.java
@@ -82,7 +82,6 @@ public class FallingBlockController extends AbstractEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -94,7 +93,6 @@ public class FallingBlockController extends AbstractEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -107,7 +105,6 @@ public class FallingBlockController extends AbstractEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new FallingBlockNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -127,7 +124,6 @@ public class FallingBlockController extends AbstractEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -141,11 +137,9 @@ public class FallingBlockController extends AbstractEntityController {
                     setMot(mot);
                     move(EnumMoveType.SELF, mot);
                 }
-
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -155,7 +149,6 @@ public class FallingBlockController extends AbstractEntityController {
             } else {
                 NMSImpl.setSize(this, justCreated);
             }
-
         }
 
         private static final double EPSILON = 0.001;
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/FireworkController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/FireworkController.java
index 02a07787c..6935e73fc 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/FireworkController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/FireworkController.java
@@ -61,7 +61,6 @@ public class FireworkController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -73,7 +72,6 @@ public class FireworkController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -86,7 +84,6 @@ public class FireworkController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new FireworkNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -106,7 +103,6 @@ public class FireworkController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -116,7 +112,6 @@ public class FireworkController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
     }
 
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/FishingHookController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/FishingHookController.java
index bb3689a4c..b914b029e 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/FishingHookController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/FishingHookController.java
@@ -77,7 +77,6 @@ public class FishingHookController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -89,7 +88,6 @@ public class FishingHookController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -102,7 +100,6 @@ public class FishingHookController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new FishingHookNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -130,7 +127,6 @@ public class FishingHookController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -145,12 +141,10 @@ public class FishingHookController extends MobEntityController {
                 } catch (Throwable e) {
                     e.printStackTrace();
                 }
-
                 npc.update();
             } else {
                 super.tick();
             }
-
         }
 
         private static MethodHandle G = NMS.getSetter(EntityFishingHook.class, "g");
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ItemController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ItemController.java
index e258151d0..75639a721 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ItemController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ItemController.java
@@ -73,7 +73,6 @@ public class ItemController extends AbstractEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -85,7 +84,6 @@ public class ItemController extends AbstractEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -98,7 +96,6 @@ public class ItemController extends AbstractEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ItemNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -118,7 +115,6 @@ public class ItemController extends AbstractEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -126,7 +122,6 @@ public class ItemController extends AbstractEntityController {
             if (npc == null) {
                 super.pickup(entityhuman);
             }
-
         }
 
         @Override
@@ -136,7 +131,6 @@ public class ItemController extends AbstractEntityController {
             } else {
                 super.tick();
             }
-
         }
     }
 
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ItemFrameController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ItemFrameController.java
index af4a03afc..c01c3d893 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ItemFrameController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ItemFrameController.java
@@ -73,7 +73,6 @@ public class ItemFrameController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -85,7 +84,6 @@ public class ItemFrameController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -98,7 +96,6 @@ public class ItemFrameController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ItemFrameNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -118,7 +115,6 @@ public class ItemFrameController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -133,7 +129,6 @@ public class ItemFrameController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
     }
 
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/LargeFireballController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/LargeFireballController.java
index 776151661..212a0330c 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/LargeFireballController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/LargeFireballController.java
@@ -61,7 +61,6 @@ public class LargeFireballController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -73,7 +72,6 @@ public class LargeFireballController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -86,7 +84,6 @@ public class LargeFireballController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new LargeFireballNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -106,7 +103,6 @@ public class LargeFireballController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -116,11 +112,9 @@ public class LargeFireballController extends MobEntityController {
                 if (!npc.isProtected()) {
                     super.tick();
                 }
-
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -130,7 +124,6 @@ public class LargeFireballController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, justCreated);
             }
-
         }
     }
 
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/LeashController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/LeashController.java
index 869e328d5..ecaacff36 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/LeashController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/LeashController.java
@@ -61,7 +61,6 @@ public class LeashController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -73,7 +72,6 @@ public class LeashController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -86,7 +84,6 @@ public class LeashController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new LeashNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -106,7 +103,6 @@ public class LeashController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -121,7 +117,6 @@ public class LeashController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
     }
 
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/LlamaSpitController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/LlamaSpitController.java
index 804852d34..86c765f4a 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/LlamaSpitController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/LlamaSpitController.java
@@ -80,7 +80,6 @@ public class LlamaSpitController extends AbstractEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -92,7 +91,6 @@ public class LlamaSpitController extends AbstractEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -105,7 +103,6 @@ public class LlamaSpitController extends AbstractEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new LlamaSpitNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -125,7 +122,6 @@ public class LlamaSpitController extends AbstractEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -135,11 +131,9 @@ public class LlamaSpitController extends AbstractEntityController {
                 if (!npc.isProtected()) {
                     super.tick();
                 }
-
             } else {
                 super.tick();
             }
-
         }
     }
 
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartChestController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartChestController.java
index 9176f9943..2740d3e25 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartChestController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartChestController.java
@@ -61,7 +61,6 @@ public class MinecartChestController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -73,7 +72,6 @@ public class MinecartChestController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -86,7 +84,6 @@ public class MinecartChestController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new MinecartChestNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -106,7 +103,6 @@ public class MinecartChestController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -116,7 +112,6 @@ public class MinecartChestController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
     }
 
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartCommandController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartCommandController.java
index 1a16afee4..82b66556b 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartCommandController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartCommandController.java
@@ -61,7 +61,6 @@ public class MinecartCommandController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -73,7 +72,6 @@ public class MinecartCommandController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -86,7 +84,6 @@ public class MinecartCommandController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new MinecartCommandNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -106,7 +103,6 @@ public class MinecartCommandController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -116,7 +112,6 @@ public class MinecartCommandController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
     }
 
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartFurnaceController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartFurnaceController.java
index 311a566c0..d60b295ae 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartFurnaceController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartFurnaceController.java
@@ -61,7 +61,6 @@ public class MinecartFurnaceController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -73,7 +72,6 @@ public class MinecartFurnaceController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -86,7 +84,6 @@ public class MinecartFurnaceController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new MinecartFurnaceNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -106,7 +103,6 @@ public class MinecartFurnaceController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -116,7 +112,6 @@ public class MinecartFurnaceController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
     }
 
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartHopperController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartHopperController.java
index 6c6e7f0f1..c82c8da6a 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartHopperController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartHopperController.java
@@ -56,7 +56,6 @@ public class MinecartHopperController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -68,7 +67,6 @@ public class MinecartHopperController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -92,7 +90,6 @@ public class MinecartHopperController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -102,7 +99,6 @@ public class MinecartHopperController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
     }
 }
\ No newline at end of file
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartRideableController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartRideableController.java
index 6ea3e66f6..7d3242145 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartRideableController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartRideableController.java
@@ -61,7 +61,6 @@ public class MinecartRideableController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -73,7 +72,6 @@ public class MinecartRideableController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -86,7 +84,6 @@ public class MinecartRideableController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new MinecartRideableNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -106,7 +103,6 @@ public class MinecartRideableController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -116,7 +112,6 @@ public class MinecartRideableController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
     }
 
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartSpawnerController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartSpawnerController.java
index 4e5bf205b..e2a0fae68 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartSpawnerController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartSpawnerController.java
@@ -56,7 +56,6 @@ public class MinecartSpawnerController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -68,7 +67,6 @@ public class MinecartSpawnerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -92,7 +90,6 @@ public class MinecartSpawnerController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -102,7 +99,6 @@ public class MinecartSpawnerController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
     }
 }
\ No newline at end of file
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartTNTController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartTNTController.java
index 74fa24c19..e8ca1483c 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartTNTController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/MinecartTNTController.java
@@ -56,7 +56,6 @@ public class MinecartTNTController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -68,7 +67,6 @@ public class MinecartTNTController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -92,7 +90,6 @@ public class MinecartTNTController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -102,7 +99,6 @@ public class MinecartTNTController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
     }
 }
\ No newline at end of file
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/PaintingController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/PaintingController.java
index 2b552a87f..470d37cbd 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/PaintingController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/PaintingController.java
@@ -61,7 +61,6 @@ public class PaintingController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -73,7 +72,6 @@ public class PaintingController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -86,7 +84,6 @@ public class PaintingController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new PaintingNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -106,7 +103,6 @@ public class PaintingController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -121,7 +117,6 @@ public class PaintingController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
     }
 
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ShulkerBulletController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ShulkerBulletController.java
index 1b0f6f7df..b1d8205d1 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ShulkerBulletController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ShulkerBulletController.java
@@ -61,7 +61,6 @@ public class ShulkerBulletController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -73,7 +72,6 @@ public class ShulkerBulletController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -86,7 +84,6 @@ public class ShulkerBulletController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ShulkerBulletNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -106,7 +103,6 @@ public class ShulkerBulletController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -116,7 +112,6 @@ public class ShulkerBulletController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
     }
 
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/SmallFireballController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/SmallFireballController.java
index 286a5159c..ffdfb8f22 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/SmallFireballController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/SmallFireballController.java
@@ -61,7 +61,6 @@ public class SmallFireballController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -73,7 +72,6 @@ public class SmallFireballController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -86,7 +84,6 @@ public class SmallFireballController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SmallFireballNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -106,7 +103,6 @@ public class SmallFireballController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -116,11 +112,9 @@ public class SmallFireballController extends MobEntityController {
                 if (!npc.isProtected()) {
                     super.tick();
                 }
-
             } else {
                 super.tick();
             }
-
         }
     }
 
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/SnowballController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/SnowballController.java
index 10db5d61d..fc2b77369 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/SnowballController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/SnowballController.java
@@ -61,7 +61,6 @@ public class SnowballController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -73,7 +72,6 @@ public class SnowballController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -86,7 +84,6 @@ public class SnowballController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SnowballNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -106,7 +103,6 @@ public class SnowballController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -116,7 +112,6 @@ public class SnowballController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
     }
 
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/SpectralArrowController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/SpectralArrowController.java
index 92b30cbc8..b564b41d2 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/SpectralArrowController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/SpectralArrowController.java
@@ -61,7 +61,6 @@ public class SpectralArrowController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -73,7 +72,6 @@ public class SpectralArrowController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -86,7 +84,6 @@ public class SpectralArrowController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SpectralArrowNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -106,7 +103,6 @@ public class SpectralArrowController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -116,7 +112,6 @@ public class SpectralArrowController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
     }
 
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/TNTPrimedController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/TNTPrimedController.java
index fa63d8431..660cf623d 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/TNTPrimedController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/TNTPrimedController.java
@@ -61,7 +61,6 @@ public class TNTPrimedController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -73,7 +72,6 @@ public class TNTPrimedController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -86,7 +84,6 @@ public class TNTPrimedController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new TNTPrimedNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -106,7 +103,6 @@ public class TNTPrimedController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -116,7 +112,6 @@ public class TNTPrimedController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
     }
 
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ThrownExpBottleController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ThrownExpBottleController.java
index 11654b6d9..63ef1a1cb 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ThrownExpBottleController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ThrownExpBottleController.java
@@ -61,7 +61,6 @@ public class ThrownExpBottleController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -73,7 +72,6 @@ public class ThrownExpBottleController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -86,7 +84,6 @@ public class ThrownExpBottleController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ThrownExpBottleNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -106,7 +103,6 @@ public class ThrownExpBottleController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -116,11 +112,9 @@ public class ThrownExpBottleController extends MobEntityController {
                 if (!npc.isProtected()) {
                     super.tick();
                 }
-
             } else {
                 super.tick();
             }
-
         }
     }
 
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ThrownPotionController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ThrownPotionController.java
index 421f62424..4963d6ae9 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ThrownPotionController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ThrownPotionController.java
@@ -62,7 +62,6 @@ public class ThrownPotionController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -74,7 +73,6 @@ public class ThrownPotionController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -90,9 +88,7 @@ public class ThrownPotionController extends MobEntityController {
                 } else {
                     NMSImpl.setBukkitEntity(this, new SplashThrownPotionNPC(this));
                 }
-
             }
-
             return super.getBukkitEntity();
         }
 
@@ -112,7 +108,6 @@ public class ThrownPotionController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -122,7 +117,6 @@ public class ThrownPotionController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
     }
 
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ThrownTridentController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ThrownTridentController.java
index 473e999b1..293db5e95 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ThrownTridentController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/ThrownTridentController.java
@@ -61,7 +61,6 @@ public class ThrownTridentController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -73,7 +72,6 @@ public class ThrownTridentController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -86,7 +84,6 @@ public class ThrownTridentController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ThrownTridentNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -106,7 +103,6 @@ public class ThrownTridentController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -116,7 +112,6 @@ public class ThrownTridentController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
     }
 
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/TippedArrowController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/TippedArrowController.java
index 194485be8..96dbcc34e 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/TippedArrowController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/TippedArrowController.java
@@ -61,7 +61,6 @@ public class TippedArrowController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -73,7 +72,6 @@ public class TippedArrowController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -86,7 +84,6 @@ public class TippedArrowController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new TippedArrowNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -106,7 +103,6 @@ public class TippedArrowController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -116,7 +112,6 @@ public class TippedArrowController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
     }
 
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/WitherSkullController.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/WitherSkullController.java
index e4a41549b..1e31ab6fb 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/WitherSkullController.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/nonliving/WitherSkullController.java
@@ -61,7 +61,6 @@ public class WitherSkullController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setMot(old);
             }
-
             return res;
         }
 
@@ -73,7 +72,6 @@ public class WitherSkullController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -86,7 +84,6 @@ public class WitherSkullController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new WitherSkullNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -106,7 +103,6 @@ public class WitherSkullController extends MobEntityController {
             if (vector != null) {
                 super.i(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -116,7 +112,6 @@ public class WitherSkullController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
     }
 
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/CitizensBlockBreaker.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/CitizensBlockBreaker.java
index 3459aeebc..719293a41 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/CitizensBlockBreaker.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/CitizensBlockBreaker.java
@@ -48,7 +48,6 @@ public class CitizensBlockBreaker extends AbstractBlockBreaker {
             ItemStack current = getCurrentItem();
             return current != null ? current.canDestroySpecialBlock(block) : false;
         }
-
     }
 
     @Override
@@ -66,13 +65,10 @@ public class CitizensBlockBreaker extends AbstractBlockBreaker {
                 if (i > 0) {
                     f += i * i + 1;
                 }
-
             }
-
             if (handle.hasEffect(MobEffects.FASTER_DIG)) {
                 f *= 1.0F + (handle.getEffect(MobEffects.FASTER_DIG).getAmplifier() + 1) * 0.2F;
             }
-
             if (handle.hasEffect(MobEffects.SLOWER_DIG)) {
                 float f1 = 1.0F;
                 switch (handle.getEffect(MobEffects.SLOWER_DIG).getAmplifier()) {
@@ -89,20 +85,15 @@ public class CitizensBlockBreaker extends AbstractBlockBreaker {
                     default:
                         f1 = 8.1E-4F;
                 }
-
                 f *= f1;
             }
-
             if (handle.a(TagsFluid.WATER) && !EnchantmentManager.h(handle)) {
                 f /= 5.0F;
             }
-
         }
-
         if (!getHandle().isOnGround()) {
             f /= 5.0F;
         }
-
         return f;
     }
 }
\ No newline at end of file
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/EmptyAdvancementDataPlayer.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/EmptyAdvancementDataPlayer.java
index 04223a5f6..0af5556fd 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/EmptyAdvancementDataPlayer.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/EmptyAdvancementDataPlayer.java
@@ -68,7 +68,6 @@ public class EmptyAdvancementDataPlayer extends AdvancementDataPlayer {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     private static final MethodHandle H = NMS.getGetter(AdvancementDataPlayer.class, "h");
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/EntityMoveControl.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/EntityMoveControl.java
index 1c9b1ca21..d6e339d6a 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/EntityMoveControl.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/EntityMoveControl.java
@@ -46,7 +46,6 @@ public class EntityMoveControl extends ControllerMove {
                 this.a.aT = 0.0F;
                 return;
             }
-
             float f = (float) Math.toDegrees(Math.atan2(d1, d0)) - 90.0F;
             this.a.yaw = a(this.a.yaw, f, 90.0F);
             NMS.setHeadYaw(a.getBukkitEntity(), this.a.yaw);
@@ -59,14 +58,11 @@ public class EntityMoveControl extends ControllerMove {
                 if (((EntitySlime) a).isAggressive()) {
                     this.h /= 3;
                 }
-
                 ai.getJumpControl().jump();
             } else if (d2 >= NMS.getStepHeight(a.getBukkitEntity()) && d0 * d0 + d1 * d1 < 1.0D) {
                 ai.getJumpControl().jump();
             }
-
         }
-
     }
 
     @Override
@@ -84,18 +80,15 @@ public class EntityMoveControl extends ControllerMove {
         if (f3 > f2) {
             f3 = f2;
         }
-
         if (f3 < -f2) {
             f3 = -f2;
         }
-
         float f4 = f + f3;
         if (f4 < 0.0F) {
             f4 += 360.0F;
         } else if (f4 > 360.0F) {
             f4 -= 360.0F;
         }
-
         return f4;
     }
 
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/EntityNavigation.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/EntityNavigation.java
index 7004c5e42..2161cdf95 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/EntityNavigation.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/EntityNavigation.java
@@ -90,25 +90,20 @@ public class EntityNavigation extends NavigationAbstract {
             while (var2.getY() > 0 && this.b.getType(var2).isAir()) {
                 var2 = var2.down();
             }
-
             if (var2.getY() > 0)
                 return supera(var2.up(), var1);
             while (var2.getY() < this.b.getBuildHeight() && this.b.getType(var2).isAir()) {
                 var2 = var2.up();
             }
-
             var0 = var2;
         }
-
         if (this.b.getType(var0).getMaterial().isBuildable()) {
             BlockPosition var2 = var0.up();
             while (var2.getY() < this.b.getBuildHeight() && this.b.getType(var2).getMaterial().isBuildable()) {
                 var2 = var2.up();
             }
-
             return supera(var2, var1);
         }
-
         return supera(var0, var1);
     }
 
@@ -169,11 +164,8 @@ public class EntityNavigation extends NavigationAbstract {
                             || var19 == PathType.DAMAGE_OTHER)
                         return false;
                 }
-
             }
-
         }
-
         return true;
     }
 
@@ -183,11 +175,9 @@ public class EntityNavigation extends NavigationAbstract {
             this.c = null;
             return false;
         }
-
         if (!var0.a(this.c)) {
             this.c = var0;
         }
-
         if (m())
             return false;
         D_();
@@ -229,7 +219,6 @@ public class EntityNavigation extends NavigationAbstract {
             this.q = var3;
             e();
         }
-
         return var8;
     }
 
@@ -247,11 +236,9 @@ public class EntityNavigation extends NavigationAbstract {
             } else {
                 this.t = false;
             }
-
             this.f = this.e;
             this.g = var0;
         }
-
         if (this.c != null && !this.c.c()) {
             BaseBlockPosition var1 = this.c.g();
             if (var1.equals(this.h)) {
@@ -261,15 +248,12 @@ public class EntityNavigation extends NavigationAbstract {
                 double var2 = var0.f(Vec3D.c(this.h));
                 this.k = this.a.dN() > 0.0F ? var2 / this.a.dN() * 1000.0D : 0.0D;
             }
-
             if (this.k > 0.0D && this.i > this.k * 3.0D) {
                 e();
                 o();
             }
-
             this.j = SystemUtils.getMonotonicMillis();
         }
-
     }
 
     @Override
@@ -297,11 +281,9 @@ public class EntityNavigation extends NavigationAbstract {
         if (var7 >= 0.0D) {
             var19++;
         }
-
         if (var9 >= 0.0D) {
             var21++;
         }
-
         var19 /= var7;
         var21 /= var9;
         int var23 = var7 < 0.0D ? -1 : 1;
@@ -320,11 +302,9 @@ public class EntityNavigation extends NavigationAbstract {
                 var6 += var24;
                 var28 = var26 - var6;
             }
-
             if (!a(var5, MathHelper.floor(var0.y), var6, var2, var3, var4, var0, var7, var9))
                 return false;
         }
-
         return true;
     }
 
@@ -343,7 +323,6 @@ public class EntityNavigation extends NavigationAbstract {
         if (var0.a(var2, this.c.e() - this.c.f())) {
             j();
         }
-
     }
 
     private boolean b(int var0, int var1, int var2, int var3, int var4, int var5, Vec3D var6, double var7,
@@ -355,11 +334,9 @@ public class EntityNavigation extends NavigationAbstract {
             if (var13 * var7 + var15 * var9 < 0.0D) {
                 continue;
             }
-
             if (!this.b.getType(var12).a(this.b, var12, PathMode.LAND))
                 return false;
         }
-
         return true;
     }
 
@@ -386,7 +363,6 @@ public class EntityNavigation extends NavigationAbstract {
         if (this.m) {
             j();
         }
-
         if (m())
             return;
         if (a()) {
@@ -398,9 +374,7 @@ public class EntityNavigation extends NavigationAbstract {
                     && MathHelper.floor(vec3D1.z) == MathHelper.floor(vec3D2.z)) {
                 this.c.a();
             }
-
         }
-
         if (m())
             return;
         Vec3D var0 = this.c.a(this.a);
@@ -430,11 +404,8 @@ public class EntityNavigation extends NavigationAbstract {
                     this.c.b(var0);
                     return;
                 }
-
             }
-
         }
-
     }
 
     private void e() {
@@ -472,11 +443,9 @@ public class EntityNavigation extends NavigationAbstract {
                 this.n = this.b.getTime();
                 this.m = false;
             }
-
         } else {
             this.m = true;
         }
-
     }
 
     @Override
@@ -499,7 +468,6 @@ public class EntityNavigation extends NavigationAbstract {
         if (var8 || b2 || b(this.c.h().l) && b(var0)) {
             this.c.a();
         }
-
         a(var0);
     }
 
@@ -553,11 +521,8 @@ public class EntityNavigation extends NavigationAbstract {
                 if (var2 != null && var1.b >= var2.b) {
                     this.c.a(var0 + 1, var1.a(var2.a, var1.b + 1, var2.c));
                 }
-
             }
-
         }
-
     }
 
     @Override
@@ -577,7 +542,6 @@ public class EntityNavigation extends NavigationAbstract {
             if (++var2 > 16)
                 return MathHelper.floor(this.a.locY());
         }
-
         return var0;
     }
 
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/EntityPathfinder.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/EntityPathfinder.java
index 8fda0ce98..9a45c1d61 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/EntityPathfinder.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/EntityPathfinder.java
@@ -72,7 +72,6 @@ public class EntityPathfinder extends Pathfinder {
             var4 = var4.h;
             var3.add(0, var4);
         }
-
         return new PathEntity(var3, var1, var2);
     }
 
@@ -95,17 +94,13 @@ public class EntityPathfinder extends Pathfinder {
                     pathDestination.e();
                     var8.add(pathDestination);
                 }
-
             }
-
             if (!var8.isEmpty()) {
                 break;
             }
-
             if (pathPoint.a(var0) >= var2) {
                 continue;
             }
-
             int i = this.c.a(this.a, pathPoint);
             for (int var12 = 0; var12 < i; var12++) {
                 PathPoint var13 = this.a[var12];
@@ -122,13 +117,9 @@ public class EntityPathfinder extends Pathfinder {
                         var13.g = var13.e + var13.f;
                         this.d.a(var13);
                     }
-
                 }
-
             }
-
         }
-
         Optional var10 = !var8.isEmpty()
                 ? var8.stream().map(var1x -> this.a(var1x.d(), (BlockPosition) var1.get(var1x), true)).min(
                         Comparator.comparingInt(PathEntity::e))
@@ -139,7 +130,6 @@ public class EntityPathfinder extends Pathfinder {
             PathEntity var11 = (PathEntity) var10.get();
             return var11;
         }
-
     }
 
     private float a(PathPoint var0, Set<PathDestination> var1) {
@@ -149,7 +139,6 @@ public class EntityPathfinder extends Pathfinder {
             var4.a(var5, var0);
             var2 = Math.min(var5, var2);
         }
-
         return var2;
     }
 
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/EntityPathfinderNormal.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/EntityPathfinderNormal.java
index f94c57535..dfb21c289 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/EntityPathfinderNormal.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/EntityPathfinderNormal.java
@@ -82,20 +82,16 @@ public class EntityPathfinderNormal extends EntityPathfinderAbstract {
         if (var4 == PathType.DOOR_WOOD_CLOSED && var1 && var2) {
             var4 = PathType.WALKABLE;
         }
-
         if (var4 == PathType.DOOR_OPEN && !var2) {
             var4 = PathType.BLOCKED;
         }
-
         if (var4 == PathType.RAIL && !(var0.getType(var3).getBlock() instanceof BlockMinecartTrackAbstract)
                 && !(var0.getType(var3.down()).getBlock() instanceof BlockMinecartTrackAbstract)) {
             var4 = PathType.UNPASSABLE_RAIL;
         }
-
         if (var4 == PathType.LEAVES) {
             var4 = PathType.BLOCKED;
         }
-
         return var4;
     }
 
@@ -122,9 +118,7 @@ public class EntityPathfinderNormal extends EntityPathfinderAbstract {
             if (mvmt.getPathfindingMalus(var15) >= mvmt.getPathfindingMalus(var13)) {
                 var13 = var15;
             }
-
         }
-
         if (var11 == PathType.OPEN && mvmt.getPathfindingMalus(var13) == 0.0F && var5 <= 1)
             return PathType.OPEN;
         return var13;
@@ -147,9 +141,7 @@ public class EntityPathfinderNormal extends EntityPathfinderAbstract {
             if (mvmt.getPathfindingMalus(var15) >= mvmt.getPathfindingMalus(var13)) {
                 var13 = var15;
             }
-
         }
-
         if (var11 == PathType.OPEN && mvmt.getPathfindingMalus(var13) == 0.0F && var5 <= 1)
             return PathType.OPEN;
         return var13;
@@ -168,14 +160,10 @@ public class EntityPathfinderNormal extends EntityPathfinderAbstract {
                     if (var12 == 0 && var13 == 0 && var14 == 0) {
                         var10 = var18;
                     }
-
                     var9.add(var18);
                 }
-
             }
-
         }
-
         return var10;
     }
 
@@ -193,11 +181,9 @@ public class EntityPathfinderNormal extends EntityPathfinderAbstract {
             var8.l = var12;
             var8.k = Math.max(var8.k, var13);
         }
-
         if (var7 == PathType.FENCE && var8 != null && var8.k >= 0.0F && !a(var8)) {
             var8 = null;
         }
-
         if (var12 == PathType.WALKABLE)
             return var8;
         if ((var8 == null || var8.k < 0.0F) && var3 > 0 && var12 != PathType.FENCE && var12 != PathType.UNPASSABLE_RAIL
@@ -212,11 +198,8 @@ public class EntityPathfinderNormal extends EntityPathfinderAbstract {
                 if (a(var20)) {
                     var8 = null;
                 }
-
             }
-
         }
-
         if (var12 == PathType.WATER && !e()) {
             if (a(this.b, var0, var1 - 1, var2) != PathType.WATER)
                 return var8;
@@ -229,12 +212,9 @@ public class EntityPathfinderNormal extends EntityPathfinderAbstract {
                     var8.k = Math.max(var8.k, mvmt.getPathfindingMalus(var12));
                     continue;
                 }
-
                 return var8;
             }
-
         }
-
         if (var12 == PathType.OPEN) {
             int var16 = 0;
             int var17 = var1;
@@ -246,14 +226,12 @@ public class EntityPathfinderNormal extends EntityPathfinderAbstract {
                     var18.k = -1.0F;
                     return var18;
                 }
-
                 if (var16++ >= this.b.bP()) {
                     PathPoint var18 = a(var0, var1, var2);
                     var18.l = PathType.BLOCKED;
                     var18.k = -1.0F;
                     return var18;
                 }
-
                 var12 = a(this.b, var0, var1, var2);
                 var13 = mvmt.getPathfindingMalus(var12);
                 if (var12 != PathType.OPEN && var13 >= 0.0F) {
@@ -262,25 +240,20 @@ public class EntityPathfinderNormal extends EntityPathfinderAbstract {
                     var8.k = Math.max(var8.k, var13);
                     break;
                 }
-
                 if (var13 < 0.0F) {
                     PathPoint var18 = a(var0, var1, var2);
                     var18.l = PathType.BLOCKED;
                     var18.k = -1.0F;
                     return var18;
                 }
-
             }
-
         }
-
         if (var12 == PathType.FENCE) {
             var8 = a(var0, var1, var2);
             var8.i = true;
             var8.l = var12;
             var8.k = var12.a();
         }
-
         return var8;
     }
 
@@ -294,7 +267,6 @@ public class EntityPathfinderNormal extends EntityPathfinderAbstract {
             if (a(var2))
                 return false;
         }
-
         return true;
     }
 
@@ -323,48 +295,39 @@ public class EntityPathfinderNormal extends EntityPathfinderAbstract {
         if (mvmt.getPathfindingMalus(var4) >= 0.0F && var5 != PathType.STICKY_HONEY) {
             var3 = MathHelper.d(Math.max(1.0F, this.b.G));
         }
-
         double var6 = aa(this.a, new BlockPosition(var1.a, var1.b, var1.c));
         PathPoint var8 = a(var1.a, var1.b, var1.c + 1, var3, var6, EnumDirection.SOUTH, var5);
         if (a(var8, var1)) {
             var0[var2++] = var8;
         }
-
         PathPoint var9 = a(var1.a - 1, var1.b, var1.c, var3, var6, EnumDirection.WEST, var5);
         if (a(var9, var1)) {
             var0[var2++] = var9;
         }
-
         PathPoint var10 = a(var1.a + 1, var1.b, var1.c, var3, var6, EnumDirection.EAST, var5);
         if (a(var10, var1)) {
             var0[var2++] = var10;
         }
-
         PathPoint var11 = a(var1.a, var1.b, var1.c - 1, var3, var6, EnumDirection.NORTH, var5);
         if (a(var11, var1)) {
             var0[var2++] = var11;
         }
-
         PathPoint var12 = a(var1.a - 1, var1.b, var1.c - 1, var3, var6, EnumDirection.NORTH, var5);
         if (a(var1, var9, var11, var12)) {
             var0[var2++] = var12;
         }
-
         PathPoint var13 = a(var1.a + 1, var1.b, var1.c - 1, var3, var6, EnumDirection.NORTH, var5);
         if (a(var1, var10, var11, var13)) {
             var0[var2++] = var13;
         }
-
         PathPoint var14 = a(var1.a - 1, var1.b, var1.c + 1, var3, var6, EnumDirection.SOUTH, var5);
         if (a(var1, var9, var8, var14)) {
             var0[var2++] = var14;
         }
-
         PathPoint var15 = a(var1.a + 1, var1.b, var1.c + 1, var3, var6, EnumDirection.SOUTH, var5);
         if (a(var1, var10, var8, var15)) {
             var0[var2++] = var15;
         }
-
         return var2;
     }
 
@@ -378,14 +341,12 @@ public class EntityPathfinderNormal extends EntityPathfinderAbstract {
                 var0++;
                 var2 = this.a.getType(var1.c(this.b.locX(), var0, this.b.locZ()));
             }
-
             var0--;
         } else if (e() && this.b.isInWater()) {
             while (var2.getBlock() == Blocks.WATER || var2.getFluid() == FluidTypes.WATER.a(false)) {
                 var0++;
                 var2 = this.a.getType(var1.c(this.b.locX(), var0, this.b.locZ()));
             }
-
             var0--;
         } else if (this.b.isOnGround()) {
             var0 = MathHelper.floor(this.b.locY() + 0.5D);
@@ -396,10 +357,8 @@ public class EntityPathfinderNormal extends EntityPathfinderAbstract {
                     && blockPosition.getY() > 0) {
                 blockPosition = blockPosition.down();
             }
-
             var0 = blockPosition.up().getY();
         }
-
         BlockPosition var3 = this.b.getChunkCoordinates();
         PathType var4 = a(this.b, var3.getX(), var0, var3.getZ());
         if (mvmt.getPathfindingMalus(var4) < 0.0F) {
@@ -413,9 +372,7 @@ public class EntityPathfinderNormal extends EntityPathfinderAbstract {
                 var6.k = mvmt.getPathfindingMalus(var6.l);
                 return var6;
             }
-
         }
-
         PathPoint var5 = a(var3.getX(), var0, var3.getZ());
         var5.l = a(this.b, var5.a());
         var5.k = mvmt.getPathfindingMalus(var5.l);
@@ -440,25 +397,19 @@ public class EntityPathfinderNormal extends EntityPathfinderAbstract {
             if (var6 == PathType.DAMAGE_FIRE) {
                 var5 = PathType.DAMAGE_FIRE;
             }
-
             if (var6 == PathType.DAMAGE_CACTUS) {
                 var5 = PathType.DAMAGE_CACTUS;
             }
-
             if (var6 == PathType.DAMAGE_OTHER) {
                 var5 = PathType.DAMAGE_OTHER;
             }
-
             if (var6 == PathType.STICKY_HONEY) {
                 var5 = PathType.STICKY_HONEY;
             }
-
         }
-
         if (var5 == PathType.WALKABLE) {
             var5 = a(var0, var1.d(var2, var3, var4), var5);
         }
-
         return var5;
     }
 
@@ -481,13 +432,9 @@ public class EntityPathfinderNormal extends EntityPathfinderAbstract {
                         if (var0.getFluid(var1).a(TagsFluid.WATER))
                             return PathType.WATER_BORDER;
                     }
-
                 }
-
             }
-
         }
-
         return var2;
     }
 
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/ForwardingNPCHolder.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/ForwardingNPCHolder.java
index 5e1021238..3333550bd 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/ForwardingNPCHolder.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/ForwardingNPCHolder.java
@@ -14,10 +14,8 @@ public interface ForwardingNPCHolder extends NPCHolder, Entity {
             if (Messaging.isDebugging()) {
                 Messaging.debug("ForwardingNPCHolder with an improper bukkit entity", this, handle);
             }
-
             return null;
         }
-
         return ((NPCHolder) handle).getNPC();
     }
 }
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/MobAI.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/MobAI.java
index a7280c223..c82ee0473 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/MobAI.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/MobAI.java
@@ -41,7 +41,6 @@ public interface MobAI {
         if (!NMSImpl.isNavigationFinished(navigation)) {
             NMSImpl.updateNavigation(navigation);
         }
-
     }
 
     default void updatePathfindingRange(float range) {
@@ -172,7 +171,6 @@ public interface MobAI {
             };
         } else if (handle instanceof MobAI)
             return (MobAI) handle;
-
         return null;
     }
 }
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/NMSImpl.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/NMSImpl.java
index 45bb54ae0..a255e5e24 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/NMSImpl.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/NMSImpl.java
@@ -351,21 +351,17 @@ public class NMSImpl implements NMSBridge {
                 viewDistance = (int) PLAYER_CHUNK_MAP_VIEW_DISTANCE_GETTER.invoke(chunkMap);
                 PLAYER_CHUNK_MAP_VIEW_DISTANCE_SETTER.invoke(chunkMap, -1);
             }
-
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         boolean success = getHandle(entity).world.addEntity(getHandle(entity), custom);
         try {
             if (chunkMap != null) {
                 PLAYER_CHUNK_MAP_VIEW_DISTANCE_SETTER.invoke(chunkMap, viewDistance);
             }
-
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         return success;
     }
 
@@ -381,14 +377,12 @@ public class NMSImpl implements NMSBridge {
         } else if (!handle.world.getPlayers().contains(handle)) {
             ((List) handle.world.getPlayers()).add(handle);
         }
-
         try {
             CHUNKMAP_UPDATE_PLAYER_STATUS.invoke(((WorldServer) handle.world).getChunkProvider().playerChunkMap, handle,
                     !remove);
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         // PlayerUpdateTask.addOrRemove(entity, remove);
     }
 
@@ -401,12 +395,10 @@ public class NMSImpl implements NMSBridge {
             PlayerAnimation.ARM_SWING.play((Player) handle.getBukkitEntity());
             return;
         }
-
         if (handle instanceof EntityInsentient) {
             ((EntityInsentient) handle).attackEntity(target);
             return;
         }
-
         AttributeModifiable attackDamage = handle.getAttributeInstance(GenericAttributes.ATTACK_DAMAGE);
         float f = (float) (attackDamage == null ? 1 : attackDamage.getValue());
         int i = 0;
@@ -414,7 +406,6 @@ public class NMSImpl implements NMSBridge {
             f += EnchantmentManager.a(handle.getItemInMainHand(), target.getMonsterType());
             i += EnchantmentManager.a(Enchantments.KNOCKBACK, handle);
         }
-
         boolean flag = target.damageEntity(DamageSource.mobAttack(handle), f);
         if (!flag)
             return;
@@ -423,12 +414,10 @@ public class NMSImpl implements NMSBridge {
                     Math.cos(handle.yaw * Math.PI / 180.0F) * i * 0.5F);
             handle.setMot(handle.getMot().d(0.6, 1, 0.6));
         }
-
         int fireAspectLevel = EnchantmentManager.getFireAspectEnchantmentLevel(handle);
         if (fireAspectLevel > 0) {
             target.setOnFire(fireAspectLevel * 4);
         }
-
     }
 
     @Override
@@ -443,9 +432,7 @@ public class NMSImpl implements NMSBridge {
             } catch (Throwable t) {
                 t.printStackTrace();
             }
-
         }
-
     }
 
     @Override
@@ -478,21 +465,16 @@ public class NMSImpl implements NMSBridge {
                         if (!changed && !ItemStack.matches(old, curr)) {
                             changed = true;
                         }
-
                         equipment.put(slot, curr);
                     }
-
                     if (changed) {
                         List<com.mojang.datafixers.util.Pair<EnumItemSlot, ItemStack>> vals = Lists.newArrayList();
                         for (EnumItemSlot slot : EnumItemSlot.values()) {
                             vals.add(com.mojang.datafixers.util.Pair.of(slot, equipment.get(slot)));
                         }
-
                         agg.send(new PacketPlayOutEntityEquipment(handle.getId(), vals));
                     }
-
                 }
-
                 tracker.a();
             }
 
@@ -513,9 +495,7 @@ public class NMSImpl implements NMSBridge {
                     if (callback != null) {
                         callback.accept(entity);
                     }
-
                 }
-
                 linked.clear();
             }
         };
@@ -566,11 +546,9 @@ public class NMSImpl implements NMSBridge {
                     return null;
                 bserver = ((EnderDragonBattle) battleObject).bossBattle;
             }
-
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         if (bserver == null)
             return null;
         BossBar ret = Bukkit.createBossBar("", BarColor.BLUE, BarStyle.SEGMENTED_10);
@@ -579,7 +557,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         return ret;
     }
 
@@ -689,13 +666,11 @@ public class NMSImpl implements NMSBridge {
             if (SKULL_PROFILE_FIELD == null)
                 return null;
         }
-
         try {
             return (GameProfile) SKULL_PROFILE_FIELD.get(meta);
         } catch (Exception e) {
             return null;
         }
-
     }
 
     @Override
@@ -713,11 +688,9 @@ public class NMSImpl implements NMSBridge {
                 MinecraftKey key = (MinecraftKey) SOUNDEFFECT_KEY.invoke(effect);
                 return key.getKey();
             }
-
         } catch (Throwable e) {
             throw new CommandException(Messages.INVALID_SOUND);
         }
-
     }
 
     @Override
@@ -733,7 +706,6 @@ public class NMSImpl implements NMSBridge {
         EntityLiving handle = NMSImpl.getHandle((LivingEntity) npc.getEntity());
         if (handle == null) {
         }
-
         return DEFAULT_SPEED;
         // return (float)
         // handle.getAttributeInstance(GenericAttributes.d).getValue();
@@ -778,9 +750,7 @@ public class NMSImpl implements NMSBridge {
             } else {
                 ((EntityInsentient) raw).a(PathType.WATER, oldWater + 1F);
             }
-
         }
-
         navigation.q().b(params.hasExaminer(DoorExaminer.class));
         return new MCNavigator() {
             float lastSpeed;
@@ -793,7 +763,6 @@ public class NMSImpl implements NMSBridge {
                     PathPoint pp = navigation.k().a(i);
                     blocks.add(entity.getWorld().getBlockAt(pp.a, pp.b, pp.c));
                 }
-
                 return blocks;
             }
 
@@ -813,16 +782,13 @@ public class NMSImpl implements NMSBridge {
                     List<org.bukkit.block.Block> blocks = getBlocks(entity, navigation);
                     Util.sendBlockChanges(blocks, null);
                 }
-
                 if (oldWater >= 0) {
                     if (raw instanceof MobAI) {
                         ((MobAI) raw).setPathfindingMalus(PathType.WATER, oldWater);
                     } else {
                         ((EntityInsentient) raw).a(PathType.WATER, oldWater);
                     }
-
                 }
-
                 stopNavigation(navigation);
             }
 
@@ -837,15 +803,12 @@ public class NMSImpl implements NMSBridge {
                             SIZE_FIELD_SETTER.invoke(handle,
                                     new EntitySize(Math.min(0.99F, size.width), size.height, false));
                         }
-
                     } catch (Throwable e) {
                         e.printStackTrace();
                     }
-
                     if (!function.apply(navigation)) {
                         reason = CancelReason.STUCK;
                     }
-
                     try {
                         SIZE_FIELD_SETTER.invoke(handle, size);
                     } catch (Throwable e) {
@@ -853,14 +816,11 @@ public class NMSImpl implements NMSBridge {
                         // minecraft requires that an entity fit onto both blocks if width >= 1f, but we'd prefer to
                         // make it just fit on 1 so hack around it a bit.
                     }
-
                     lastSpeed = params.speed();
                 }
-
                 if (params.debug() && !NMSImpl.isNavigationFinished(navigation)) {
                     Util.sendBlockChanges(getBlocks(entity, navigation), Material.DANDELION);
                 }
-
                 navigation.a((double) params.speed());
                 return NMSImpl.isNavigationFinished(navigation);
             }
@@ -1079,37 +1039,30 @@ public class NMSImpl implements NMSBridge {
             if (zDiff < 0.0) {
                 yaw += Math.abs(180 - yaw) * 2;
             }
-
             if (handle.getBukkitEntity().getType() == EntityType.ENDER_DRAGON) {
                 yaw = Util.getDragonYaw(handle.getBukkitEntity(), xDiff, zDiff);
             } else {
                 yaw = yaw - 90;
             }
-
             if (headOnly) {
                 setHeadYaw(entity, (float) yaw);
             } else {
                 look(entity, (float) yaw, (float) pitch);
             }
-
             return;
         }
-
         if (handle instanceof EntityInsentient) {
             ((EntityInsentient) handle).getControllerLook().a(to.getX(), to.getY(), to.getZ(),
                     ((EntityInsentient) handle).ep(), ((EntityInsentient) handle).O());
             while (((EntityLiving) handle).aC >= 180F) {
                 ((EntityLiving) handle).aC -= 360F;
             }
-
             while (((EntityLiving) handle).aC < -180F) {
                 ((EntityLiving) handle).aC += 360F;
             }
-
         } else if (handle instanceof NPCHolder) {
             ((NPCHolder) handle).getNPC().getOrAddTrait(RotationTrait.class).getPhysicalSession().rotateToFace(to);
         }
-
     }
 
     @Override
@@ -1122,22 +1075,18 @@ public class NMSImpl implements NMSBridge {
             } else {
                 look(from, to.getLocation(), false, true);
             }
-
         } else if (handle instanceof EntityInsentient) {
             ((EntityInsentient) handle).getControllerLook().a(target, ((EntityInsentient) handle).ep(),
                     ((EntityInsentient) handle).O());
             while (((EntityLiving) handle).aC >= 180F) {
                 ((EntityLiving) handle).aC -= 360F;
             }
-
             while (((EntityLiving) handle).aC < -180F) {
                 ((EntityLiving) handle).aC += 360F;
             }
-
         } else if (handle instanceof NPCHolder) {
             ((NPCHolder) handle).getNPC().getOrAddTrait(RotationTrait.class).getPhysicalSession().rotateToFace(to);
         }
-
     }
 
     @Override
@@ -1174,7 +1123,6 @@ public class NMSImpl implements NMSBridge {
                                     this.resultInventory, this, anvil),
                             this);
                 }
-
                 return this.bukkitEntity;
             }
         };
@@ -1221,13 +1169,11 @@ public class NMSImpl implements NMSBridge {
             if (key == null || type == null) {
                 continue;
             }
-
             CITIZENS_ENTITY_TYPES.put(clazz, type);
             int code = ENTITY_REGISTRY.a(type);
             ENTITY_REGISTRY.put(code, key, type);
             return;
         }
-
         throw new IllegalArgumentException("unable to find valid entity superclass for class " + clazz.toString());
     }
 
@@ -1265,7 +1211,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         if (hooked == null)
             return;
         NPC npc = CitizensAPI.getNPCRegistry().getNPC(hooked.getBukkitEntity());
@@ -1277,10 +1222,8 @@ public class NMSImpl implements NMSBridge {
             } catch (Throwable e) {
                 e.printStackTrace();
             }
-
             hook.getBukkitEntity().remove();
         }
-
     }
 
     @Override
@@ -1295,7 +1238,6 @@ public class NMSImpl implements NMSBridge {
         if (getHandle(entity) instanceof EntityHumanNPC) {
             ((EntityHumanNPC) getHandle(entity)).setTracked(replace);
         }
-
     }
 
     @Override
@@ -1305,11 +1247,9 @@ public class NMSImpl implements NMSBridge {
         if (bodyYaw == null) {
             bodyYaw = handle.yaw;
         }
-
         if (pitch == null) {
             pitch = handle.pitch;
         }
-
         List<Packet<?>> toSend = Lists.newArrayList();
         if (position) {
             EntityTracker entry = ((WorldServer) handle.world).getChunkProvider().playerChunkMap.trackedEntities
@@ -1321,7 +1261,6 @@ public class NMSImpl implements NMSBridge {
                 e.printStackTrace();
                 return;
             }
-
             Vec3D pos = handle.getPositionVector().d(ete.b());
             toSend.add(new PacketPlayOutRelEntityMoveLook(handle.getId(), (short) pos.x, (short) pos.y, (short) pos.z,
                     (byte) (bodyYaw * 256.0F / 360.0F), (byte) (pitch * 256.0F / 360.0F), handle.isOnGround()));
@@ -1329,11 +1268,9 @@ public class NMSImpl implements NMSBridge {
             toSend.add(new PacketPlayOutEntityLook(handle.getId(), (byte) (bodyYaw * 256.0F / 360.0F),
                     (byte) (pitch * 256.0F / 360.0F), handle.isOnGround()));
         }
-
         if (headYaw != null) {
             toSend.add(new PacketPlayOutEntityHeadRotation(handle, (byte) (headYaw * 256.0F / 360.0F)));
         }
-
         sendPacketsNearby(null, from.getLocation(), toSend, 64);
     }
 
@@ -1357,7 +1294,6 @@ public class NMSImpl implements NMSBridge {
             entities[i] = (EntityPlayer) skinnable;
             i++;
         }
-
         NMSImpl.sendPacket(recipient,
                 new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.REMOVE_PLAYER, entities));
     }
@@ -1378,14 +1314,12 @@ public class NMSImpl implements NMSBridge {
         if (TEAM_FIELD == null) {
             TEAM_FIELD = NMS.getGetter(team.getClass(), "team");
         }
-
         try {
             ScoreboardTeam nmsTeam = (ScoreboardTeam) TEAM_FIELD.invoke(team);
             sendPacket(recipient, new PacketPlayOutScoreboardTeam(nmsTeam, mode));
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     @Override
@@ -1421,7 +1355,6 @@ public class NMSImpl implements NMSBridge {
         } else if (handle instanceof MobAI) {
             ((MobAI) handle).getMoveControl().a(x, y, z, speed);
         }
-
     }
 
     @Override
@@ -1446,7 +1379,6 @@ public class NMSImpl implements NMSBridge {
         if (!(handle instanceof EntityHuman)) {
             handle.aA = yaw; // TODO: why this
         }
-
         handle.setHeadRotation(yaw);
     }
 
@@ -1492,11 +1424,9 @@ public class NMSImpl implements NMSBridge {
                         npc.data().get("flying-nogravity-float"));
                 npc.data().remove("flying-nogravity-float");
             }
-
         } catch (Throwable t) {
             t.printStackTrace();
         }
-
     }
 
     @Override
@@ -1533,13 +1463,11 @@ public class NMSImpl implements NMSBridge {
             if (SET_PROFILE_METHOD == null)
                 return;
         }
-
         try {
             SET_PROFILE_METHOD.invoke(meta, profile);
         } catch (Throwable t) {
             t.printStackTrace();
         }
-
     }
 
     @Override
@@ -1553,7 +1481,6 @@ public class NMSImpl implements NMSBridge {
         } else if (handle instanceof MobAI) {
             ((MobAI) handle).getJumpControl().jump();
         }
-
     }
 
     @Override
@@ -1571,7 +1498,6 @@ public class NMSImpl implements NMSBridge {
         if (entity instanceof Player) {
             ((Player) entity).setSneaking(sneaking);
         }
-
         EntityPose pose = sneaking ? EntityPose.CROUCHING : EntityPose.STANDING;
         getHandle(entity).setPose(pose);
     }
@@ -1604,7 +1530,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         return false;
     }
 
@@ -1617,7 +1542,6 @@ public class NMSImpl implements NMSBridge {
             field.invoke(null, ENTITY_REGISTRY.get());
         } catch (Throwable e) {
         }
-
     }
 
     @Override
@@ -1627,7 +1551,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     @Override
@@ -1643,7 +1566,6 @@ public class NMSImpl implements NMSBridge {
         if (RANDOM.nextFloat() <= 0.85F && handle.isInWater()) {
             handle.setMot(handle.getMot().getX(), handle.getMot().getY() + power, handle.getMot().getZ());
         }
-
     }
 
     @Override
@@ -1733,7 +1655,6 @@ public class NMSImpl implements NMSBridge {
                 menuType = Containers.CRAFTING;
                 break;
         }
-
         Container active = handle.activeContainer;
         handle.playerConnection
                 .sendPacket(new PacketPlayOutOpenWindow(active.windowId, menuType, new ChatComponentText(newTitle)));
@@ -1756,7 +1677,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     @Override
@@ -1768,7 +1688,6 @@ public class NMSImpl implements NMSBridge {
             ((MobAI) en).updatePathfindingRange(pathfindingRange);
             return;
         }
-
         if (NAVIGATION_S == null)
             return;
         NavigationAbstract navigation = ((EntityInsentient) en).getNavigation();
@@ -1780,7 +1699,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     private static class CitizensInventoryAnvil extends CraftInventoryAnvil implements ForwardingInventory {
@@ -1890,7 +1808,6 @@ public class NMSImpl implements NMSBridge {
             e.printStackTrace();
             return;
         }
-
         float oldw = size.width;
         float oldl = size.height;
         cb.accept(datawatcherobject);
@@ -1898,7 +1815,6 @@ public class NMSImpl implements NMSBridge {
             living.setPosition(living.locX() - 0.01, living.locY(), living.locZ() - 0.01);
             living.setPosition(living.locX() + 0.01, living.locY(), living.locZ() + 0.01);
         }
-
     }
 
     public static void clearGoals(NPC npc, PathfinderGoalSelector... goalSelectors) {
@@ -1911,17 +1827,14 @@ public class NMSImpl implements NMSBridge {
                 if (!list.isEmpty()) {
                     npc.data().set("selector" + i, Lists.newArrayList(list));
                 }
-
                 list.clear();
             } catch (Exception e) {
                 Messaging.logTr(Messages.ERROR_CLEARING_GOALS, e.getLocalizedMessage());
             } catch (Throwable e) {
                 Messaging.logTr(Messages.ERROR_CLEARING_GOALS, e.getLocalizedMessage());
             }
-
             i++;
         }
-
     }
 
     private static CompoundTag convertNBT(net.minecraft.server.v1_16_R3.NBTTagCompound tag) {
@@ -1931,7 +1844,6 @@ public class NMSImpl implements NMSBridge {
         for (String key : tag.getKeys()) {
             tags.put(key, convertNBT(key, tag.get(key)));
         }
-
         return new CompoundTag("", tags);
     }
 
@@ -1962,10 +1874,8 @@ public class NMSImpl implements NMSBridge {
                 for (int i = 0; i < list.size(); i++) {
                     converted.add(convertNBT("", list.get(i)));
                 }
-
                 return new ListTag(key, tagType, converted);
             }
-
         } else if (base instanceof net.minecraft.server.v1_16_R3.NBTTagCompound)
             return convertNBT((net.minecraft.server.v1_16_R3.NBTTagCompound) base);
         else if (base instanceof net.minecraft.server.v1_16_R3.NBTTagEnd)
@@ -1981,7 +1891,6 @@ public class NMSImpl implements NMSBridge {
                 d0 = 0.01D;
                 entity.fallDistance = 0.0F;
             }
-
             Fluid fluid = entity.world.getFluid(entity.getChunkCoordinates());
             if (entity.isInWater() /*&& entity.cT() */ && !entity.a(fluid.getType())) {
                 double d1 = entity.locY();
@@ -1991,34 +1900,28 @@ public class NMSImpl implements NMSBridge {
                 if (f2 > 3.0F) {
                     f2 = 3.0F;
                 }
-
                 if (!entity.isOnGround()) {
                     f2 *= 0.5F;
                 }
-
                 if (f2 > 0.0F) {
                     f += (0.54600006F - f) * f2 / 3.0F;
                     f1 += (entity.dN() - f1) * f2 / 3.0F;
                 }
-
                 if (entity.hasEffect(MobEffects.DOLPHINS_GRACE)) {
                     f = 0.96F;
                 }
-
                 entity.a(f1, vec3d);
                 entity.move(EnumMoveType.SELF, entity.getMot());
                 Vec3D vec3d1 = entity.getMot();
                 if (entity.positionChanged && entity.isClimbing()) {
                     vec3d1 = new Vec3D(vec3d1.x, 0.2D, vec3d1.z);
                 }
-
                 entity.setMot(vec3d1.d(f, 0.800000011920929D, f));
                 Vec3D vec3d2 = entity.a(d0, flag, entity.getMot());
                 entity.setMot(vec3d2);
                 if (entity.positionChanged && entity.e(vec3d2.x, vec3d2.y + 0.6D - entity.locY() + d1, vec3d2.z)) {
                     entity.setMot(vec3d2.x, 0.30000001192092896D, vec3d2.z);
                 }
-
             } else if (entity.aQ() /*&& entity.cT()*/ && !entity.a(fluid.getType())) {
                 double d1 = entity.locY();
                 entity.a(0.02F, vec3d);
@@ -2030,22 +1933,18 @@ public class NMSImpl implements NMSBridge {
                 } else {
                     entity.setMot(entity.getMot().a(0.5D));
                 }
-
                 if (!entity.isNoGravity()) {
                     entity.setMot(entity.getMot().add(0.0D, -d0 / 4.0D, 0.0D));
                 }
-
                 Vec3D vec3d3 = entity.getMot();
                 if (entity.positionChanged && entity.e(vec3d3.x, vec3d3.y + 0.6D - entity.locY() + d1, vec3d3.z)) {
                     entity.setMot(vec3d3.x, 0.3D, vec3d3.z);
                 }
-
             } else if (entity.isGliding()) {
                 Vec3D vec3d4 = entity.getMot();
                 if (vec3d4.y > -0.5D) {
                     entity.fallDistance = 1.0F;
                 }
-
                 Vec3D vec3d5 = entity.getLookDirection();
                 float f = entity.pitch * 0.017453292F;
                 double d2 = Math.sqrt(vec3d5.x * vec3d5.x + vec3d5.z * vec3d5.z);
@@ -2058,17 +1957,14 @@ public class NMSImpl implements NMSBridge {
                     double d5 = vec3d4.y * -0.1D * f3;
                     vec3d4 = vec3d4.add(vec3d5.x * d5 / d2, d5, vec3d5.z * d5 / d2);
                 }
-
                 if (f < 0.0F && d2 > 0.0D) {
                     double d5 = d3 * -MathHelper.sin(f) * 0.04D;
                     vec3d4 = vec3d4.add(-vec3d5.x * d5 / d2, d5 * 3.2D, -vec3d5.z * d5 / d2);
                 }
-
                 if (d2 > 0.0D) {
                     vec3d4 = vec3d4.add((vec3d5.x / d2 * d3 - vec3d4.x) * 0.1D, 0.0D,
                             (vec3d5.z / d2 * d3 - vec3d4.z) * 0.1D);
                 }
-
                 entity.setMot(vec3d4.d(0.9900000095367432D, 0.9800000190734863D, 0.9900000095367432D));
                 entity.move(EnumMoveType.SELF, entity.getMot());
                 if (entity.positionChanged && !entity.world.isClientSide) {
@@ -2081,17 +1977,13 @@ public class NMSImpl implements NMSBridge {
                         } catch (Throwable e) {
                             e.printStackTrace();
                         }
-
                         entity.damageEntity(DamageSource.FLY_INTO_WALL, f4);
                     }
-
                 }
-
                 if (entity.isOnGround() && !entity.world.isClientSide && entity.getFlag(7)
                         && !CraftEventFactory.callToggleGlideEvent(entity, false).isCancelled()) {
                     entity.setFlag(7, false);
                 }
-
             } else {
                 BlockPosition blockposition = new BlockPosition(entity.locX(),
                         entity.getBoundingBox().minY - 0.5000001D, entity.locZ());// entity.ar();
@@ -2108,16 +2000,12 @@ public class NMSImpl implements NMSBridge {
                     } else {
                         d7 = 0.0D;
                     }
-
                 } else if (!entity.isNoGravity()) {
                     d7 -= d0;
                 }
-
                 entity.setMot(vec3d6.x * f, d7 * 0.9800000190734863D, vec3d6.z * f);
             }
-
         }
-
         entity.a(entity, entity instanceof EntityBird);
     }
 
@@ -2127,7 +2015,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         return null;
     }
 
@@ -2163,7 +2050,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         return null;
     }
 
@@ -2173,7 +2059,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         return null;
     }
 
@@ -2210,7 +2095,6 @@ public class NMSImpl implements NMSBridge {
         if (mat != null) {
             minecart.setDisplayBlock(Block.getByCombinedId(mat.getId()).getBlock().getBlockData());
         }
-
         minecart.setDisplayBlockOffset(offset);
     }
 
@@ -2227,7 +2111,6 @@ public class NMSImpl implements NMSBridge {
             handle.setMot(handle.getMot().a(0.9));
             return true;
         }
-
         return false;
     }
 
@@ -2238,7 +2121,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     public static void restoreGoals(NPC npc, PathfinderGoalSelector... goalSelectors) {
@@ -2253,16 +2135,13 @@ public class NMSImpl implements NMSBridge {
                 if (old != null) {
                     list.addAll(old);
                 }
-
             } catch (Exception e) {
                 Messaging.logTr(Messages.ERROR_RESTORING_GOALS, e.getLocalizedMessage());
             } catch (Throwable e) {
                 Messaging.logTr(Messages.ERROR_RESTORING_GOALS, e.getLocalizedMessage());
             }
-
             i++;
         }
-
     }
 
     public static void sendPacket(Player player, Packet<?> packet) {
@@ -2289,13 +2168,10 @@ public class NMSImpl implements NMSBridge {
                     || location.distanceSquared(player.getLocation(PACKET_CACHE_LOCATION)) > radius) {
                 continue;
             }
-
             for (Packet<?> packet : packets) {
                 NMSImpl.sendPacket(player, packet);
             }
-
         }
-
     }
 
     public static void sendPacketsNearby(Player from, Location location, Packet<?>... packets) {
@@ -2308,7 +2184,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     public static void setAttribute(EntityLiving entity, AttributeBase attribute, double value) {
@@ -2326,10 +2201,8 @@ public class NMSImpl implements NMSBridge {
             } catch (Throwable e) {
                 e.printStackTrace();
             }
-
             range = entity.getAttributeMap().a(attribute);
         }
-
         range.setValue(value);
     }
 
@@ -2339,7 +2212,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     public static void setLookControl(EntityInsentient mob, ControllerLook control) {
@@ -2348,7 +2220,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     public static void setNotInSchool(EntityFish entity) {
@@ -2356,11 +2227,9 @@ public class NMSImpl implements NMSBridge {
             if (ENTITY_FISH_NUM_IN_SCHOOL != null) {
                 ENTITY_FISH_NUM_IN_SCHOOL.invoke(entity, 2);
             }
-
         } catch (Throwable ex) {
             ex.printStackTrace();
         }
-
     }
 
     public static void setSize(Entity entity, boolean justCreated) {
@@ -2383,13 +2252,10 @@ public class NMSImpl implements NMSBridge {
                     float f = entitysize.width - entitysize1.width;
                     entity.move(EnumMoveType.SELF, new Vec3D(f, 0.0D, f));
                 }
-
             }
-
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     public static void setSize(Entity entity, EntitySize size) {
@@ -2399,7 +2265,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     public static void stopNavigation(NavigationAbstract navigation) {
@@ -2417,7 +2282,6 @@ public class NMSImpl implements NMSBridge {
         } else if (entity instanceof MobAI) {
             ((MobAI) entity).tickAI();
         }
-
     }
 
     public static void updateMinecraftAIState(NPC npc, EntityInsentient entity) {
@@ -2430,7 +2294,6 @@ public class NMSImpl implements NMSBridge {
                 getBehaviorMap(entity).putAll(behavior);
                 npc.data().remove("behavior-map");
             }
-
         } else {
             NMSImpl.clearGoals(npc, entity.goalSelector, entity.targetSelector);
             TreeMap behaviorMap = getBehaviorMap(entity);
@@ -2438,9 +2301,7 @@ public class NMSImpl implements NMSBridge {
                 npc.data().set("behavior-map", new TreeMap(behaviorMap));
                 behaviorMap.clear();
             }
-
         }
-
     }
 
     public static void updateNavigation(NavigationAbstract navigation) {
@@ -2522,7 +2383,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             Messaging.logTr(Messages.ERROR_GETTING_ID_MAPPING, e.getMessage());
         }
-
         try {
             ENDERMAN_ANGRY = (DataWatcherObject<Boolean>) NMS.getField(EntityEnderman.class, "bo").get(null);
         } catch (IllegalArgumentException e) {
@@ -2530,6 +2390,5 @@ public class NMSImpl implements NMSBridge {
         } catch (IllegalAccessException e) {
             e.printStackTrace();
         }
-
     }
 }
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PitchableLookControl.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PitchableLookControl.java
index 2c54d27a6..24bca6353 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PitchableLookControl.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PitchableLookControl.java
@@ -18,7 +18,6 @@ public class PitchableLookControl extends ControllerLook {
         } else {
             resetOnTick = () -> true;
         }
-
     }
 
     @Override
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PlayerAnimationImpl.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PlayerAnimationImpl.java
index cc87f9f6a..3201d1aa9 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PlayerAnimationImpl.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PlayerAnimationImpl.java
@@ -21,7 +21,6 @@ public class PlayerAnimationImpl {
             playDefaultAnimation(player, to, DEFAULTS.get(animation));
             return;
         }
-
         switch (animation) {
             case SNEAK:
                 player.setPose(EntityPose.CROUCHING);
@@ -52,7 +51,6 @@ public class PlayerAnimationImpl {
             default:
                 throw new UnsupportedOperationException();
         }
-
     }
 
     protected static void playDefaultAnimation(EntityPlayer player, Iterable<Player> to, int code) {
@@ -64,7 +62,6 @@ public class PlayerAnimationImpl {
         for (Player player : to) {
             NMSImpl.sendPacket(player, packet);
         }
-
     }
 
     private static EnumMap<PlayerAnimation, Integer> DEFAULTS = Maps.newEnumMap(PlayerAnimation.class);
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PlayerlistTracker.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PlayerlistTracker.java
index bf6b6c663..75c1db8d1 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PlayerlistTracker.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PlayerlistTracker.java
@@ -44,14 +44,12 @@ public class PlayerlistTracker extends PlayerChunkMap.EntityTracker {
                         if (res == null) {
                             updateLastPlayer(player);
                         }
-
                         return res;
                     }
                 });
             } catch (Throwable e) {
                 e.printStackTrace();
             }
-
         } else {
             try {
                 Set<EntityPlayer> delegate = super.trackedPlayers;
@@ -62,7 +60,6 @@ public class PlayerlistTracker extends PlayerChunkMap.EntityTracker {
                         if (res) {
                             updateLastPlayer(player);
                         }
-
                         return res;
                     }
 
@@ -74,9 +71,7 @@ public class PlayerlistTracker extends PlayerChunkMap.EntityTracker {
             } catch (Throwable e) {
                 e.printStackTrace();
             }
-
         }
-
     }
 
     public PlayerlistTracker(PlayerChunkMap map, EntityTracker entry) {
@@ -92,7 +87,6 @@ public class PlayerlistTracker extends PlayerChunkMap.EntityTracker {
             Bukkit.getPluginManager().callEvent(
                     new NPCLinkToPlayerEvent(((NPCHolder) tracker).getNPC(), lastUpdatedPlayer.getBukkitEntity()));
         }
-
     }
 
     @Override
@@ -116,11 +110,8 @@ public class PlayerlistTracker extends PlayerChunkMap.EntityTracker {
                 } catch (Throwable e) {
                     e.printStackTrace();
                 }
-
             }
-
         }
-
         super.updatePlayer(entityplayer);
     }
 
@@ -130,7 +121,6 @@ public class PlayerlistTracker extends PlayerChunkMap.EntityTracker {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         return 0;
     }
 
@@ -140,7 +130,6 @@ public class PlayerlistTracker extends PlayerChunkMap.EntityTracker {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         return false;
     }
 
@@ -150,7 +139,6 @@ public class PlayerlistTracker extends PlayerChunkMap.EntityTracker {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         return null;
     }
 
@@ -160,7 +148,6 @@ public class PlayerlistTracker extends PlayerChunkMap.EntityTracker {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         return 0;
     }
 
@@ -180,9 +167,7 @@ public class PlayerlistTracker extends PlayerChunkMap.EntityTracker {
                 TRACKING_MAP_SETTER = NMS.getFirstSetter(EntityTracker.class, Map.class);
                 TRACKING_MAP_GETTER = NMS.getFirstGetter(EntityTracker.class, Map.class);
             }
-
         } catch (Exception e) {
         }
-
     }
 }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ArmorStandController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ArmorStandController.java
index 74bcfe00d..0624e34b3 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ArmorStandController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ArmorStandController.java
@@ -59,7 +59,6 @@ public class ArmorStandController extends MobEntityController {
             if (ai != null) {
                 ai = new BasicMobAI(this);
             }
-
         }
 
         @Override
@@ -72,7 +71,6 @@ public class ArmorStandController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ArmorStandNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -108,7 +106,6 @@ public class ArmorStandController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -119,7 +116,6 @@ public class ArmorStandController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -134,7 +130,6 @@ public class ArmorStandController extends MobEntityController {
                 npc.update();
                 ai.tickAI();
             }
-
         }
 
         @Override
@@ -146,7 +141,6 @@ public class ArmorStandController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/AxolotlController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/AxolotlController.java
index da3b4f502..980e4c92a 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/AxolotlController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/AxolotlController.java
@@ -76,7 +76,6 @@ public class AxolotlController extends MobEntityController {
                 this.getAttribute(Attributes.MOVEMENT_SPEED)
                         .setBaseValue(this.getAttribute(Attributes.MOVEMENT_SPEED).getBaseValue() / 10);
             }
-
         }
 
         @Override
@@ -98,7 +97,6 @@ public class AxolotlController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -106,7 +104,6 @@ public class AxolotlController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -119,7 +116,6 @@ public class AxolotlController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new AxolotlNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -206,7 +202,6 @@ public class AxolotlController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -217,7 +212,6 @@ public class AxolotlController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -233,14 +227,11 @@ public class AxolotlController extends MobEntityController {
                 if (npc.useMinecraftAI() && this.moveControl != this.oldMoveController) {
                     this.moveControl = this.oldMoveController;
                 }
-
                 if (!npc.useMinecraftAI() && this.moveControl == this.oldMoveController) {
                     this.moveControl = new EntityMoveControl(this);
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
@@ -249,11 +240,9 @@ public class AxolotlController extends MobEntityController {
                 if (!NMSImpl.moveFish(npc, this, vec3d)) {
                     super.travel(vec3d);
                 }
-
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -265,7 +254,6 @@ public class AxolotlController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/BatController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/BatController.java
index 1d9157cca..23ae6e15d 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/BatController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/BatController.java
@@ -58,7 +58,6 @@ public class BatController extends MobEntityController {
             if (npc != null) {
                 setResting(false);
             }
-
         }
 
         @Override
@@ -73,7 +72,6 @@ public class BatController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -85,10 +83,8 @@ public class BatController extends MobEntityController {
                 if (npc.useMinecraftAI()) {
                     super.customServerAiStep();
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
@@ -101,7 +97,6 @@ public class BatController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new BatNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -163,7 +158,6 @@ public class BatController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -174,7 +168,6 @@ public class BatController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -191,7 +184,6 @@ public class BatController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/BeeController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/BeeController.java
index c03db84a7..a78719cf9 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/BeeController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/BeeController.java
@@ -69,7 +69,6 @@ public class BeeController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -81,10 +80,8 @@ public class BeeController extends MobEntityController {
                 if (npc.useMinecraftAI()) {
                     super.customServerAiStep();
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
@@ -97,7 +94,6 @@ public class BeeController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new BeeNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -159,7 +155,6 @@ public class BeeController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -170,7 +165,6 @@ public class BeeController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -187,7 +181,6 @@ public class BeeController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/BlazeController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/BlazeController.java
index 02229d242..912df860f 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/BlazeController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/BlazeController.java
@@ -69,7 +69,6 @@ public class BlazeController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -78,7 +77,6 @@ public class BlazeController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -91,7 +89,6 @@ public class BlazeController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new BlazeNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -153,7 +150,6 @@ public class BlazeController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -164,7 +160,6 @@ public class BlazeController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -181,7 +176,6 @@ public class BlazeController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CatController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CatController.java
index 5f9fff582..e63900c4d 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CatController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CatController.java
@@ -79,7 +79,6 @@ public class CatController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -87,7 +86,6 @@ public class CatController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -97,7 +95,6 @@ public class CatController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -110,7 +107,6 @@ public class CatController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new CatNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -180,7 +176,6 @@ public class CatController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -190,7 +185,6 @@ public class CatController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -201,7 +195,6 @@ public class CatController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -216,7 +209,6 @@ public class CatController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -228,7 +220,6 @@ public class CatController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CaveSpiderController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CaveSpiderController.java
index 35174ada9..6dfef8c6c 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CaveSpiderController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CaveSpiderController.java
@@ -78,7 +78,6 @@ public class CaveSpiderController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -86,7 +85,6 @@ public class CaveSpiderController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -96,7 +94,6 @@ public class CaveSpiderController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -109,7 +106,6 @@ public class CaveSpiderController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new CaveSpiderNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -179,7 +175,6 @@ public class CaveSpiderController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -190,7 +185,6 @@ public class CaveSpiderController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -200,7 +194,6 @@ public class CaveSpiderController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -215,7 +208,6 @@ public class CaveSpiderController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -227,7 +219,6 @@ public class CaveSpiderController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ChickenController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ChickenController.java
index 0e6fa24d7..6159667ae 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ChickenController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ChickenController.java
@@ -65,7 +65,6 @@ public class ChickenController extends MobEntityController {
             if (npc != null) {
                 this.eggTime = 100;
             }
-
             super.aiStep();
         }
 
@@ -88,7 +87,6 @@ public class ChickenController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -96,7 +94,6 @@ public class ChickenController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -106,7 +103,6 @@ public class ChickenController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -119,7 +115,6 @@ public class ChickenController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ChickenNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -189,7 +184,6 @@ public class ChickenController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -199,7 +193,6 @@ public class ChickenController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -210,7 +203,6 @@ public class ChickenController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -225,7 +217,6 @@ public class ChickenController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -237,7 +228,6 @@ public class ChickenController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CodController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CodController.java
index 722895630..02a08d2d1 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CodController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CodController.java
@@ -70,7 +70,6 @@ public class CodController extends MobEntityController {
                 this.oldMoveController = this.moveControl;
                 this.moveControl = new MoveControl(this);
             }
-
         }
 
         @Override
@@ -79,12 +78,10 @@ public class CodController extends MobEntityController {
             if (npc != null) {
                 this.verticalCollision = false;
             }
-
             super.aiStep();
             if (npc != null) {
                 this.verticalCollision = lastInWater;
             }
-
         }
 
         @Override
@@ -106,7 +103,6 @@ public class CodController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -114,7 +110,6 @@ public class CodController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -123,23 +118,18 @@ public class CodController extends MobEntityController {
                 if (!npc.useMinecraftAI()) {
                     NMSImpl.setNotInSchool(this);
                 }
-
                 NMSImpl.updateMinecraftAIState(npc, this);
                 if (npc.useMinecraftAI() && this.moveControl != this.oldMoveController) {
                     this.moveControl = this.oldMoveController;
                 }
-
                 if (!npc.useMinecraftAI() && this.moveControl == this.oldMoveController) {
                     this.moveControl = new EntityMoveControl(this);
                 }
-
             }
-
             super.customServerAiStep();
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -152,7 +142,6 @@ public class CodController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new CodNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -232,7 +221,6 @@ public class CodController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -243,7 +231,6 @@ public class CodController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -257,11 +244,9 @@ public class CodController extends MobEntityController {
                 if (!NMSImpl.moveFish(npc, this, vec3d)) {
                     super.travel(vec3d);
                 }
-
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -273,7 +258,6 @@ public class CodController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CowController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CowController.java
index c75d2ce72..e7607411a 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CowController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CowController.java
@@ -84,7 +84,6 @@ public class CowController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -92,7 +91,6 @@ public class CowController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -102,7 +100,6 @@ public class CowController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -115,7 +112,6 @@ public class CowController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new CowNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -195,7 +191,6 @@ public class CowController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -205,7 +200,6 @@ public class CowController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -216,7 +210,6 @@ public class CowController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -231,7 +224,6 @@ public class CowController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -243,7 +235,6 @@ public class CowController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CreeperController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CreeperController.java
index fa7e83546..0ecc281af 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CreeperController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/CreeperController.java
@@ -82,7 +82,6 @@ public class CreeperController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -90,7 +89,6 @@ public class CreeperController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -100,7 +98,6 @@ public class CreeperController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -113,7 +110,6 @@ public class CreeperController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new CreeperNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -152,7 +148,6 @@ public class CreeperController extends MobEntityController {
             if (npc == null || !npc.isProtected()) {
                 super.ignite();
             }
-
         }
 
         @Override
@@ -191,7 +186,6 @@ public class CreeperController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -202,7 +196,6 @@ public class CreeperController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -212,7 +205,6 @@ public class CreeperController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -229,7 +221,6 @@ public class CreeperController extends MobEntityController {
             if (npc == null || allowPowered) {
                 super.thunderHit(worldserver, entitylightning);
             }
-
         }
 
         @Override
@@ -239,7 +230,6 @@ public class CreeperController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -251,7 +241,6 @@ public class CreeperController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/DolphinController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/DolphinController.java
index 569ee3156..57d0a1610 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/DolphinController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/DolphinController.java
@@ -70,7 +70,6 @@ public class DolphinController extends MobEntityController {
                 this.getAttribute(Attributes.MOVEMENT_SPEED)
                         .setBaseValue(this.getAttribute(Attributes.MOVEMENT_SPEED).getBaseValue() / 10);
             }
-
         }
 
         @Override
@@ -92,7 +91,6 @@ public class DolphinController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -100,7 +98,6 @@ public class DolphinController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -113,7 +110,6 @@ public class DolphinController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new DolphinNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -188,7 +184,6 @@ public class DolphinController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -199,7 +194,6 @@ public class DolphinController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -212,7 +206,6 @@ public class DolphinController extends MobEntityController {
             if (npc != null && npc.isProtected()) {
                 inProtectedTick = true;
             }
-
             super.tick();
             inProtectedTick = false;
             if (npc != null) {
@@ -220,14 +213,11 @@ public class DolphinController extends MobEntityController {
                 if (npc.useMinecraftAI() && this.moveControl != this.oldMoveController) {
                     this.moveControl = this.oldMoveController;
                 }
-
                 if (!npc.useMinecraftAI() && this.moveControl == this.oldMoveController) {
                     this.moveControl = new EntityMoveControl(this);
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
@@ -236,11 +226,9 @@ public class DolphinController extends MobEntityController {
                 if (!NMSImpl.moveFish(npc, this, vec3d)) {
                     super.travel(vec3d);
                 }
-
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -252,7 +240,6 @@ public class DolphinController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/DrownedController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/DrownedController.java
index 6be1671d8..3655861bf 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/DrownedController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/DrownedController.java
@@ -78,7 +78,6 @@ public class DrownedController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -86,7 +85,6 @@ public class DrownedController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -96,7 +94,6 @@ public class DrownedController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -109,7 +106,6 @@ public class DrownedController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new DrownedNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -179,7 +175,6 @@ public class DrownedController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -190,7 +185,6 @@ public class DrownedController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -205,7 +199,6 @@ public class DrownedController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -217,7 +210,6 @@ public class DrownedController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EnderDragonController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EnderDragonController.java
index a17fc69ad..aa27cc7b2 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EnderDragonController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EnderDragonController.java
@@ -69,25 +69,20 @@ public class EnderDragonController extends MobEntityController {
                 npc.update();
                 NMSImpl.updateMinecraftAIState(npc, this);
             }
-
             if (npc != null && !npc.useMinecraftAI()) {
                 if (isDeadOrDying()) {
                     setHealth(0F);
                     return;
                 }
-
                 if (this.posPointer < 0) {
                     for (int i = 0; i < this.positions.length; ++i) {
                         this.positions[i][0] = this.getYRot();
                         this.positions[i][1] = this.getY();
                     }
-
                 }
-
                 if (++this.posPointer == this.positions.length) {
                     this.posPointer = 0;
                 }
-
                 this.positions[this.posPointer][0] = this.getYRot();
                 this.positions[this.posPointer][1] = this.getY();
 
@@ -102,22 +97,18 @@ public class EnderDragonController extends MobEntityController {
                     subEntities[j].yo = subEntities[j].yOld = vec3.y;
                     subEntities[j].zo = subEntities[j].zOld = vec3.z;
                 }
-
                 if (getFirstPassenger() != null) {
                     setYRot(getFirstPassenger().getBukkitYaw() - 180);
                 }
-
                 Vec3 mot = getDeltaMovement();
                 if (mot.x != 0 || mot.y != 0 || mot.z != 0) {
                     mot = mot.multiply(0.98, 0.98, 0.98);
                     if (getFirstPassenger() == null) {
                         setYRot(Util.getDragonYaw(getBukkitEntity(), mot.x, mot.z));
                     }
-
                     setPos(getX() + mot.x, getY() + mot.y, getZ() + mot.z);
                     setDeltaMovement(mot);
                 }
-
                 if (npc.hasTrait(EnderDragonTrait.class) && npc.getOrAddTrait(EnderDragonTrait.class).isDestroyWalls()
                         && NMSImpl.ENDERDRAGON_CHECK_WALLS != null) {
                     for (int i = 0; i < 3; i++) {
@@ -127,11 +118,8 @@ public class EnderDragonController extends MobEntityController {
                         } catch (Throwable e) {
                             e.printStackTrace();
                         }
-
                     }
-
                 }
-
                 if (npc.data().get(NPC.Metadata.COLLIDABLE, false)) {
                     try {
                         KNOCKBACK.invoke(this,
@@ -149,13 +137,10 @@ public class EnderDragonController extends MobEntityController {
                     } catch (Throwable t) {
                         t.printStackTrace();
                     }
-
                 }
-
             } else {
                 super.aiStep();
             }
-
         }
 
         @Override
@@ -170,7 +155,6 @@ public class EnderDragonController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -183,7 +167,6 @@ public class EnderDragonController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new EnderDragonNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -245,7 +228,6 @@ public class EnderDragonController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -256,7 +238,6 @@ public class EnderDragonController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -269,7 +250,6 @@ public class EnderDragonController extends MobEntityController {
             if (getPhaseManager().getCurrentPhase().getPhase() == EnderDragonPhase.HOVERING) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
 
@@ -287,7 +267,6 @@ public class EnderDragonController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
 
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EndermanController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EndermanController.java
index 11f107cff..40c1192cf 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EndermanController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EndermanController.java
@@ -81,7 +81,6 @@ public class EndermanController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -89,7 +88,6 @@ public class EndermanController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -100,11 +98,9 @@ public class EndermanController extends MobEntityController {
                 } catch (Throwable e) {
                     e.printStackTrace();
                 }
-
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -117,7 +113,6 @@ public class EndermanController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new EndermanNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -187,7 +182,6 @@ public class EndermanController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -198,7 +192,6 @@ public class EndermanController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -208,7 +201,6 @@ public class EndermanController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -231,7 +223,6 @@ public class EndermanController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -243,7 +234,6 @@ public class EndermanController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EndermiteController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EndermiteController.java
index b051c0801..06eacc26e 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EndermiteController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EndermiteController.java
@@ -78,7 +78,6 @@ public class EndermiteController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -86,7 +85,6 @@ public class EndermiteController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -96,7 +94,6 @@ public class EndermiteController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -109,7 +106,6 @@ public class EndermiteController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new EndermiteNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -179,7 +175,6 @@ public class EndermiteController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -190,7 +185,6 @@ public class EndermiteController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -200,7 +194,6 @@ public class EndermiteController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -215,7 +208,6 @@ public class EndermiteController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -227,7 +219,6 @@ public class EndermiteController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EntityHumanNPC.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EntityHumanNPC.java
index 5cef3d842..7ea3c3b53 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EntityHumanNPC.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EntityHumanNPC.java
@@ -74,12 +74,10 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
             } catch (Throwable e) {
                 e.printStackTrace();
             }
-
             initialise(minecraftServer);
         } else {
             skinTracker = null;
         }
-
     }
 
     @Override
@@ -101,7 +99,6 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
         if (npc == null || !npc.isFlyable()) {
             super.checkFallDamage(d0, flag, iblockdata, blockposition);
         }
-
     }
 
     @Override
@@ -123,7 +120,6 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
             super.doTick();
             return;
         }
-
         super.baseTick();
         boolean navigating = npc.getNavigator().isNavigating() || ai.getMoveControl().hasWanted();
         if (!navigating && getBukkitEntity() != null
@@ -132,20 +128,16 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
                 && (!npc.isProtected() || SpigotUtil.checkYSafe(getY(), getBukkitEntity().getWorld()))) {
             moveWithFallDamage(Vec3.ZERO);
         }
-
         Vec3 mot = getDeltaMovement();
         if (Math.abs(mot.x) < EPSILON && Math.abs(mot.y) < EPSILON && Math.abs(mot.z) < EPSILON) {
             setDeltaMovement(Vec3.ZERO);
         }
-
         if (navigating) {
             if (!ai.getNavigation().isDone()) {
                 ai.getNavigation().tick();
             }
-
             moveOnCurrentHeading();
         }
-
         ai.getJumpControl().tick();
         ai.getMoveControl().tick();
         detectEquipmentUpdates();
@@ -153,7 +145,6 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
         if (isSpectator()) {
             this.onGround = false;
         }
-
         pushEntities();
 
         if (npc.data().get(NPC.Metadata.PICKUP_ITEMS, false)) {
@@ -163,13 +154,10 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
             } else {
                 axisalignedbb = this.getBoundingBox().inflate(1.0, 0.5, 1.0);
             }
-
             for (Entity entity : this.level.getEntities(this, axisalignedbb)) {
                 entity.playerTouch(this);
             }
-
         }
-
     }
 
     @Override
@@ -177,7 +165,6 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
         if (playerlistTracker != null) {
             playerlistTracker.updateLastPlayer();
         }
-
         return super.getAddEntityPacket();
     }
 
@@ -191,7 +178,6 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
         if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
             NMSImpl.setBukkitEntity(this, new PlayerNPC(this));
         }
-
         return super.getBukkitEntity();
     }
 
@@ -221,7 +207,6 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
         if (skinName == null) {
             skinName = npc.getName();
         }
-
         return skinName.toLowerCase();
     }
 
@@ -253,7 +238,6 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
             Bukkit.getScheduler().runTask(CitizensAPI.getPlugin(),
                     (Runnable) () -> EntityHumanNPC.this.hurtMarked = true);
         }
-
         return damaged;
     }
 
@@ -265,7 +249,6 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
         } catch (IOException e) {
             // swallow
         }
-
         this.invulnerableTime = 0;
         NMS.setStepHeight(getBukkitEntity(), 1); // the default (0) breaks step climbing
         setSkinFlags((byte) 0xFF);
@@ -295,11 +278,9 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
                 jumpFromGround();
                 jumpTicks = 10;
             }
-
         } else {
             jumpTicks = 0;
         }
-
         xxa *= 0.98F;
         zza *= 0.98F;
         moveWithFallDamage(new Vec3(this.xxa, this.yya, this.zza));
@@ -307,7 +288,6 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
         if (jumpTicks > 0) {
             jumpTicks--;
         }
-
     }
 
     private void moveWithFallDamage(Vec3 vec) {
@@ -316,7 +296,6 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
         if (!npc.isProtected()) {
             doCheckFallDamage(getY() - y, onGround);
         }
-
     }
 
     @Override
@@ -333,7 +312,6 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
         if (vector != null) {
             super.push(vector.getX(), vector.getY(), vector.getZ());
         }
-
     }
 
     @Override
@@ -344,7 +322,6 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
         if (npc != null) {
             Util.callCollisionEvent(npc, entity.getBukkitEntity());
         }
-
     }
 
     @Override
@@ -395,7 +372,6 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
         } else {
             NMSImpl.flyingMoveLogic(this, vec3d);
         }
-
     }
 
     private void updatePackets(boolean navigating) {
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EvokerController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EvokerController.java
index 0b1e1cd35..3077328d8 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EvokerController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EvokerController.java
@@ -72,7 +72,6 @@ public class EvokerController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -80,7 +79,6 @@ public class EvokerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -90,7 +88,6 @@ public class EvokerController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -103,7 +100,6 @@ public class EvokerController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new EvokerNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -173,7 +169,6 @@ public class EvokerController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -184,7 +179,6 @@ public class EvokerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -199,7 +193,6 @@ public class EvokerController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -211,7 +204,6 @@ public class EvokerController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/FoxController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/FoxController.java
index 53b8d11cc..ed0e1615c 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/FoxController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/FoxController.java
@@ -73,7 +73,6 @@ public class FoxController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -81,7 +80,6 @@ public class FoxController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -91,7 +89,6 @@ public class FoxController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -104,7 +101,6 @@ public class FoxController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new FoxNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -174,7 +170,6 @@ public class FoxController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -184,7 +179,6 @@ public class FoxController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -195,7 +189,6 @@ public class FoxController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -210,7 +203,6 @@ public class FoxController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -222,7 +214,6 @@ public class FoxController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GhastController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GhastController.java
index c50d69004..2c8749cf5 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GhastController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GhastController.java
@@ -63,7 +63,6 @@ public class GhastController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -72,7 +71,6 @@ public class GhastController extends MobEntityController {
                 npc.update();
                 NMSImpl.updateMinecraftAIState(npc, this);
             }
-
             super.customServerAiStep();
         }
 
@@ -86,7 +84,6 @@ public class GhastController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new GhastNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -153,7 +150,6 @@ public class GhastController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -164,7 +160,6 @@ public class GhastController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -181,7 +176,6 @@ public class GhastController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GiantController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GiantController.java
index c1acac0b3..1c9987a13 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GiantController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GiantController.java
@@ -72,7 +72,6 @@ public class GiantController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -80,7 +79,6 @@ public class GiantController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -90,7 +88,6 @@ public class GiantController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -103,7 +100,6 @@ public class GiantController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new GiantNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -173,7 +169,6 @@ public class GiantController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -184,7 +179,6 @@ public class GiantController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -194,7 +188,6 @@ public class GiantController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -209,7 +202,6 @@ public class GiantController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -221,7 +213,6 @@ public class GiantController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GlowSquidController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GlowSquidController.java
index 51d7b10cc..bb22d76e1 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GlowSquidController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GlowSquidController.java
@@ -72,7 +72,6 @@ public class GlowSquidController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -80,7 +79,6 @@ public class GlowSquidController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -90,7 +88,6 @@ public class GlowSquidController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -103,7 +100,6 @@ public class GlowSquidController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new GlowSquidNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -173,7 +169,6 @@ public class GlowSquidController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -184,7 +179,6 @@ public class GlowSquidController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -194,7 +188,6 @@ public class GlowSquidController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -209,7 +202,6 @@ public class GlowSquidController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -221,7 +213,6 @@ public class GlowSquidController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GoatController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GoatController.java
index 0c49f9372..7136cb818 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GoatController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GoatController.java
@@ -73,7 +73,6 @@ public class GoatController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -81,7 +80,6 @@ public class GoatController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -91,7 +89,6 @@ public class GoatController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -104,7 +101,6 @@ public class GoatController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new GoatNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -174,7 +170,6 @@ public class GoatController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -184,7 +179,6 @@ public class GoatController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -195,7 +189,6 @@ public class GoatController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -210,7 +203,6 @@ public class GoatController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -222,7 +214,6 @@ public class GoatController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GuardianController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GuardianController.java
index 83e79d8ee..d2fa8a141 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GuardianController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GuardianController.java
@@ -64,10 +64,8 @@ public class GuardianController extends MobEntityController {
                 } else {
                     super.aiStep();
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
@@ -89,7 +87,6 @@ public class GuardianController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -97,7 +94,6 @@ public class GuardianController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -110,7 +106,6 @@ public class GuardianController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new GuardianNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -180,7 +175,6 @@ public class GuardianController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -191,7 +185,6 @@ public class GuardianController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -201,7 +194,6 @@ public class GuardianController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -216,7 +208,6 @@ public class GuardianController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -228,7 +219,6 @@ public class GuardianController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GuardianElderController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GuardianElderController.java
index c4866b4a4..eee5dfa50 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GuardianElderController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/GuardianElderController.java
@@ -64,10 +64,8 @@ public class GuardianElderController extends MobEntityController {
                 } else {
                     super.aiStep();
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
@@ -89,7 +87,6 @@ public class GuardianElderController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -97,7 +94,6 @@ public class GuardianElderController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -110,7 +106,6 @@ public class GuardianElderController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new GuardianElderNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -180,7 +175,6 @@ public class GuardianElderController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -191,7 +185,6 @@ public class GuardianElderController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -201,7 +194,6 @@ public class GuardianElderController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -216,7 +208,6 @@ public class GuardianElderController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -228,7 +219,6 @@ public class GuardianElderController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HoglinController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HoglinController.java
index 524c93582..3b1c8fdd8 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HoglinController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HoglinController.java
@@ -72,7 +72,6 @@ public class HoglinController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -80,7 +79,6 @@ public class HoglinController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -89,12 +87,10 @@ public class HoglinController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 setImmuneToZombification(true);
             }
-
             super.customServerAiStep();
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -107,7 +103,6 @@ public class HoglinController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new HoglinNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -177,7 +172,6 @@ public class HoglinController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -188,7 +182,6 @@ public class HoglinController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -203,7 +196,6 @@ public class HoglinController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -215,7 +207,6 @@ public class HoglinController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseController.java
index bcb274464..bd9ed643d 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseController.java
@@ -71,7 +71,6 @@ public class HorseController extends MobEntityController {
                 horse.setDomestication(horse.getMaxDomestication());
                 baseMovementSpeed = this.getAttribute(Attributes.MOVEMENT_SPEED).getValue();
             }
-
         }
 
         @Override
@@ -98,7 +97,6 @@ public class HorseController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -106,7 +104,6 @@ public class HorseController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -122,16 +119,13 @@ public class HorseController extends MobEntityController {
             } else {
                 riding = false;
             }
-
             if (riding) {
                 if (npc.getNavigator().isNavigating()) {
                     org.bukkit.entity.Entity basePassenger = passengers.get(0).getBukkitEntity();
                     NMS.look(basePassenger, getYRot(), getXRot());
                 }
-
                 setFlag(4, true); // datawatcher method
             }
-
             NMS.setStepHeight(getBukkitEntity(), 1);
             npc.update();
         }
@@ -146,7 +140,6 @@ public class HorseController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new HorseNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -223,7 +216,6 @@ public class HorseController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -233,7 +225,6 @@ public class HorseController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -244,7 +235,6 @@ public class HorseController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -259,7 +249,6 @@ public class HorseController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -271,7 +260,6 @@ public class HorseController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseDonkeyController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseDonkeyController.java
index e0d22332d..9af9559c8 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseDonkeyController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseDonkeyController.java
@@ -71,7 +71,6 @@ public class HorseDonkeyController extends MobEntityController {
                         .setDomestication(((org.bukkit.entity.Donkey) getBukkitEntity()).getMaxDomestication());
                 baseMovementSpeed = this.getAttribute(Attributes.MOVEMENT_SPEED).getValue();
             }
-
         }
 
         @Override
@@ -98,7 +97,6 @@ public class HorseDonkeyController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -106,7 +104,6 @@ public class HorseDonkeyController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -121,20 +118,16 @@ public class HorseDonkeyController extends MobEntityController {
                 } else {
                     riding = false;
                 }
-
                 if (riding) {
                     if (npc.getNavigator().isNavigating()) {
                         org.bukkit.entity.Entity basePassenger = passengers.get(0).getBukkitEntity();
                         NMS.look(basePassenger, getYRot(), getXRot());
                     }
-
                     setFlag(4, true); // datawatcher method
                 }
-
                 NMS.setStepHeight(getBukkitEntity(), 1);
                 npc.update();
             }
-
         }
 
         @Override
@@ -147,7 +140,6 @@ public class HorseDonkeyController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new HorseDonkeyNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -224,7 +216,6 @@ public class HorseDonkeyController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -234,7 +225,6 @@ public class HorseDonkeyController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -245,7 +235,6 @@ public class HorseDonkeyController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -260,7 +249,6 @@ public class HorseDonkeyController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -272,7 +260,6 @@ public class HorseDonkeyController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseMuleController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseMuleController.java
index 941327811..6a25a23a5 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseMuleController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseMuleController.java
@@ -71,7 +71,6 @@ public class HorseMuleController extends MobEntityController {
                         .setDomestication(((org.bukkit.entity.Mule) getBukkitEntity()).getMaxDomestication());
                 baseMovementSpeed = this.getAttribute(Attributes.MOVEMENT_SPEED).getValue();
             }
-
         }
 
         @Override
@@ -98,7 +97,6 @@ public class HorseMuleController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -106,7 +104,6 @@ public class HorseMuleController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -121,20 +118,16 @@ public class HorseMuleController extends MobEntityController {
                 } else {
                     riding = false;
                 }
-
                 if (riding) {
                     if (npc.getNavigator().isNavigating()) {
                         org.bukkit.entity.Entity basePassenger = passengers.get(0).getBukkitEntity();
                         NMS.look(basePassenger, getYRot(), getXRot());
                     }
-
                     setFlag(4, true); // datawatcher method
                 }
-
                 NMS.setStepHeight(getBukkitEntity(), 1);
                 npc.update();
             }
-
         }
 
         @Override
@@ -147,7 +140,6 @@ public class HorseMuleController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new HorseMuleNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -224,7 +216,6 @@ public class HorseMuleController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -234,7 +225,6 @@ public class HorseMuleController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -245,7 +235,6 @@ public class HorseMuleController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -260,7 +249,6 @@ public class HorseMuleController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -272,7 +260,6 @@ public class HorseMuleController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseSkeletonController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseSkeletonController.java
index e02cf9ac2..0979a436e 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseSkeletonController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseSkeletonController.java
@@ -71,7 +71,6 @@ public class HorseSkeletonController extends MobEntityController {
                         .setDomestication(((org.bukkit.entity.SkeletonHorse) getBukkitEntity()).getMaxDomestication());
                 baseMovementSpeed = this.getAttribute(Attributes.MOVEMENT_SPEED).getValue();
             }
-
         }
 
         @Override
@@ -98,7 +97,6 @@ public class HorseSkeletonController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -106,7 +104,6 @@ public class HorseSkeletonController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -121,20 +118,16 @@ public class HorseSkeletonController extends MobEntityController {
                 } else {
                     riding = false;
                 }
-
                 if (riding) {
                     if (npc.getNavigator().isNavigating()) {
                         org.bukkit.entity.Entity basePassenger = passengers.get(0).getBukkitEntity();
                         NMS.look(basePassenger, getYRot(), getXRot());
                     }
-
                     setFlag(4, true); // datawatcher method
                 }
-
                 NMS.setStepHeight(getBukkitEntity(), 1);
                 npc.update();
             }
-
         }
 
         @Override
@@ -147,7 +140,6 @@ public class HorseSkeletonController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new HorseSkeletonNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -224,7 +216,6 @@ public class HorseSkeletonController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -234,7 +225,6 @@ public class HorseSkeletonController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -245,7 +235,6 @@ public class HorseSkeletonController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -260,7 +249,6 @@ public class HorseSkeletonController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -272,7 +260,6 @@ public class HorseSkeletonController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseZombieController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseZombieController.java
index 71f7c24e7..1c3da6d73 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseZombieController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HorseZombieController.java
@@ -71,7 +71,6 @@ public class HorseZombieController extends MobEntityController {
                         .setDomestication(((org.bukkit.entity.ZombieHorse) getBukkitEntity()).getMaxDomestication());
                 baseMovementSpeed = this.getAttribute(Attributes.MOVEMENT_SPEED).getValue();
             }
-
         }
 
         @Override
@@ -98,7 +97,6 @@ public class HorseZombieController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -106,7 +104,6 @@ public class HorseZombieController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -121,20 +118,16 @@ public class HorseZombieController extends MobEntityController {
                 } else {
                     riding = false;
                 }
-
                 if (riding) {
                     if (npc.getNavigator().isNavigating()) {
                         org.bukkit.entity.Entity basePassenger = passengers.get(0).getBukkitEntity();
                         NMS.look(basePassenger, getYRot(), getXRot());
                     }
-
                     setFlag(4, true); // datawatcher method
                 }
-
                 NMS.setStepHeight(getBukkitEntity(), 1);
                 npc.update();
             }
-
         }
 
         @Override
@@ -147,7 +140,6 @@ public class HorseZombieController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new HorseZombieNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -224,7 +216,6 @@ public class HorseZombieController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -234,7 +225,6 @@ public class HorseZombieController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -245,7 +235,6 @@ public class HorseZombieController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -260,7 +249,6 @@ public class HorseZombieController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -272,7 +260,6 @@ public class HorseZombieController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HumanController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HumanController.java
index 669c81d46..43e4a27bc 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HumanController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/HumanController.java
@@ -35,18 +35,15 @@ public class HumanController extends AbstractEntityController {
         if (npc.requiresNameHologram()) {
             name = teamName;
         }
-
         if (Setting.USE_SCOREBOARD_TEAMS.asBoolean()) {
             npc.getOrAddTrait(ScoreboardTrait.class).createTeam(teamName);
         }
-
         final GameProfile profile = new GameProfile(uuid, name);
         final EntityHumanNPC handle = new EntityHumanNPC(MinecraftServer.getServer(), nmsWorld, profile, npc);
         Skin skin = handle.getSkinTracker().getSkin();
         if (skin != null) {
             skin.apply(handle);
         }
-
         Bukkit.getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(), () -> {
             if (getBukkitEntity() == null || !getBukkitEntity().isValid()
                     || getBukkitEntity() != handle.getBukkitEntity())
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/IllusionerController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/IllusionerController.java
index 1153e1048..e990eb915 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/IllusionerController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/IllusionerController.java
@@ -72,7 +72,6 @@ public class IllusionerController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -80,7 +79,6 @@ public class IllusionerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -90,7 +88,6 @@ public class IllusionerController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -103,7 +100,6 @@ public class IllusionerController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new IllusionerNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -173,7 +169,6 @@ public class IllusionerController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -184,7 +179,6 @@ public class IllusionerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -199,7 +193,6 @@ public class IllusionerController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -211,7 +204,6 @@ public class IllusionerController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/IronGolemController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/IronGolemController.java
index e9d5819b4..37fbf5f8c 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/IronGolemController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/IronGolemController.java
@@ -72,7 +72,6 @@ public class IronGolemController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -80,7 +79,6 @@ public class IronGolemController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -90,7 +88,6 @@ public class IronGolemController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -103,7 +100,6 @@ public class IronGolemController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new IronGolemNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -173,7 +169,6 @@ public class IronGolemController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -184,7 +179,6 @@ public class IronGolemController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -194,7 +188,6 @@ public class IronGolemController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -209,7 +202,6 @@ public class IronGolemController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -221,7 +213,6 @@ public class IronGolemController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/LlamaController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/LlamaController.java
index 39330bd0b..a51cf12d1 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/LlamaController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/LlamaController.java
@@ -71,7 +71,6 @@ public class LlamaController extends MobEntityController {
                         .setDomestication(((org.bukkit.entity.Llama) getBukkitEntity()).getMaxDomestication());
                 baseMovementSpeed = this.getAttribute(Attributes.MOVEMENT_SPEED).getValue();
             }
-
         }
 
         @Override
@@ -93,7 +92,6 @@ public class LlamaController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -101,7 +99,6 @@ public class LlamaController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -116,20 +113,16 @@ public class LlamaController extends MobEntityController {
                 } else {
                     riding = false;
                 }
-
                 if (riding) {
                     if (npc.getNavigator().isNavigating()) {
                         org.bukkit.entity.Entity basePassenger = passengers.get(0).getBukkitEntity();
                         NMS.look(basePassenger, getYRot(), getXRot());
                     }
-
                     setFlag(4, true); // datawatcher method
                 }
-
                 NMS.setStepHeight(getBukkitEntity(), 1);
                 npc.update();
             }
-
         }
 
         @Override
@@ -142,7 +135,6 @@ public class LlamaController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new LlamaNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -219,7 +211,6 @@ public class LlamaController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -229,7 +220,6 @@ public class LlamaController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -240,7 +230,6 @@ public class LlamaController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -255,7 +244,6 @@ public class LlamaController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -267,7 +255,6 @@ public class LlamaController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/MagmaCubeController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/MagmaCubeController.java
index ebb02b0f3..0e52f51c0 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/MagmaCubeController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/MagmaCubeController.java
@@ -61,7 +61,6 @@ public class MagmaCubeController extends MobEntityController {
                 this.oldMoveController = this.moveControl;
                 this.moveControl = new EntityMoveControl(this);
             }
-
         }
 
         @Override
@@ -83,7 +82,6 @@ public class MagmaCubeController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -91,7 +89,6 @@ public class MagmaCubeController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -104,7 +101,6 @@ public class MagmaCubeController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new MagmaCubeNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -173,7 +169,6 @@ public class MagmaCubeController extends MobEntityController {
             if (npc == null) {
                 super.playerTouch(human);
             }
-
         }
 
         @Override
@@ -182,7 +177,6 @@ public class MagmaCubeController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -193,7 +187,6 @@ public class MagmaCubeController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -203,7 +196,6 @@ public class MagmaCubeController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -219,14 +211,11 @@ public class MagmaCubeController extends MobEntityController {
                 if (npc.useMinecraftAI() && this.moveControl != this.oldMoveController) {
                     this.moveControl = this.oldMoveController;
                 }
-
                 if (!npc.useMinecraftAI() && this.moveControl == this.oldMoveController) {
                     this.moveControl = new EntityMoveControl(this);
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
@@ -236,7 +225,6 @@ public class MagmaCubeController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -248,7 +236,6 @@ public class MagmaCubeController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/MobEntityController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/MobEntityController.java
index 3e44da98b..a973f482f 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/MobEntityController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/MobEntityController.java
@@ -41,23 +41,18 @@ public abstract class MobEntityController extends AbstractEntityController {
                 if (mob.getLookControl().getClass() == LookControl.class) {
                     NMSImpl.setLookControl(mob, new PitchableLookControl(mob));
                 }
-
             }
-
             // entity.onGround isn't updated right away - we approximate here so
             // that things like pathfinding still work *immediately* after spawn.
             org.bukkit.Material beneath = at.getBlock().getRelative(BlockFace.DOWN).getType();
             if (beneath.isSolid()) {
                 entity.setOnGround(true);
             }
-
             entity.setUUID(npc.getUniqueId());
             if (Setting.USE_SCOREBOARD_TEAMS.asBoolean()) {
                 npc.getOrAddTrait(ScoreboardTrait.class).createTeam(npc.getUniqueId().toString());
             }
-
         }
-
         return entity.getBukkitEntity();
     }
 
@@ -68,7 +63,6 @@ public abstract class MobEntityController extends AbstractEntityController {
             ex.printStackTrace();
             return null;
         }
-
     }
 
     private static Constructor<?> getConstructor(Class<?> clazz) {
@@ -81,7 +75,6 @@ public abstract class MobEntityController extends AbstractEntityController {
         } catch (Exception ex) {
             throw new IllegalStateException("unable to find an entity constructor");
         }
-
     }
 
     private static final Map<Class<?>, Constructor<?>> CONSTRUCTOR_CACHE = new WeakHashMap<>();
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/MushroomCowController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/MushroomCowController.java
index 44e93ee96..86afd2e28 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/MushroomCowController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/MushroomCowController.java
@@ -76,7 +76,6 @@ public class MushroomCowController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -84,7 +83,6 @@ public class MushroomCowController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -94,7 +92,6 @@ public class MushroomCowController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -107,7 +104,6 @@ public class MushroomCowController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new MushroomCowNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -184,7 +180,6 @@ public class MushroomCowController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -194,7 +189,6 @@ public class MushroomCowController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -205,7 +199,6 @@ public class MushroomCowController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -220,7 +213,6 @@ public class MushroomCowController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -232,7 +224,6 @@ public class MushroomCowController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/OcelotController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/OcelotController.java
index f1d7dbf9f..06602a83d 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/OcelotController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/OcelotController.java
@@ -74,7 +74,6 @@ public class OcelotController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -82,7 +81,6 @@ public class OcelotController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -93,12 +91,10 @@ public class OcelotController extends MobEntityController {
             if (restorePose) {
                 this.setPose(old);
             }
-
             if (npc != null) {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -111,7 +107,6 @@ public class OcelotController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new OcelotNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -181,7 +176,6 @@ public class OcelotController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -191,7 +185,6 @@ public class OcelotController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -202,7 +195,6 @@ public class OcelotController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -217,7 +209,6 @@ public class OcelotController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -229,7 +220,6 @@ public class OcelotController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PandaController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PandaController.java
index c23305e4f..165635ca3 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PandaController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PandaController.java
@@ -73,7 +73,6 @@ public class PandaController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -81,7 +80,6 @@ public class PandaController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -91,7 +89,6 @@ public class PandaController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -104,7 +101,6 @@ public class PandaController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new PandaNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -174,7 +170,6 @@ public class PandaController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -184,7 +179,6 @@ public class PandaController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -195,7 +189,6 @@ public class PandaController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -210,7 +203,6 @@ public class PandaController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -222,7 +214,6 @@ public class PandaController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ParrotController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ParrotController.java
index 27c5a8e4c..3c85beccf 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ParrotController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ParrotController.java
@@ -66,7 +66,6 @@ public class ParrotController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -78,10 +77,8 @@ public class ParrotController extends MobEntityController {
                 if (npc.useMinecraftAI()) {
                     super.customServerAiStep();
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
@@ -94,7 +91,6 @@ public class ParrotController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ParrotNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -164,7 +160,6 @@ public class ParrotController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -175,7 +170,6 @@ public class ParrotController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -192,7 +186,6 @@ public class ParrotController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PhantomController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PhantomController.java
index 7e546a4b9..2dfb793cf 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PhantomController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PhantomController.java
@@ -66,7 +66,6 @@ public class PhantomController extends MobEntityController {
                 this.lookControl = new LookControl(this);
                 // TODO: phantom pitch reversed
             }
-
         }
 
         @Override
@@ -78,19 +77,15 @@ public class PhantomController extends MobEntityController {
                     this.moveControl = this.oldMoveController;
                     this.lookControl = this.oldLookController;
                 }
-
                 if (!npc.useMinecraftAI() && this.moveControl == this.oldMoveController) {
                     this.moveControl = new EntityMoveControl(this);
                     this.lookControl = new LookControl(this);
                 }
-
                 if (npc.isProtected()) {
                     this.setSecondsOnFire(0);
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
@@ -112,7 +107,6 @@ public class PhantomController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -120,7 +114,6 @@ public class PhantomController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -133,7 +126,6 @@ public class PhantomController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new PhantomNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -210,7 +202,6 @@ public class PhantomController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -220,7 +211,6 @@ public class PhantomController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -231,7 +221,6 @@ public class PhantomController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -251,7 +240,6 @@ public class PhantomController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -263,7 +251,6 @@ public class PhantomController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PigController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PigController.java
index 2f1078bad..4d1943bd6 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PigController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PigController.java
@@ -81,7 +81,6 @@ public class PigController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -89,7 +88,6 @@ public class PigController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -99,7 +97,6 @@ public class PigController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -112,7 +109,6 @@ public class PigController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new PigNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -182,7 +178,6 @@ public class PigController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -192,7 +187,6 @@ public class PigController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -203,7 +197,6 @@ public class PigController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -216,7 +209,6 @@ public class PigController extends MobEntityController {
             if (npc == null) {
                 super.thunderHit(worldserver, entitylightning);
             }
-
         }
 
         @Override
@@ -226,7 +218,6 @@ public class PigController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -238,7 +229,6 @@ public class PigController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PigZombieController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PigZombieController.java
index 178c4194c..9a6bbabd2 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PigZombieController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PigZombieController.java
@@ -72,7 +72,6 @@ public class PigZombieController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -80,7 +79,6 @@ public class PigZombieController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -90,7 +88,6 @@ public class PigZombieController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -103,7 +100,6 @@ public class PigZombieController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new PigZombieNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -173,7 +169,6 @@ public class PigZombieController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -184,7 +179,6 @@ public class PigZombieController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -198,11 +192,9 @@ public class PigZombieController extends MobEntityController {
                 if (!NMSImpl.moveFish(npc, this, vec3d)) {
                     super.travel(vec3d);
                 }
-
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -214,7 +206,6 @@ public class PigZombieController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PiglinBruteController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PiglinBruteController.java
index b2f7a0fd8..f87a38e51 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PiglinBruteController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PiglinBruteController.java
@@ -72,7 +72,6 @@ public class PiglinBruteController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -80,7 +79,6 @@ public class PiglinBruteController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -89,12 +87,10 @@ public class PiglinBruteController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 setImmuneToZombification(true);
             }
-
             super.customServerAiStep();
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -107,7 +103,6 @@ public class PiglinBruteController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new PiglinBruteNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -177,7 +172,6 @@ public class PiglinBruteController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -188,7 +182,6 @@ public class PiglinBruteController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -203,7 +196,6 @@ public class PiglinBruteController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -215,7 +207,6 @@ public class PiglinBruteController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PiglinController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PiglinController.java
index 13933cee7..ac7feefa7 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PiglinController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PiglinController.java
@@ -72,7 +72,6 @@ public class PiglinController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -80,7 +79,6 @@ public class PiglinController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -89,12 +87,10 @@ public class PiglinController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 setImmuneToZombification(true);
             }
-
             super.customServerAiStep();
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -107,7 +103,6 @@ public class PiglinController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new PiglinNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -177,7 +172,6 @@ public class PiglinController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -188,7 +182,6 @@ public class PiglinController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -203,7 +196,6 @@ public class PiglinController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -215,7 +207,6 @@ public class PiglinController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PillagerController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PillagerController.java
index 521022c92..91d1bd3d8 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PillagerController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PillagerController.java
@@ -73,7 +73,6 @@ public class PillagerController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -81,7 +80,6 @@ public class PillagerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -91,7 +89,6 @@ public class PillagerController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -104,7 +101,6 @@ public class PillagerController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new PillagerNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -174,7 +170,6 @@ public class PillagerController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -184,7 +179,6 @@ public class PillagerController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -195,7 +189,6 @@ public class PillagerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -210,7 +203,6 @@ public class PillagerController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -222,7 +214,6 @@ public class PillagerController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PolarBearController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PolarBearController.java
index 92add5a4b..a6f608fe4 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PolarBearController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PolarBearController.java
@@ -64,7 +64,6 @@ public class PolarBearController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -74,7 +73,6 @@ public class PolarBearController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -87,7 +85,6 @@ public class PolarBearController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new PolarBearNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -149,7 +146,6 @@ public class PolarBearController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -159,7 +155,6 @@ public class PolarBearController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -170,7 +165,6 @@ public class PolarBearController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -187,7 +181,6 @@ public class PolarBearController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PufferFishController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PufferFishController.java
index ab94d5d37..6d0d84f7f 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PufferFishController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/PufferFishController.java
@@ -67,7 +67,6 @@ public class PufferFishController extends MobEntityController {
                 this.oldMoveController = this.moveControl;
                 this.moveControl = new MoveControl(this);
             }
-
         }
 
         @Override
@@ -78,13 +77,11 @@ public class PufferFishController extends MobEntityController {
                 this.verticalCollision = false;
                 setPuffState(0);
             }
-
             super.aiStep();
             if (npc != null) {
                 this.verticalCollision = lastInWater;
                 setPuffState(lastPuffState);
             }
-
         }
 
         @Override
@@ -106,7 +103,6 @@ public class PufferFishController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -114,7 +110,6 @@ public class PufferFishController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -125,14 +120,11 @@ public class PufferFishController extends MobEntityController {
                 if (npc.useMinecraftAI() && this.moveControl != this.oldMoveController) {
                     this.moveControl = this.oldMoveController;
                 }
-
                 if (!npc.useMinecraftAI() && this.moveControl == this.oldMoveController) {
                     this.moveControl = new EntityMoveControl(this);
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
@@ -145,7 +137,6 @@ public class PufferFishController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new PufferFishNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -232,7 +223,6 @@ public class PufferFishController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -243,7 +233,6 @@ public class PufferFishController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -256,13 +245,11 @@ public class PufferFishController extends MobEntityController {
             if (npc != null) {
                 NMSImpl.resetPuffTicks(this);
             }
-
             super.tick();
             PufferFishTrait trait = null;
             if (npc != null && (trait = npc.getTraitNullable(PufferFishTrait.class)) != null) {
                 setPuffState(trait.getPuffState());
             }
-
         }
 
         @Override
@@ -271,11 +258,9 @@ public class PufferFishController extends MobEntityController {
                 if (!NMSImpl.moveFish(npc, this, vec3d)) {
                     super.travel(vec3d);
                 }
-
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -287,7 +272,6 @@ public class PufferFishController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
 
@@ -300,7 +284,6 @@ public class PufferFishController extends MobEntityController {
                 default:
                     return 1.0F;
             }
-
         }
     }
 
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/RabbitController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/RabbitController.java
index cb6cd7191..3b822a10d 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/RabbitController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/RabbitController.java
@@ -74,7 +74,6 @@ public class RabbitController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -82,7 +81,6 @@ public class RabbitController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -93,10 +91,8 @@ public class RabbitController extends MobEntityController {
                 if (npc.getNavigator().isNavigating()) {
                     NMS.setShouldJump(getBukkitEntity());
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
@@ -109,7 +105,6 @@ public class RabbitController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new RabbitNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -184,7 +179,6 @@ public class RabbitController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -194,7 +188,6 @@ public class RabbitController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -205,7 +198,6 @@ public class RabbitController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -221,7 +213,6 @@ public class RabbitController extends MobEntityController {
                 this.entityData.set(NMSImpl.getRabbitTypeField(), i);
                 return;
             }
-
             super.setRabbitType(i);
         }
 
@@ -232,7 +223,6 @@ public class RabbitController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -244,7 +234,6 @@ public class RabbitController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/RavagerController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/RavagerController.java
index fc405dbce..7f304c219 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/RavagerController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/RavagerController.java
@@ -73,7 +73,6 @@ public class RavagerController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -81,7 +80,6 @@ public class RavagerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -91,7 +89,6 @@ public class RavagerController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -104,7 +101,6 @@ public class RavagerController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new RavagerNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -174,7 +170,6 @@ public class RavagerController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -184,7 +179,6 @@ public class RavagerController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -195,7 +189,6 @@ public class RavagerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -210,7 +203,6 @@ public class RavagerController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -222,7 +214,6 @@ public class RavagerController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SalmonController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SalmonController.java
index 5806cd94f..9590bd14a 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SalmonController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SalmonController.java
@@ -64,7 +64,6 @@ public class SalmonController extends MobEntityController {
                 this.oldMoveController = this.moveControl;
                 this.moveControl = new MoveControl(this);
             }
-
         }
 
         @Override
@@ -73,12 +72,10 @@ public class SalmonController extends MobEntityController {
             if (npc != null) {
                 this.verticalCollision = false;
             }
-
             super.aiStep();
             if (npc != null) {
                 this.verticalCollision = lastInWater;
             }
-
         }
 
         @Override
@@ -100,7 +97,6 @@ public class SalmonController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -108,7 +104,6 @@ public class SalmonController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -119,18 +114,14 @@ public class SalmonController extends MobEntityController {
                 if (npc.useMinecraftAI() && this.moveControl != this.oldMoveController) {
                     this.moveControl = this.oldMoveController;
                 }
-
                 if (!npc.useMinecraftAI() && this.moveControl == this.oldMoveController) {
                     this.moveControl = new EntityMoveControl(this);
                 }
-
             }
-
             super.customServerAiStep();
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -143,7 +134,6 @@ public class SalmonController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SalmonNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -223,7 +213,6 @@ public class SalmonController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -234,7 +223,6 @@ public class SalmonController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -248,11 +236,9 @@ public class SalmonController extends MobEntityController {
                 if (!NMSImpl.moveFish(npc, this, vec3d)) {
                     super.travel(vec3d);
                 }
-
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -264,7 +250,6 @@ public class SalmonController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SheepController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SheepController.java
index 9060e1a64..6ae633369 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SheepController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SheepController.java
@@ -73,7 +73,6 @@ public class SheepController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -81,7 +80,6 @@ public class SheepController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -91,7 +89,6 @@ public class SheepController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -104,7 +101,6 @@ public class SheepController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SheepNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -174,7 +170,6 @@ public class SheepController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -184,7 +179,6 @@ public class SheepController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -195,7 +189,6 @@ public class SheepController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -210,7 +203,6 @@ public class SheepController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -222,7 +214,6 @@ public class SheepController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ShulkerController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ShulkerController.java
index adf2da5cc..a65ccc237 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ShulkerController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ShulkerController.java
@@ -59,7 +59,6 @@ public class ShulkerController extends MobEntityController {
             if (npc == null || npc.useMinecraftAI()) {
                 super.aiStep();
             }
-
         }
 
         @Override
@@ -81,7 +80,6 @@ public class ShulkerController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -89,7 +87,6 @@ public class ShulkerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -107,7 +104,6 @@ public class ShulkerController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ShulkerNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -177,7 +173,6 @@ public class ShulkerController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -188,7 +183,6 @@ public class ShulkerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -198,7 +192,6 @@ public class ShulkerController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -213,12 +206,10 @@ public class ShulkerController extends MobEntityController {
                 if (npc.useMinecraftAI()) {
                     super.tick();
                 }
-
                 npc.update();
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -228,7 +219,6 @@ public class ShulkerController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -240,7 +230,6 @@ public class ShulkerController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SilverfishController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SilverfishController.java
index db7995224..9b4097a94 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SilverfishController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SilverfishController.java
@@ -72,7 +72,6 @@ public class SilverfishController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -80,7 +79,6 @@ public class SilverfishController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -90,7 +88,6 @@ public class SilverfishController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -103,7 +100,6 @@ public class SilverfishController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SilverfishNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -173,7 +169,6 @@ public class SilverfishController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -184,7 +179,6 @@ public class SilverfishController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -194,7 +188,6 @@ public class SilverfishController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -209,7 +202,6 @@ public class SilverfishController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -221,7 +213,6 @@ public class SilverfishController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SkeletonController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SkeletonController.java
index 3e30f37c2..b7598dc83 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SkeletonController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SkeletonController.java
@@ -72,7 +72,6 @@ public class SkeletonController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -80,7 +79,6 @@ public class SkeletonController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -90,7 +88,6 @@ public class SkeletonController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -103,7 +100,6 @@ public class SkeletonController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SkeletonNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -173,7 +169,6 @@ public class SkeletonController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -184,7 +179,6 @@ public class SkeletonController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -194,7 +188,6 @@ public class SkeletonController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -209,7 +202,6 @@ public class SkeletonController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -221,7 +213,6 @@ public class SkeletonController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SkeletonStrayController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SkeletonStrayController.java
index 6018ac279..1f17f4321 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SkeletonStrayController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SkeletonStrayController.java
@@ -72,7 +72,6 @@ public class SkeletonStrayController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -80,7 +79,6 @@ public class SkeletonStrayController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -90,7 +88,6 @@ public class SkeletonStrayController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -103,7 +100,6 @@ public class SkeletonStrayController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new StrayNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -173,7 +169,6 @@ public class SkeletonStrayController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -184,7 +179,6 @@ public class SkeletonStrayController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -194,7 +188,6 @@ public class SkeletonStrayController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -209,7 +202,6 @@ public class SkeletonStrayController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -221,7 +213,6 @@ public class SkeletonStrayController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SkeletonWitherController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SkeletonWitherController.java
index 938b2d44d..a52c0e969 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SkeletonWitherController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SkeletonWitherController.java
@@ -72,7 +72,6 @@ public class SkeletonWitherController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -80,7 +79,6 @@ public class SkeletonWitherController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -90,7 +88,6 @@ public class SkeletonWitherController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -103,7 +100,6 @@ public class SkeletonWitherController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SkeletonWitherNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -173,7 +169,6 @@ public class SkeletonWitherController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -184,7 +179,6 @@ public class SkeletonWitherController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -194,7 +188,6 @@ public class SkeletonWitherController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -209,7 +202,6 @@ public class SkeletonWitherController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -221,7 +213,6 @@ public class SkeletonWitherController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SlimeController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SlimeController.java
index cd1b51a5a..1a0982a5d 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SlimeController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SlimeController.java
@@ -61,7 +61,6 @@ public class SlimeController extends MobEntityController {
                 this.oldMoveController = this.moveControl;
                 this.moveControl = new EntityMoveControl(this);
             }
-
         }
 
         @Override
@@ -83,7 +82,6 @@ public class SlimeController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -91,7 +89,6 @@ public class SlimeController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -104,7 +101,6 @@ public class SlimeController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SlimeNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -173,7 +169,6 @@ public class SlimeController extends MobEntityController {
             if (npc == null) {
                 super.playerTouch(human);
             }
-
         }
 
         @Override
@@ -182,7 +177,6 @@ public class SlimeController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -193,7 +187,6 @@ public class SlimeController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -203,7 +196,6 @@ public class SlimeController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -219,14 +211,11 @@ public class SlimeController extends MobEntityController {
                 if (npc.useMinecraftAI() && this.moveControl != this.oldMoveController) {
                     this.moveControl = this.oldMoveController;
                 }
-
                 if (!npc.useMinecraftAI() && this.moveControl == this.oldMoveController) {
                     this.moveControl = new EntityMoveControl(this);
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
@@ -236,7 +225,6 @@ public class SlimeController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -248,7 +236,6 @@ public class SlimeController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SnowmanController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SnowmanController.java
index 810eed165..4a7d9c302 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SnowmanController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SnowmanController.java
@@ -72,7 +72,6 @@ public class SnowmanController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -80,7 +79,6 @@ public class SnowmanController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -90,7 +88,6 @@ public class SnowmanController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -103,7 +100,6 @@ public class SnowmanController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SnowmanNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -173,7 +169,6 @@ public class SnowmanController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -184,7 +179,6 @@ public class SnowmanController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -194,7 +188,6 @@ public class SnowmanController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -209,7 +202,6 @@ public class SnowmanController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -221,7 +213,6 @@ public class SnowmanController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SpiderController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SpiderController.java
index fa601040b..e8b644a16 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SpiderController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SpiderController.java
@@ -72,7 +72,6 @@ public class SpiderController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -80,7 +79,6 @@ public class SpiderController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -90,7 +88,6 @@ public class SpiderController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -103,7 +100,6 @@ public class SpiderController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SpiderNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -173,7 +169,6 @@ public class SpiderController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -184,7 +179,6 @@ public class SpiderController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -194,7 +188,6 @@ public class SpiderController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -209,7 +202,6 @@ public class SpiderController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -221,7 +213,6 @@ public class SpiderController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SquidController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SquidController.java
index 3760ab614..99e0c2eb7 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SquidController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/SquidController.java
@@ -72,7 +72,6 @@ public class SquidController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -80,7 +79,6 @@ public class SquidController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -90,7 +88,6 @@ public class SquidController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -103,7 +100,6 @@ public class SquidController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SquidNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -173,7 +169,6 @@ public class SquidController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -184,7 +179,6 @@ public class SquidController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -194,7 +188,6 @@ public class SquidController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -209,7 +202,6 @@ public class SquidController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -221,7 +213,6 @@ public class SquidController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/StriderController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/StriderController.java
index 020ee744b..757b0331a 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/StriderController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/StriderController.java
@@ -72,7 +72,6 @@ public class StriderController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -80,7 +79,6 @@ public class StriderController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -90,7 +88,6 @@ public class StriderController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -103,7 +100,6 @@ public class StriderController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new StriderNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -173,7 +169,6 @@ public class StriderController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -184,7 +179,6 @@ public class StriderController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -199,7 +193,6 @@ public class StriderController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -211,7 +204,6 @@ public class StriderController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/TraderLlamaController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/TraderLlamaController.java
index 2283645ce..bda3388b9 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/TraderLlamaController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/TraderLlamaController.java
@@ -64,7 +64,6 @@ public class TraderLlamaController extends MobEntityController {
                 ((org.bukkit.entity.TraderLlama) getBukkitEntity())
                         .setDomestication(((org.bukkit.entity.TraderLlama) getBukkitEntity()).getMaxDomestication());
             }
-
         }
 
         @Override
@@ -86,7 +85,6 @@ public class TraderLlamaController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -94,7 +92,6 @@ public class TraderLlamaController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -106,12 +103,10 @@ public class TraderLlamaController extends MobEntityController {
                 if (npc.useMinecraftAI()) {
                     super.customServerAiStep();
                 }
-
                 setDespawnDelay(10);
                 NMS.setStepHeight(getBukkitEntity(), 1);
                 npc.update();
             }
-
         }
 
         @Override
@@ -124,7 +119,6 @@ public class TraderLlamaController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new TraderLlamaNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -194,7 +188,6 @@ public class TraderLlamaController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -204,7 +197,6 @@ public class TraderLlamaController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -215,7 +207,6 @@ public class TraderLlamaController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -230,7 +221,6 @@ public class TraderLlamaController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -242,7 +232,6 @@ public class TraderLlamaController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/TropicalFishController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/TropicalFishController.java
index ce25bb08e..0f2100054 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/TropicalFishController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/TropicalFishController.java
@@ -64,7 +64,6 @@ public class TropicalFishController extends MobEntityController {
                 this.oldMoveController = this.moveControl;
                 this.moveControl = new MoveControl(this);
             }
-
         }
 
         @Override
@@ -73,12 +72,10 @@ public class TropicalFishController extends MobEntityController {
             if (npc != null) {
                 this.verticalCollision = false;
             }
-
             super.aiStep();
             if (npc != null) {
                 this.verticalCollision = lastInWater;
             }
-
         }
 
         @Override
@@ -100,7 +97,6 @@ public class TropicalFishController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -108,7 +104,6 @@ public class TropicalFishController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -117,23 +112,18 @@ public class TropicalFishController extends MobEntityController {
                 if (!npc.useMinecraftAI()) {
                     NMSImpl.setNotInSchool(this);
                 }
-
                 NMSImpl.updateMinecraftAIState(npc, this);
                 if (npc.useMinecraftAI() && this.moveControl != this.oldMoveController) {
                     this.moveControl = this.oldMoveController;
                 }
-
                 if (!npc.useMinecraftAI() && this.moveControl == this.oldMoveController) {
                     this.moveControl = new EntityMoveControl(this);
                 }
-
             }
-
             super.customServerAiStep();
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -146,7 +136,6 @@ public class TropicalFishController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new TropicalFishNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -226,7 +215,6 @@ public class TropicalFishController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -237,7 +225,6 @@ public class TropicalFishController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -251,11 +238,9 @@ public class TropicalFishController extends MobEntityController {
                 if (!NMSImpl.moveFish(npc, this, vec3d)) {
                     super.travel(vec3d);
                 }
-
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -267,7 +252,6 @@ public class TropicalFishController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/TurtleController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/TurtleController.java
index 594198ed4..e4a2f6fde 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/TurtleController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/TurtleController.java
@@ -65,7 +65,6 @@ public class TurtleController extends MobEntityController {
                 this.moveControl = new MoveControl(this);
                 this.jumpControl = new EmptyControllerJump(this);
             }
-
         }
 
         @Override
@@ -87,7 +86,6 @@ public class TurtleController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -95,7 +93,6 @@ public class TurtleController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -107,15 +104,12 @@ public class TurtleController extends MobEntityController {
                     this.moveControl = this.oldMoveController;
                     this.jumpControl = this.oldJumpController;
                 }
-
                 if (!npc.useMinecraftAI() && this.moveControl == this.oldMoveController) {
                     this.moveControl = new EntityMoveControl(this);
                     this.jumpControl = new EmptyControllerJump(this);
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
@@ -128,7 +122,6 @@ public class TurtleController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new TurtleNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -198,7 +191,6 @@ public class TurtleController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -209,7 +201,6 @@ public class TurtleController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -223,11 +214,9 @@ public class TurtleController extends MobEntityController {
                 if (!NMSImpl.moveFish(npc, this, vec3d)) {
                     super.travel(vec3d);
                 }
-
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -239,7 +228,6 @@ public class TurtleController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
 
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/VexController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/VexController.java
index 71b35574f..cfb4e1712 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/VexController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/VexController.java
@@ -52,7 +52,6 @@ public class VexController extends MobEntityController {
             if (npc != null) {
                 setNoGravity(true);
             }
-
         }
 
         @Override
@@ -67,7 +66,6 @@ public class VexController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -77,7 +75,6 @@ public class VexController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -90,7 +87,6 @@ public class VexController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new VexNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -152,7 +148,6 @@ public class VexController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -163,7 +158,6 @@ public class VexController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -180,7 +174,6 @@ public class VexController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/VillagerController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/VillagerController.java
index 70d3a4485..6fba1c092 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/VillagerController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/VillagerController.java
@@ -64,7 +64,6 @@ public class VillagerController extends MobEntityController {
             if (npc != null) {
                 getAttribute(Attributes.MOVEMENT_SPEED).setBaseValue(0.3);
             }
-
         }
 
         @Override
@@ -86,7 +85,6 @@ public class VillagerController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -94,7 +92,6 @@ public class VillagerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -102,12 +99,10 @@ public class VillagerController extends MobEntityController {
             if (npc != null) {
                 NMSImpl.updateMinecraftAIState(npc, this);
             }
-
             super.customServerAiStep();
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -120,7 +115,6 @@ public class VillagerController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new VillagerNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -171,7 +165,6 @@ public class VillagerController extends MobEntityController {
                 blockingATrade = false;
                 return true;
             }
-
             return super.isTrading();
         }
 
@@ -194,9 +187,7 @@ public class VillagerController extends MobEntityController {
                 if (list != null) {
                     list.clear();
                 }
-
             }
-
             return super.mobInteract(entityhuman, enumhand);
         }
 
@@ -214,7 +205,6 @@ public class VillagerController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -224,7 +214,6 @@ public class VillagerController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -235,7 +224,6 @@ public class VillagerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -248,7 +236,6 @@ public class VillagerController extends MobEntityController {
             if (npc == null) {
                 super.thunderHit(worldserver, entitylightning);
             }
-
         }
 
         @Override
@@ -258,7 +245,6 @@ public class VillagerController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -270,7 +256,6 @@ public class VillagerController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/VindicatorController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/VindicatorController.java
index d2c6490c8..4abcc2c13 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/VindicatorController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/VindicatorController.java
@@ -73,7 +73,6 @@ public class VindicatorController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -81,7 +80,6 @@ public class VindicatorController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -91,7 +89,6 @@ public class VindicatorController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -104,7 +101,6 @@ public class VindicatorController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new VindicatorNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -174,7 +170,6 @@ public class VindicatorController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -184,7 +179,6 @@ public class VindicatorController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -195,7 +189,6 @@ public class VindicatorController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -210,7 +203,6 @@ public class VindicatorController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -222,7 +214,6 @@ public class VindicatorController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WanderingTraderController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WanderingTraderController.java
index e6d79748c..43ba246c7 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WanderingTraderController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WanderingTraderController.java
@@ -83,7 +83,6 @@ public class WanderingTraderController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -91,7 +90,6 @@ public class WanderingTraderController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -99,13 +97,11 @@ public class WanderingTraderController extends MobEntityController {
             if (npc != null) {
                 NMSImpl.updateMinecraftAIState(npc, this);
             }
-
             super.customServerAiStep();
             if (npc != null) {
                 setDespawnDelay(10);
                 npc.update();
             }
-
         }
 
         @Override
@@ -118,7 +114,6 @@ public class WanderingTraderController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new WanderingTraderNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -173,7 +168,6 @@ public class WanderingTraderController extends MobEntityController {
                 blockingATrade = false;
                 return true;
             }
-
             return super.isTrading();
         }
 
@@ -196,9 +190,7 @@ public class WanderingTraderController extends MobEntityController {
                 if (list != null) {
                     list.clear();
                 }
-
             }
-
             return super.mobInteract(entityhuman, enumhand);
         }
 
@@ -216,7 +208,6 @@ public class WanderingTraderController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -226,7 +217,6 @@ public class WanderingTraderController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -237,7 +227,6 @@ public class WanderingTraderController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -254,7 +243,6 @@ public class WanderingTraderController extends MobEntityController {
             if (npc == null) {
                 super.thunderHit(worldserver, entitylightning);
             }
-
         }
 
         @Override
@@ -264,7 +252,6 @@ public class WanderingTraderController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -276,7 +263,6 @@ public class WanderingTraderController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WitchController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WitchController.java
index c49e9f7c9..f7e7a81dd 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WitchController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WitchController.java
@@ -72,7 +72,6 @@ public class WitchController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -80,7 +79,6 @@ public class WitchController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -90,7 +88,6 @@ public class WitchController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -103,7 +100,6 @@ public class WitchController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new WitchNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -173,7 +169,6 @@ public class WitchController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -184,7 +179,6 @@ public class WitchController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -194,7 +188,6 @@ public class WitchController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -209,7 +202,6 @@ public class WitchController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -221,7 +213,6 @@ public class WitchController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WitherController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WitherController.java
index 331ed3c8c..cb0aa32ef 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WitherController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WitherController.java
@@ -63,7 +63,6 @@ public class WitherController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -75,10 +74,8 @@ public class WitherController extends MobEntityController {
                 if (npc.useMinecraftAI()) {
                     super.customServerAiStep();
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
@@ -96,7 +93,6 @@ public class WitherController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new WitherNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -164,7 +160,6 @@ public class WitherController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -175,7 +170,6 @@ public class WitherController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -192,7 +186,6 @@ public class WitherController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WolfController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WolfController.java
index af2f13e2c..800887591 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WolfController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/WolfController.java
@@ -75,7 +75,6 @@ public class WolfController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -83,7 +82,6 @@ public class WolfController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -93,7 +91,6 @@ public class WolfController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -106,7 +103,6 @@ public class WolfController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new WolfNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -176,7 +172,6 @@ public class WolfController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -186,7 +181,6 @@ public class WolfController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -197,7 +191,6 @@ public class WolfController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -217,7 +210,6 @@ public class WolfController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -229,7 +221,6 @@ public class WolfController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZoglinController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZoglinController.java
index da8e79135..870923f21 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZoglinController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZoglinController.java
@@ -72,7 +72,6 @@ public class ZoglinController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -80,7 +79,6 @@ public class ZoglinController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -88,12 +86,10 @@ public class ZoglinController extends MobEntityController {
             if (npc != null) {
                 NMSImpl.updateMinecraftAIState(npc, this);
             }
-
             super.customServerAiStep();
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -106,7 +102,6 @@ public class ZoglinController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ZoglinNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -176,7 +171,6 @@ public class ZoglinController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -187,7 +181,6 @@ public class ZoglinController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -202,7 +195,6 @@ public class ZoglinController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -214,7 +206,6 @@ public class ZoglinController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZombieController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZombieController.java
index b5c924334..78db4f90a 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZombieController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZombieController.java
@@ -72,7 +72,6 @@ public class ZombieController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -80,7 +79,6 @@ public class ZombieController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -90,7 +88,6 @@ public class ZombieController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -103,7 +100,6 @@ public class ZombieController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ZombieNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -173,7 +169,6 @@ public class ZombieController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -184,7 +179,6 @@ public class ZombieController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -199,7 +193,6 @@ public class ZombieController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -211,7 +204,6 @@ public class ZombieController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZombieHuskController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZombieHuskController.java
index 17ecc8e79..9804acf44 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZombieHuskController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZombieHuskController.java
@@ -72,7 +72,6 @@ public class ZombieHuskController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -80,7 +79,6 @@ public class ZombieHuskController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -90,7 +88,6 @@ public class ZombieHuskController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -103,7 +100,6 @@ public class ZombieHuskController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ZombieHuskNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -173,7 +169,6 @@ public class ZombieHuskController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -184,7 +179,6 @@ public class ZombieHuskController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -199,7 +193,6 @@ public class ZombieHuskController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -211,7 +204,6 @@ public class ZombieHuskController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZombieVillagerController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZombieVillagerController.java
index f54796277..fc6ff08df 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZombieVillagerController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ZombieVillagerController.java
@@ -72,7 +72,6 @@ public class ZombieVillagerController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -80,7 +79,6 @@ public class ZombieVillagerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -90,7 +88,6 @@ public class ZombieVillagerController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -103,7 +100,6 @@ public class ZombieVillagerController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ZombieVillagerNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -173,7 +169,6 @@ public class ZombieVillagerController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -184,7 +179,6 @@ public class ZombieVillagerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -199,7 +193,6 @@ public class ZombieVillagerController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -211,7 +204,6 @@ public class ZombieVillagerController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/AreaEffectCloudController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/AreaEffectCloudController.java
index 1499002e7..ad4663dde 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/AreaEffectCloudController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/AreaEffectCloudController.java
@@ -58,7 +58,6 @@ public class AreaEffectCloudController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new AreaEffectCloudNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -89,7 +88,6 @@ public class AreaEffectCloudController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -100,7 +98,6 @@ public class AreaEffectCloudController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -115,7 +112,6 @@ public class AreaEffectCloudController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -127,7 +123,6 @@ public class AreaEffectCloudController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/BoatController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/BoatController.java
index cd6d85598..6b58b45a3 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/BoatController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/BoatController.java
@@ -71,7 +71,6 @@ public class BoatController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new BoatNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -91,7 +90,6 @@ public class BoatController extends MobEntityController {
                 this.aC = getBoundingBox().maxY;
                 return entityboat_Status;
             }
-
             if (t())
                 return Status.IN_WATER;
             float f = getGroundFriction();
@@ -99,7 +97,6 @@ public class BoatController extends MobEntityController {
                 this.aD = f;
                 return Status.ON_LAND;
             }
-
             return Status.IN_AIR;
         }
 
@@ -120,7 +117,6 @@ public class BoatController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -131,7 +127,6 @@ public class BoatController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -141,7 +136,6 @@ public class BoatController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -171,13 +165,9 @@ public class BoatController extends MobEntityController {
                             this.aC = Math.max(f, this.aC);
                             m = flag | (axisalignedbb.minY < f ? true : false);
                         }
-
                     }
-
                 }
-
             }
-
             return m;
         }
 
@@ -212,9 +202,7 @@ public class BoatController extends MobEntityController {
                         if (getControllingPassenger() instanceof ServerPlayer) {
                             this.aD /= 2.0F;
                         }
-
                     }
-
                     Vec3 vec3d = getDeltaMovement();
                     setDeltaMovement(vec3d.x * this.ap, vec3d.y + d1, vec3d.z * this.ap);
                     this.ar *= this.ap;
@@ -222,18 +210,14 @@ public class BoatController extends MobEntityController {
                         Vec3 vec3d1 = getDeltaMovement();
                         setDeltaMovement(vec3d1.x, vec3d1.y + d2 * 0.0615D, vec3d1.z);
                     }
-
                 }
-
                 move(MoverType.SELF, getDeltaMovement());
                 if (isVehicle()) {
                     setYRot((float) (getYRot() + this.ar));
                 }
-
             } else {
                 super.tick();
             }
-
         }
 
         private Status u() {
@@ -258,13 +242,9 @@ public class BoatController extends MobEntityController {
                                 return Status.UNDER_FLOWING_WATER;
                             flag = true;
                         }
-
                     }
-
                 }
-
             }
-
             return flag ? Status.UNDER_WATER : null;
         }
 
@@ -277,7 +257,6 @@ public class BoatController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/DragonFireballController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/DragonFireballController.java
index 47b55edec..43c9b0b58 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/DragonFireballController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/DragonFireballController.java
@@ -58,7 +58,6 @@ public class DragonFireballController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new DragonFireballNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -89,7 +88,6 @@ public class DragonFireballController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -100,7 +98,6 @@ public class DragonFireballController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -110,7 +107,6 @@ public class DragonFireballController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -125,11 +121,9 @@ public class DragonFireballController extends MobEntityController {
                 if (!npc.isProtected()) {
                     super.tick();
                 }
-
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -141,7 +135,6 @@ public class DragonFireballController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/EggController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/EggController.java
index a02f03d04..158a7456c 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/EggController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/EggController.java
@@ -73,7 +73,6 @@ public class EggController extends AbstractEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new EggNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -104,7 +103,6 @@ public class EggController extends AbstractEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -115,7 +113,6 @@ public class EggController extends AbstractEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -130,11 +127,9 @@ public class EggController extends AbstractEntityController {
                 if (!npc.isProtected()) {
                     super.tick();
                 }
-
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -146,7 +141,6 @@ public class EggController extends AbstractEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/EnderCrystalController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/EnderCrystalController.java
index 9724c263f..1d617dacb 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/EnderCrystalController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/EnderCrystalController.java
@@ -58,7 +58,6 @@ public class EnderCrystalController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new EnderCrystalNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -89,7 +88,6 @@ public class EnderCrystalController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -100,7 +98,6 @@ public class EnderCrystalController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -115,7 +112,6 @@ public class EnderCrystalController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -127,7 +123,6 @@ public class EnderCrystalController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/EnderPearlController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/EnderPearlController.java
index baa7135bb..d6d372e98 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/EnderPearlController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/EnderPearlController.java
@@ -59,7 +59,6 @@ public class EnderPearlController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new EnderPearlNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -90,7 +89,6 @@ public class EnderPearlController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -101,7 +99,6 @@ public class EnderPearlController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -116,11 +113,9 @@ public class EnderPearlController extends MobEntityController {
                 if (!npc.isProtected()) {
                     super.tick();
                 }
-
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -132,7 +127,6 @@ public class EnderPearlController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/EnderSignalController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/EnderSignalController.java
index 3875b5fe7..2d639faea 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/EnderSignalController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/EnderSignalController.java
@@ -59,7 +59,6 @@ public class EnderSignalController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new EnderSignalNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -90,7 +89,6 @@ public class EnderSignalController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -101,7 +99,6 @@ public class EnderSignalController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -116,7 +113,6 @@ public class EnderSignalController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -128,7 +124,6 @@ public class EnderSignalController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/EvokerFangsController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/EvokerFangsController.java
index 39ec77b3f..9ce8bcde4 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/EvokerFangsController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/EvokerFangsController.java
@@ -56,7 +56,6 @@ public class EvokerFangsController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new EvokerFangsNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -97,7 +96,6 @@ public class EvokerFangsController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -108,7 +106,6 @@ public class EvokerFangsController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -122,7 +119,6 @@ public class EvokerFangsController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -134,7 +130,6 @@ public class EvokerFangsController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ExperienceOrbController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ExperienceOrbController.java
index b1649dca8..2ee63d538 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ExperienceOrbController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ExperienceOrbController.java
@@ -52,7 +52,6 @@ public class ExperienceOrbController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ExperienceOrbNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -83,7 +82,6 @@ public class ExperienceOrbController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -94,7 +92,6 @@ public class ExperienceOrbController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -109,7 +106,6 @@ public class ExperienceOrbController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -121,7 +117,6 @@ public class ExperienceOrbController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/FallingBlockController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/FallingBlockController.java
index 7855767cd..6488a3301 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/FallingBlockController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/FallingBlockController.java
@@ -73,7 +73,6 @@ public class FallingBlockController extends AbstractEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new FallingBlockNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -104,7 +103,6 @@ public class FallingBlockController extends AbstractEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -115,7 +113,6 @@ public class FallingBlockController extends AbstractEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -125,7 +122,6 @@ public class FallingBlockController extends AbstractEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -143,11 +139,9 @@ public class FallingBlockController extends AbstractEntityController {
                     setDeltaMovement(mot);
                     move(MoverType.SELF, mot);
                 }
-
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -159,7 +153,6 @@ public class FallingBlockController extends AbstractEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
 
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/FireworkController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/FireworkController.java
index b1742c16c..b30e6545a 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/FireworkController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/FireworkController.java
@@ -53,7 +53,6 @@ public class FireworkController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new FireworkNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -84,7 +83,6 @@ public class FireworkController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -95,7 +93,6 @@ public class FireworkController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -110,7 +107,6 @@ public class FireworkController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -122,7 +118,6 @@ public class FireworkController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/FishingHookController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/FishingHookController.java
index b9b34a86f..6b1f4e8dc 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/FishingHookController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/FishingHookController.java
@@ -71,7 +71,6 @@ public class FishingHookController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new FishingHookNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -102,7 +101,6 @@ public class FishingHookController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -113,7 +111,6 @@ public class FishingHookController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -133,7 +130,6 @@ public class FishingHookController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -145,7 +141,6 @@ public class FishingHookController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/GlowItemFrameController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/GlowItemFrameController.java
index 9e400f423..9d5dc03cb 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/GlowItemFrameController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/GlowItemFrameController.java
@@ -64,7 +64,6 @@ public class GlowItemFrameController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new GlowItemFrameNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -95,7 +94,6 @@ public class GlowItemFrameController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -106,7 +104,6 @@ public class GlowItemFrameController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -126,7 +123,6 @@ public class GlowItemFrameController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -138,7 +134,6 @@ public class GlowItemFrameController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ItemController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ItemController.java
index 13d773002..d7627ad6f 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ItemController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ItemController.java
@@ -65,7 +65,6 @@ public class ItemController extends AbstractEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ItemNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -95,7 +94,6 @@ public class ItemController extends AbstractEntityController {
             if (npc == null) {
                 super.playerTouch(entityhuman);
             }
-
         }
 
         @Override
@@ -104,7 +102,6 @@ public class ItemController extends AbstractEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -115,7 +112,6 @@ public class ItemController extends AbstractEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -130,7 +126,6 @@ public class ItemController extends AbstractEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -142,7 +137,6 @@ public class ItemController extends AbstractEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ItemFrameController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ItemFrameController.java
index 59ce7e542..b262a0b75 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ItemFrameController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ItemFrameController.java
@@ -63,7 +63,6 @@ public class ItemFrameController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ItemFrameNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -94,7 +93,6 @@ public class ItemFrameController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -105,7 +103,6 @@ public class ItemFrameController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -125,7 +122,6 @@ public class ItemFrameController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -137,7 +133,6 @@ public class ItemFrameController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/LargeFireballController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/LargeFireballController.java
index c994b2810..8ea3e7b3b 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/LargeFireballController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/LargeFireballController.java
@@ -52,7 +52,6 @@ public class LargeFireballController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new LargeFireballNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -83,7 +82,6 @@ public class LargeFireballController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -94,7 +92,6 @@ public class LargeFireballController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -104,7 +101,6 @@ public class LargeFireballController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -119,11 +115,9 @@ public class LargeFireballController extends MobEntityController {
                 if (!npc.isProtected()) {
                     super.tick();
                 }
-
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -135,7 +129,6 @@ public class LargeFireballController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/LeashController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/LeashController.java
index 313a66320..2059397c6 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/LeashController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/LeashController.java
@@ -53,7 +53,6 @@ public class LeashController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new LeashNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -84,7 +83,6 @@ public class LeashController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -95,7 +93,6 @@ public class LeashController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -115,7 +112,6 @@ public class LeashController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -127,7 +123,6 @@ public class LeashController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/LlamaSpitController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/LlamaSpitController.java
index 59b4ff57f..9ab6fbbbf 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/LlamaSpitController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/LlamaSpitController.java
@@ -70,7 +70,6 @@ public class LlamaSpitController extends AbstractEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new LlamaSpitNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -101,7 +100,6 @@ public class LlamaSpitController extends AbstractEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -112,7 +110,6 @@ public class LlamaSpitController extends AbstractEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -127,11 +124,9 @@ public class LlamaSpitController extends AbstractEntityController {
                 if (!npc.isProtected()) {
                     super.tick();
                 }
-
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -143,7 +138,6 @@ public class LlamaSpitController extends AbstractEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MarkerController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MarkerController.java
index b91c73a1c..3c49ee5b4 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MarkerController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MarkerController.java
@@ -52,7 +52,6 @@ public class MarkerController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new MarkerNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -83,7 +82,6 @@ public class MarkerController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -94,7 +92,6 @@ public class MarkerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -109,7 +106,6 @@ public class MarkerController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -121,7 +117,6 @@ public class MarkerController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartChestController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartChestController.java
index 3cfd93058..b3cb84efb 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartChestController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartChestController.java
@@ -53,7 +53,6 @@ public class MinecartChestController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new MinecartChestNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -84,7 +83,6 @@ public class MinecartChestController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -95,7 +93,6 @@ public class MinecartChestController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -110,7 +107,6 @@ public class MinecartChestController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
 
         @Override
@@ -122,7 +118,6 @@ public class MinecartChestController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartCommandController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartCommandController.java
index 6b8600fde..abe4ef7aa 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartCommandController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartCommandController.java
@@ -53,7 +53,6 @@ public class MinecartCommandController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new MinecartCommandNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -84,7 +83,6 @@ public class MinecartCommandController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -95,7 +93,6 @@ public class MinecartCommandController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -110,7 +107,6 @@ public class MinecartCommandController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
 
         @Override
@@ -122,7 +118,6 @@ public class MinecartCommandController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartFurnaceController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartFurnaceController.java
index adcbdde94..aed25dc28 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartFurnaceController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartFurnaceController.java
@@ -53,7 +53,6 @@ public class MinecartFurnaceController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new MinecartFurnaceNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -84,7 +83,6 @@ public class MinecartFurnaceController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -95,7 +93,6 @@ public class MinecartFurnaceController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -110,7 +107,6 @@ public class MinecartFurnaceController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
 
         @Override
@@ -122,7 +118,6 @@ public class MinecartFurnaceController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartHopperController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartHopperController.java
index 2348620d8..770671862 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartHopperController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartHopperController.java
@@ -70,7 +70,6 @@ public class MinecartHopperController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -81,7 +80,6 @@ public class MinecartHopperController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -96,7 +94,6 @@ public class MinecartHopperController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
 
         @Override
@@ -108,7 +105,6 @@ public class MinecartHopperController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartRideableController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartRideableController.java
index 7a4dfe29d..4f7e82dc5 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartRideableController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartRideableController.java
@@ -52,7 +52,6 @@ public class MinecartRideableController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new MinecartRideableNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -83,7 +82,6 @@ public class MinecartRideableController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -94,7 +92,6 @@ public class MinecartRideableController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -109,7 +106,6 @@ public class MinecartRideableController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
 
         @Override
@@ -121,7 +117,6 @@ public class MinecartRideableController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartSpawnerController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartSpawnerController.java
index a3a3a08e3..94abef782 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartSpawnerController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartSpawnerController.java
@@ -70,7 +70,6 @@ public class MinecartSpawnerController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -81,7 +80,6 @@ public class MinecartSpawnerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -96,7 +94,6 @@ public class MinecartSpawnerController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
 
         @Override
@@ -108,7 +105,6 @@ public class MinecartSpawnerController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartTNTController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartTNTController.java
index 51087de76..ecdc04831 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartTNTController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/MinecartTNTController.java
@@ -70,7 +70,6 @@ public class MinecartTNTController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -81,7 +80,6 @@ public class MinecartTNTController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -96,7 +94,6 @@ public class MinecartTNTController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
 
         @Override
@@ -108,7 +105,6 @@ public class MinecartTNTController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/PaintingController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/PaintingController.java
index cbfb61f40..779cbadb2 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/PaintingController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/PaintingController.java
@@ -52,7 +52,6 @@ public class PaintingController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new PaintingNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -83,7 +82,6 @@ public class PaintingController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -94,7 +92,6 @@ public class PaintingController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -114,7 +111,6 @@ public class PaintingController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -126,7 +122,6 @@ public class PaintingController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ShulkerBulletController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ShulkerBulletController.java
index 37b64f8cd..2a0bf2fc0 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ShulkerBulletController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ShulkerBulletController.java
@@ -52,7 +52,6 @@ public class ShulkerBulletController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ShulkerBulletNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -83,7 +82,6 @@ public class ShulkerBulletController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -94,7 +92,6 @@ public class ShulkerBulletController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -109,7 +106,6 @@ public class ShulkerBulletController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -121,7 +117,6 @@ public class ShulkerBulletController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/SmallFireballController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/SmallFireballController.java
index 7b2d301a5..5f079e049 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/SmallFireballController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/SmallFireballController.java
@@ -52,7 +52,6 @@ public class SmallFireballController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SmallFireballNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -83,7 +82,6 @@ public class SmallFireballController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -94,7 +92,6 @@ public class SmallFireballController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -109,11 +106,9 @@ public class SmallFireballController extends MobEntityController {
                 if (!npc.isProtected()) {
                     super.tick();
                 }
-
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -125,7 +120,6 @@ public class SmallFireballController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/SnowballController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/SnowballController.java
index 798719a95..81511e4c2 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/SnowballController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/SnowballController.java
@@ -52,7 +52,6 @@ public class SnowballController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SnowballNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -83,7 +82,6 @@ public class SnowballController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -94,7 +92,6 @@ public class SnowballController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -109,7 +106,6 @@ public class SnowballController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -121,7 +117,6 @@ public class SnowballController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/SpectralArrowController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/SpectralArrowController.java
index 7e8b7dcc3..9ec55992f 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/SpectralArrowController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/SpectralArrowController.java
@@ -53,7 +53,6 @@ public class SpectralArrowController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SpectralArrowNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -84,7 +83,6 @@ public class SpectralArrowController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -95,7 +93,6 @@ public class SpectralArrowController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -110,7 +107,6 @@ public class SpectralArrowController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -122,7 +118,6 @@ public class SpectralArrowController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/TNTPrimedController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/TNTPrimedController.java
index 82fdf3c75..4394474be 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/TNTPrimedController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/TNTPrimedController.java
@@ -53,7 +53,6 @@ public class TNTPrimedController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new TNTPrimedNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -84,7 +83,6 @@ public class TNTPrimedController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -95,7 +93,6 @@ public class TNTPrimedController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -110,7 +107,6 @@ public class TNTPrimedController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -122,7 +118,6 @@ public class TNTPrimedController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ThrownExpBottleController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ThrownExpBottleController.java
index f1f6c1705..dcca24b40 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ThrownExpBottleController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ThrownExpBottleController.java
@@ -53,7 +53,6 @@ public class ThrownExpBottleController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ThrownExpBottleNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -84,7 +83,6 @@ public class ThrownExpBottleController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -95,7 +93,6 @@ public class ThrownExpBottleController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -110,11 +107,9 @@ public class ThrownExpBottleController extends MobEntityController {
                 if (!npc.isProtected()) {
                     super.tick();
                 }
-
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -126,7 +121,6 @@ public class ThrownExpBottleController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ThrownPotionController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ThrownPotionController.java
index 2d035646b..103029363 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ThrownPotionController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ThrownPotionController.java
@@ -56,9 +56,7 @@ public class ThrownPotionController extends MobEntityController {
                 } else {
                     NMSImpl.setBukkitEntity(this, new SplashThrownPotionNPC(this));
                 }
-
             }
-
             return super.getBukkitEntity();
         }
 
@@ -89,7 +87,6 @@ public class ThrownPotionController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -100,7 +97,6 @@ public class ThrownPotionController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -115,7 +111,6 @@ public class ThrownPotionController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -127,7 +122,6 @@ public class ThrownPotionController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ThrownTridentController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ThrownTridentController.java
index 2426558e9..64506ad26 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ThrownTridentController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/ThrownTridentController.java
@@ -53,7 +53,6 @@ public class ThrownTridentController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ThrownTridentNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -84,7 +83,6 @@ public class ThrownTridentController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -95,7 +93,6 @@ public class ThrownTridentController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -110,7 +107,6 @@ public class ThrownTridentController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -122,7 +118,6 @@ public class ThrownTridentController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/TippedArrowController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/TippedArrowController.java
index 5da96bff9..844ae7090 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/TippedArrowController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/TippedArrowController.java
@@ -52,7 +52,6 @@ public class TippedArrowController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new TippedArrowNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -83,7 +82,6 @@ public class TippedArrowController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -94,7 +92,6 @@ public class TippedArrowController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -109,7 +106,6 @@ public class TippedArrowController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -121,7 +117,6 @@ public class TippedArrowController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/WitherSkullController.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/WitherSkullController.java
index 1932dec42..16dcc9008 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/WitherSkullController.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/WitherSkullController.java
@@ -52,7 +52,6 @@ public class WitherSkullController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new WitherSkullNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -83,7 +82,6 @@ public class WitherSkullController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -94,7 +92,6 @@ public class WitherSkullController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -109,7 +106,6 @@ public class WitherSkullController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -121,7 +117,6 @@ public class WitherSkullController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/CitizensBlockBreaker.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/CitizensBlockBreaker.java
index 76a3ec2aa..67064e1a7 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/CitizensBlockBreaker.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/CitizensBlockBreaker.java
@@ -47,7 +47,6 @@ public class CitizensBlockBreaker extends AbstractBlockBreaker {
             ItemStack current = getCurrentItem();
             return current != null ? current.isCorrectToolForDrops(block) : false;
         }
-
     }
 
     @Override
@@ -66,13 +65,10 @@ public class CitizensBlockBreaker extends AbstractBlockBreaker {
                 if (i > 0) {
                     f += i * i + 1;
                 }
-
             }
-
             if (MobEffectUtil.hasDigSpeed(handle)) {
                 f *= 1.0F + (MobEffectUtil.getDigSpeedAmplification(handle) + 1) * 0.2F;
             }
-
             if (handle.hasEffect(MobEffects.DIG_SLOWDOWN)) {
                 float f1 = 1.0F;
                 switch (handle.getEffect(MobEffects.DIG_SLOWDOWN).getAmplifier()) {
@@ -89,20 +85,15 @@ public class CitizensBlockBreaker extends AbstractBlockBreaker {
                     default:
                         f1 = 8.1E-4F;
                 }
-
                 f *= f1;
             }
-
             if (handle.isEyeInFluid(FluidTags.WATER) && !EnchantmentHelper.hasAquaAffinity(handle)) {
                 f /= 5.0F;
             }
-
         }
-
         if (!entity.isOnGround()) {
             f /= 5.0F;
         }
-
         return f;
     }
 }
\ No newline at end of file
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/EmptyAdvancementDataPlayer.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/EmptyAdvancementDataPlayer.java
index 79213f544..263e62fe4 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/EmptyAdvancementDataPlayer.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/EmptyAdvancementDataPlayer.java
@@ -68,7 +68,6 @@ public class EmptyAdvancementDataPlayer extends PlayerAdvancements {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     private static final MethodHandle I = NMS.getGetter(PlayerAdvancements.class, "i");
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/EntityMoveControl.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/EntityMoveControl.java
index a13adee69..8d1f69465 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/EntityMoveControl.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/EntityMoveControl.java
@@ -65,18 +65,15 @@ public class EntityMoveControl extends MoveControl {
         if (f3 > f2) {
             f3 = f2;
         }
-
         if (f3 < -f2) {
             f3 = -f2;
         }
-
         float f4 = f + f3;
         if (f4 < 0.0F) {
             f4 += 360.0F;
         } else if (f4 > 360.0F) {
             f4 -= 360.0F;
         }
-
         return f4;
     }
 
@@ -102,13 +99,11 @@ public class EntityMoveControl extends MoveControl {
                 this.entity.zza = 0.0F;
                 return;
             }
-
             if (dXZ > 0.4) {
                 float f = (float) (Mth.atan2(dZ, dX) * 57.2957763671875D) - 90.0F;
                 this.entity.setYRot(rotlerp(this.entity.getYRot(), f, 90.0F));
                 NMS.setHeadYaw(entity.getBukkitEntity(), this.entity.getYRot());
             }
-
             AttributeInstance speed = this.entity.getAttribute(Attributes.MOVEMENT_SPEED);
             float movement = (float) (this.speed * speed.getValue());
             this.entity.setSpeed(movement);
@@ -118,17 +113,13 @@ public class EntityMoveControl extends MoveControl {
                 if (((Slime) entity).isAggressive()) {
                     this.jumpTicks /= 3;
                 }
-
                 ((Slime) entity).getJumpControl().jump();
             } else if (dY >= NMS.getStepHeight(entity.getBukkitEntity()) && dXZ < 0.4D) {
                 if (entity instanceof Mob) {
                     ((Mob) entity).getJumpControl().jump();
                 }
-
                 entity.setJumping(true);
             }
-
         }
-
     }
 }
\ No newline at end of file
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/EntityNavigation.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/EntityNavigation.java
index 38ad431d3..e43323979 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/EntityNavigation.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/EntityNavigation.java
@@ -101,11 +101,9 @@ public class EntityNavigation extends PathNavigation {
         if (var7 >= 0.0D) {
             var19++;
         }
-
         if (var9 >= 0.0D) {
             var21++;
         }
-
         var19 /= var7;
         var21 /= var9;
         int var23 = var7 < 0.0D ? -1 : 1;
@@ -124,11 +122,9 @@ public class EntityNavigation extends PathNavigation {
                 var6 += var24;
                 var28 = var26 - var6;
             }
-
             if (!canWalkOn(var5, Mth.floor(var0.y), var6, var2, var3, var4, var0, var7, var9))
                 return false;
         }
-
         return true;
     }
 
@@ -154,11 +150,9 @@ public class EntityNavigation extends PathNavigation {
             if (var13 * var7 + var15 * var9 < 0.0D) {
                 continue;
             }
-
             if (!this.level.getBlockState(var12).isPathfindable(this.level, var12, PathComputationType.LAND))
                 return false;
         }
-
         return true;
     }
 
@@ -186,11 +180,8 @@ public class EntityNavigation extends PathNavigation {
                             || var19 == BlockPathTypes.DAMAGE_OTHER)
                         return false;
                 }
-
             }
-
         }
-
         return true;
     }
 
@@ -201,26 +192,21 @@ public class EntityNavigation extends PathNavigation {
             while (var2.getY() > this.level.getMinBuildHeight() && this.level.getBlockState(var2).isAir()) {
                 var2 = var2.down();
             }
-
             if (var2.getY() > this.level.getMinBuildHeight())
                 return supercreatePath(var2.up(), var1);
             while (var2.getY() < this.level.getMaxBuildHeight() && this.level.getBlockState(var2).isAir()) {
                 var2 = var2.up();
             }
-
             var0 = var2;
         }
-
         if (this.level.getBlockState(var0).getMaterial().isSolid()) {
             BlockPos var2 = var0.up();
             while (var2.getY() < this.level.getMaxBuildHeight()
                     && this.level.getBlockState(var2).getMaterial().isSolid()) {
                 var2 = var2.up();
             }
-
             return supercreatePath(var2, var1);
         }
-
         return supercreatePath(var0, var1);
     }
 
@@ -262,7 +248,6 @@ public class EntityNavigation extends PathNavigation {
             this.reachRange = var3;
             resetStuckTimeout();
         }
-
         return var8;
     }
 
@@ -285,11 +270,9 @@ public class EntityNavigation extends PathNavigation {
             } else {
                 this.isStuck = false;
             }
-
             this.lastStuckCheck = this.tick;
             this.lastStuckCheckPos = var0;
         }
-
         if (this.path != null && !this.path.isDone()) {
             BlockPos blockPos = this.path.getNextNodePos();
             if (blockPos.equals(this.timeoutCachedNode)) {
@@ -299,14 +282,11 @@ public class EntityNavigation extends PathNavigation {
                 double var2 = var0.distanceTo(Vec3.atBottomCenterOf(this.timeoutCachedNode));
                 this.timeoutLimit = this.mob.getSpeed() > 0.0F ? var2 / this.mob.getSpeed() * 1000.0D : 0.0D;
             }
-
             if (this.timeoutLimit > 0.0D && this.timeoutTimer > this.timeoutLimit * 3.0D) {
                 timeoutPath();
             }
-
             this.lastTimeoutCheck = System.currentTimeMillis();
         }
-
     }
 
     @Override
@@ -322,7 +302,6 @@ public class EntityNavigation extends PathNavigation {
         if (var8 || canCutCorner(this.path.getNextNode().type) && shouldTargetNextNodeInDirection(var0)) {
             this.path.advance();
         }
-
         doStuckDetection(var0);
     }
 
@@ -357,7 +336,6 @@ public class EntityNavigation extends PathNavigation {
             if (++var2 > 16)
                 return this.mob.getBlockY();
         }
-
         return var0;
     }
 
@@ -425,11 +403,9 @@ public class EntityNavigation extends PathNavigation {
             this.path = null;
             return false;
         }
-
         if (!var0.sameAs(this.path)) {
             this.path = var0;
         }
-
         if (isDone())
             return false;
         trimPath();
@@ -451,11 +427,9 @@ public class EntityNavigation extends PathNavigation {
                 this.timeLastRecompute = this.level.getGameTime();
                 this.hasDelayedRecomputation = false;
             }
-
         } else {
             this.hasDelayedRecomputation = true;
         }
-
     }
 
     @Override
@@ -468,7 +442,6 @@ public class EntityNavigation extends PathNavigation {
         if (var0.closerThan(var2, this.path.getNodeCount() - this.path.getNextNodeIndex())) {
             recomputePath();
         }
-
     }
 
     @Override
@@ -547,11 +520,8 @@ public class EntityNavigation extends PathNavigation {
                 if (var2 != null && var1.y >= var2.y) {
                     this.path.replaceNode(var0 + 1, var1.cloneAndMove(var2.x, var1.y + 1, var2.z));
                 }
-
             }
-
         }
-
     }
 
     @Override
@@ -560,7 +530,6 @@ public class EntityNavigation extends PathNavigation {
         if (this.hasDelayedRecomputation) {
             recomputePath();
         }
-
         if (isDone())
             return;
         if (canUpdatePath()) {
@@ -572,9 +541,7 @@ public class EntityNavigation extends PathNavigation {
                     && Mth.floor(vec31.z) == Mth.floor(vec32.z)) {
                 this.path.advance();
             }
-
         }
-
         if (isDone())
             return;
         Vec3 var0 = this.path.getNextEntityPos(this.mob);
@@ -600,11 +567,8 @@ public class EntityNavigation extends PathNavigation {
                     this.path.truncateNodes(var0);
                     return;
                 }
-
             }
-
         }
-
     }
 
     private static Mob getDummyInsentient(LivingEntity from, Level world) {
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/EntityNodeEvaluator.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/EntityNodeEvaluator.java
index 18e4a62b3..ae3733b88 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/EntityNodeEvaluator.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/EntityNodeEvaluator.java
@@ -49,7 +49,6 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
             if (hasCollisions(var2))
                 return false;
         }
-
         return true;
     }
 
@@ -66,22 +65,18 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
         if (var4 == BlockPathTypes.DOOR_WOOD_CLOSED && var1 && var2) {
             var4 = BlockPathTypes.WALKABLE_DOOR;
         }
-
         if (var4 == BlockPathTypes.DOOR_OPEN && !var2) {
             var4 = BlockPathTypes.BLOCKED;
         }
-
         if (var4 == BlockPathTypes.RAIL
                 && !(var0.getBlockState(var3).getBlock() instanceof net.minecraft.world.level.block.BaseRailBlock)
                 && !(var0.getBlockState(var3.down())
                         .getBlock() instanceof net.minecraft.world.level.block.BaseRailBlock)) {
             var4 = BlockPathTypes.UNPASSABLE_RAIL;
         }
-
         if (var4 == BlockPathTypes.LEAVES) {
             var4 = BlockPathTypes.BLOCKED;
         }
-
         return var4;
     }
 
@@ -100,11 +95,9 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
             var8.type = var12;
             var8.costMalus = Math.max(var8.costMalus, var13);
         }
-
         if (var7 == BlockPathTypes.FENCE && var8 != null && var8.costMalus >= 0.0F && !canReachWithoutCollision(var8)) {
             var8 = null;
         }
-
         if (var12 == BlockPathTypes.WALKABLE || isAmphibious() && var12 == BlockPathTypes.WATER)
             return var8;
         if ((var8 == null || var8.costMalus < 0.0F) && var3 > 0 && var12 != BlockPathTypes.FENCE
@@ -123,11 +116,8 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
                 if (hasCollisions(var20)) {
                     var8 = null;
                 }
-
             }
-
         }
-
         if (!isAmphibious() && var12 == BlockPathTypes.WATER && !canFloat()) {
             if (getCachedBlockType(this.mob, var0, var1 - 1, var2) != BlockPathTypes.WATER)
                 return var8;
@@ -140,12 +130,9 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
                     var8.costMalus = Math.max(var8.costMalus, this.mvmt.getPathfindingMalus(var12));
                     continue;
                 }
-
                 return var8;
             }
-
         }
-
         if (var12 == BlockPathTypes.OPEN) {
             int var16 = 0;
             int var17 = var1;
@@ -157,14 +144,12 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
                     var18.costMalus = -1.0F;
                     return var18;
                 }
-
                 if (var16++ >= this.mob.getMaxFallDistance()) {
                     Node var18 = getNode(var0, var1, var2);
                     var18.type = BlockPathTypes.BLOCKED;
                     var18.costMalus = -1.0F;
                     return var18;
                 }
-
                 var12 = getCachedBlockType(this.mob, var0, var1, var2);
                 var13 = this.mvmt.getPathfindingMalus(var12);
                 if (var12 != BlockPathTypes.OPEN && var13 >= 0.0F) {
@@ -173,25 +158,20 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
                     var8.costMalus = Math.max(var8.costMalus, var13);
                     break;
                 }
-
                 if (var13 < 0.0F) {
                     Node var18 = getNode(var0, var1, var2);
                     var18.type = BlockPathTypes.BLOCKED;
                     var18.costMalus = -1.0F;
                     return var18;
                 }
-
             }
-
         }
-
         if (var12 == BlockPathTypes.FENCE) {
             var8 = getNode(var0, var1, var2);
             var8.closed = true;
             var8.type = var12;
             var8.costMalus = var12.getMalus();
         }
-
         return var8;
     }
 
@@ -217,9 +197,7 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
             if (mvmt.getPathfindingMalus(var15) >= mvmt.getPathfindingMalus(var13)) {
                 var13 = var15;
             }
-
         }
-
         if (var11 == BlockPathTypes.OPEN && mvmt.getPathfindingMalus(var13) == 0.0F && var5 <= 1)
             return BlockPathTypes.OPEN;
         return var13;
@@ -243,9 +221,7 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
             if (var4.getPathfindingMalus(var15) >= var4.getPathfindingMalus(var13)) {
                 var13 = var15;
             }
-
         }
-
         if (var11 == BlockPathTypes.OPEN && var4.getPathfindingMalus(var13) == 0.0F && var5 <= 1)
             return BlockPathTypes.OPEN;
         return var13;
@@ -272,9 +248,7 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
             if (mvmt.getPathfindingMalus(var15) >= mvmt.getPathfindingMalus(var13)) {
                 var13 = var15;
             }
-
         }
-
         if (var11 == BlockPathTypes.OPEN && mvmt.getPathfindingMalus(var13) == 0.0F && var5 <= 1)
             return BlockPathTypes.OPEN;
         return var13;
@@ -293,14 +267,10 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
                     if (var12 == 0 && var13 == 0 && var14 == 0) {
                         var10 = var18;
                     }
-
                     var9.add(var18);
                 }
-
             }
-
         }
-
         return var10;
     }
 
@@ -334,48 +304,39 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
         if (this.mvmt.getPathfindingMalus(var4) >= 0.0F && var5 != BlockPathTypes.STICKY_HONEY) {
             var3 = Mth.floor(Math.max(1.0F, this.mob.maxUpStep));
         }
-
         double var6 = getFloorLevel(new BlockPos(var1.x, var1.y, var1.z));
         Node var8 = findAcceptedNode(var1.x, var1.y, var1.z + 1, var3, var6, Direction.SOUTH, var5);
         if (isNeighborValid(var8, var1)) {
             var0[var2++] = var8;
         }
-
         Node var9 = findAcceptedNode(var1.x - 1, var1.y, var1.z, var3, var6, Direction.WEST, var5);
         if (isNeighborValid(var9, var1)) {
             var0[var2++] = var9;
         }
-
         Node var10 = findAcceptedNode(var1.x + 1, var1.y, var1.z, var3, var6, Direction.EAST, var5);
         if (isNeighborValid(var10, var1)) {
             var0[var2++] = var10;
         }
-
         Node var11 = findAcceptedNode(var1.x, var1.y, var1.z - 1, var3, var6, Direction.NORTH, var5);
         if (isNeighborValid(var11, var1)) {
             var0[var2++] = var11;
         }
-
         Node var12 = findAcceptedNode(var1.x - 1, var1.y, var1.z - 1, var3, var6, Direction.NORTH, var5);
         if (isDiagonalValid(var1, var9, var11, var12)) {
             var0[var2++] = var12;
         }
-
         Node var13 = findAcceptedNode(var1.x + 1, var1.y, var1.z - 1, var3, var6, Direction.NORTH, var5);
         if (isDiagonalValid(var1, var10, var11, var13)) {
             var0[var2++] = var13;
         }
-
         Node var14 = findAcceptedNode(var1.x - 1, var1.y, var1.z + 1, var3, var6, Direction.SOUTH, var5);
         if (isDiagonalValid(var1, var9, var8, var14)) {
             var0[var2++] = var14;
         }
-
         Node var15 = findAcceptedNode(var1.x + 1, var1.y, var1.z + 1, var3, var6, Direction.SOUTH, var5);
         if (isDiagonalValid(var1, var10, var8, var15)) {
             var0[var2++] = var15;
         }
-
         return var2;
     }
 
@@ -389,14 +350,12 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
                 var0++;
                 var2 = this.level.getBlockState(var1.set(this.mob.getX(), var0, this.mob.getZ()));
             }
-
             var0--;
         } else if (canFloat() && this.mob.isInWater()) {
             while (var2.is(Blocks.WATER) || var2.getFluidState() == Fluids.WATER.getSource(false)) {
                 var0++;
                 var2 = this.level.getBlockState(var1.set(this.mob.getX(), var0, this.mob.getZ()));
             }
-
             var0--;
         } else if (this.mob.isOnGround()) {
             var0 = Mth.floor(this.mob.getY() + 0.5D);
@@ -407,10 +366,8 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
                     && blockPos.getY() > this.mob.level.getMinBuildHeight()) {
                 blockPos = blockPos.down();
             }
-
             var0 = blockPos.up().getY();
         }
-
         BlockPos var3 = this.mob.blockPosition();
         BlockPathTypes var4 = getCachedBlockType(this.mob, var3.getX(), var0, var3.getZ());
         if (this.mvmt.getPathfindingMalus(var4) < 0.0F) {
@@ -424,9 +381,7 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
                 var6.costMalus = this.mvmt.getPathfindingMalus(var6.type);
                 return var6;
             }
-
         }
-
         Node var5 = getNode(var3.getX(), var0, var3.getZ());
         var5.type = getBlockPathType(this.mob, var5.asBlockPos());
         var5.costMalus = this.mvmt.getPathfindingMalus(var5.type);
@@ -490,13 +445,9 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
                         if (var0.getFluidState(var1).is(FluidTags.WATER))
                             return BlockPathTypes.WATER_BORDER;
                     }
-
                 }
-
             }
-
         }
-
         return var2;
     }
 
@@ -556,25 +507,19 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
             if (var6 == BlockPathTypes.DAMAGE_FIRE) {
                 var5 = BlockPathTypes.DAMAGE_FIRE;
             }
-
             if (var6 == BlockPathTypes.DAMAGE_CACTUS) {
                 var5 = BlockPathTypes.DAMAGE_CACTUS;
             }
-
             if (var6 == BlockPathTypes.DAMAGE_OTHER) {
                 var5 = BlockPathTypes.DAMAGE_OTHER;
             }
-
             if (var6 == BlockPathTypes.STICKY_HONEY) {
                 var5 = BlockPathTypes.STICKY_HONEY;
             }
-
         }
-
         if (var5 == BlockPathTypes.WALKABLE) {
             var5 = checkNeighbourBlocks(var0, var1.set(var2, var3, var4), var5);
         }
-
         return var5;
     }
 
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/EntityPathfinder.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/EntityPathfinder.java
index 3ecb3b359..8c372ab79 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/EntityPathfinder.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/EntityPathfinder.java
@@ -92,17 +92,13 @@ public class EntityPathfinder extends PathFinder {
                     target.setReached();
                     var9.add(target);
                 }
-
             }
-
             if (!var9.isEmpty()) {
                 break;
             }
-
             if (node.distanceTo(var1) >= var3) {
                 continue;
             }
-
             int i = this.nodeEvaluator.getNeighbors(this.neighbors, node);
             for (int var13 = 0; var13 < i; var13++) {
                 Node var14 = this.neighbors[var13];
@@ -119,13 +115,9 @@ public class EntityPathfinder extends PathFinder {
                         var14.f = var14.g + var14.h;
                         this.openSet.insert(var14);
                     }
-
                 }
-
             }
-
         }
-
         Optional<Path> var11 = !var9.isEmpty()
                 ? var9.stream().map(p -> reconstructPath(p.getBestNode(), var2.get(p), true)).min(
                         Comparator.comparingInt(Path::getNodeCount))
@@ -144,7 +136,6 @@ public class EntityPathfinder extends PathFinder {
             var4.updateBest(var5, var0);
             var2 = Math.min(var5, var2);
         }
-
         return var2;
     }
 
@@ -163,7 +154,6 @@ public class EntityPathfinder extends PathFinder {
             var4 = var4.cameFrom;
             var3.add(0, var4);
         }
-
         return new Path(var3, var1, var2);
     }
 }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/ForwardingNPCHolder.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/ForwardingNPCHolder.java
index d087bc4cb..cccb5b272 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/ForwardingNPCHolder.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/ForwardingNPCHolder.java
@@ -17,7 +17,6 @@ public interface ForwardingNPCHolder extends NPCHolder, Entity {
                     () -> Joiner.on(' ').join("ForwardingNPCHolder with an improper bukkit entity", this, handle));
             return null;
         }
-
         return ((NPCHolder) handle).getNPC();
     }
 }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/MobAI.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/MobAI.java
index d3c485fcc..7c3f75595 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/MobAI.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/MobAI.java
@@ -41,7 +41,6 @@ public interface MobAI {
         if (!nav.isDone()) {
             nav.tick();
         }
-
     }
 
     default void updatePathfindingRange(float range) {
@@ -171,7 +170,6 @@ public interface MobAI {
             };
         } else if (handle instanceof MobAI)
             return (MobAI) handle;
-
         return null;
     }
 }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/NMSImpl.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/NMSImpl.java
index 89a72e824..168184997 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/NMSImpl.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/NMSImpl.java
@@ -349,21 +349,17 @@ public class NMSImpl implements NMSBridge {
                 viewDistance = (int) PLAYER_CHUNK_MAP_VIEW_DISTANCE_GETTER.invoke(chunkMap);
                 PLAYER_CHUNK_MAP_VIEW_DISTANCE_SETTER.invoke(chunkMap, -1);
             }
-
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         boolean success = getHandle(entity).level.addEntity(getHandle(entity), custom);
         try {
             if (chunkMap != null) {
                 PLAYER_CHUNK_MAP_VIEW_DISTANCE_SETTER.invoke(chunkMap, viewDistance);
             }
-
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         return success;
     }
 
@@ -379,14 +375,12 @@ public class NMSImpl implements NMSBridge {
         } else if (!handle.level.players().contains(handle)) {
             ((List) handle.level.players()).add(handle);
         }
-
         try {
             CHUNKMAP_UPDATE_PLAYER_STATUS.invoke(
                     ((ServerChunkCache) ((ServerLevel) handle.level).getChunkSource()).chunkMap, handle, !remove);
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         // PlayerUpdateTask.addOrRemove(entity, remove);
     }
 
@@ -399,12 +393,10 @@ public class NMSImpl implements NMSBridge {
             PlayerAnimation.ARM_SWING.play((Player) handle.getBukkitEntity());
             return;
         }
-
         if (handle instanceof Mob) {
             ((Mob) handle).doHurtTarget(target);
             return;
         }
-
         float f = (float) (handle.getAttributes().hasAttribute(Attributes.ATTACK_DAMAGE)
                 ? handle.getAttributeValue(Attributes.ATTACK_DAMAGE)
                 : 1f);
@@ -419,12 +411,10 @@ public class NMSImpl implements NMSBridge {
                     Math.cos(handle.getYRot() * Math.PI / 180.0F) * i * 0.5F);
             handle.setDeltaMovement(handle.getDeltaMovement().multiply(0.6, 1, 0.6));
         }
-
         int fireAspectLevel = EnchantmentHelper.getFireAspect(handle);
         if (fireAspectLevel > 0) {
             target.setOnFire(fireAspectLevel * 4, false);
         }
-
         if (target instanceof ServerPlayer) {
             ServerPlayer entityhuman = (ServerPlayer) target;
             ItemStack itemstack = handle.getMainHandItem();
@@ -436,11 +426,8 @@ public class NMSImpl implements NMSBridge {
                     entityhuman.getCooldowns().addCooldown(Items.SHIELD, 100);
                     handle.level.broadcastEntityEvent(entityhuman, (byte) 30);
                 }
-
             }
-
         }
-
         EnchantmentHelper.doPostHurtEffects(handle, target);
         EnchantmentHelper.doPostDamageEffects(target, handle);
     }
@@ -457,9 +444,7 @@ public class NMSImpl implements NMSBridge {
             } catch (Throwable t) {
                 t.printStackTrace();
             }
-
         }
-
     }
 
     @Override
@@ -490,21 +475,16 @@ public class NMSImpl implements NMSBridge {
                         if (!changed && !ItemStack.matches(old, curr)) {
                             changed = true;
                         }
-
                         equipment.put(slot, curr);
                     }
-
                     if (changed) {
                         List<com.mojang.datafixers.util.Pair<EquipmentSlot, ItemStack>> vals = Lists.newArrayList();
                         for (EquipmentSlot slot : EquipmentSlot.values()) {
                             vals.add(com.mojang.datafixers.util.Pair.of(slot, equipment.get(slot)));
                         }
-
                         agg.send(new ClientboundSetEquipmentPacket(handle.getId(), vals));
                     }
-
                 }
-
                 tracker.sendChanges();
             }
 
@@ -525,9 +505,7 @@ public class NMSImpl implements NMSBridge {
                     if (callback != null) {
                         callback.accept(entity);
                     }
-
                 }
-
                 linked.clear();
             }
         };
@@ -576,13 +554,10 @@ public class NMSImpl implements NMSBridge {
                 if (df != null) {
                     bserver = df.dragonEvent;
                 }
-
             }
-
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         if (bserver == null)
             return null;
         BossBar ret = Bukkit.createBossBar("", BarColor.BLUE, BarStyle.SEGMENTED_10);
@@ -591,7 +566,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         return ret;
     }
 
@@ -702,13 +676,11 @@ public class NMSImpl implements NMSBridge {
             if (SKULL_PROFILE_FIELD == null)
                 return null;
         }
-
         try {
             return (GameProfile) SKULL_PROFILE_FIELD.get(meta);
         } catch (Exception e) {
             return null;
         }
-
     }
 
     @Override
@@ -721,7 +693,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             throw new CommandException(Messages.INVALID_SOUND);
         }
-
     }
 
     @Override
@@ -737,7 +708,6 @@ public class NMSImpl implements NMSBridge {
         LivingEntity handle = NMSImpl.getHandle((org.bukkit.entity.LivingEntity) npc.getEntity());
         if (handle == null) {
         }
-
         return DEFAULT_SPEED;
         // return (float) handle.getAttribute(Attributes.d).getValue();
     }
@@ -780,9 +750,7 @@ public class NMSImpl implements NMSBridge {
             } else {
                 ((Mob) raw).setPathfindingMalus(BlockPathTypes.WATER, oldWater + 1F);
             }
-
         }
-
         navigation.getNodeEvaluator().setCanOpenDoors(params.hasExaminer(DoorExaminer.class));
         return new MCNavigator() {
             float lastSpeed;
@@ -794,7 +762,6 @@ public class NMSImpl implements NMSBridge {
                     Node pp = path.getNode(i);
                     blocks.add(entity.getWorld().getBlockAt(pp.x, pp.y, pp.z));
                 }
-
                 return blocks;
             }
 
@@ -815,16 +782,13 @@ public class NMSImpl implements NMSBridge {
                     List<org.bukkit.block.Block> blocks = getBlocks(entity, path);
                     Util.sendBlockChanges(blocks, null);
                 }
-
                 if (oldWater >= 0) {
                     if (raw instanceof MobAI) {
                         ((MobAI) raw).setPathfindingMalus(BlockPathTypes.WATER, oldWater);
                     } else {
                         ((Mob) raw).setPathfindingMalus(BlockPathTypes.WATER, oldWater);
                     }
-
                 }
-
                 navigation.stop();
             }
 
@@ -839,15 +803,12 @@ public class NMSImpl implements NMSBridge {
                             SIZE_FIELD_SETTER.invoke(handle,
                                     new EntityDimensions(Math.min(0.99F, size.width), size.height, false));
                         }
-
                     } catch (Throwable e) {
                         e.printStackTrace();
                     }
-
                     if (!function.apply(navigation)) {
                         reason = CancelReason.STUCK;
                     }
-
                     try {
                         SIZE_FIELD_SETTER.invoke(handle, size);
                     } catch (Throwable e) {
@@ -855,15 +816,12 @@ public class NMSImpl implements NMSBridge {
                         // minecraft requires that an entity fit onto both blocks if width >= 1f, but we'd prefer to
                         // make it just fit on 1 so hack around it a bit.
                     }
-
                     lastSpeed = params.speed();
                 }
-
                 Path path = getPathEntity(navigation);
                 if (params.debug() && !path.isDone()) {
                     Util.sendBlockChanges(getBlocks(entity, path), Material.DANDELION);
                 }
-
                 navigation.setSpeedModifier(params.speed());
                 return navigation.isDone();
             }
@@ -1089,37 +1047,30 @@ public class NMSImpl implements NMSBridge {
             if (zDiff < 0.0) {
                 yaw += Math.abs(180 - yaw) * 2;
             }
-
             if (handle.getBukkitEntity().getType() == EntityType.ENDER_DRAGON) {
                 yaw = Util.getDragonYaw(handle.getBukkitEntity(), xDiff, zDiff);
             } else {
                 yaw = yaw - 90;
             }
-
             if (headOnly) {
                 setHeadYaw(entity, (float) yaw);
             } else {
                 look(entity, (float) yaw, (float) pitch);
             }
-
             return;
         }
-
         if (handle instanceof Mob) {
             ((Mob) handle).getLookControl().setLookAt(to.getX(), to.getY(), to.getZ(), ((Mob) handle).getHeadRotSpeed(),
                     ((Mob) handle).getMaxHeadXRot());
             while (((LivingEntity) handle).yHeadRot >= 180F) {
                 ((LivingEntity) handle).yHeadRot -= 360F;
             }
-
             while (((LivingEntity) handle).yHeadRot < -180F) {
                 ((LivingEntity) handle).yHeadRot += 360F;
             }
-
         } else if (handle instanceof NPCHolder) {
             ((NPCHolder) handle).getNPC().getOrAddTrait(RotationTrait.class).getPhysicalSession().rotateToFace(to);
         }
-
     }
 
     @Override
@@ -1132,22 +1083,18 @@ public class NMSImpl implements NMSBridge {
             } else {
                 look(from, to.getLocation(), false, true);
             }
-
         } else if (handle instanceof Mob) {
             ((Mob) handle).getLookControl().setLookAt(target, ((Mob) handle).getHeadRotSpeed(),
                     ((Mob) handle).getMaxHeadXRot());
             while (((LivingEntity) handle).yHeadRot >= 180F) {
                 ((LivingEntity) handle).yHeadRot -= 360F;
             }
-
             while (((LivingEntity) handle).yHeadRot < -180F) {
                 ((LivingEntity) handle).yHeadRot += 360F;
             }
-
         } else if (handle instanceof NPCHolder) {
             ((NPCHolder) handle).getNPC().getOrAddTrait(RotationTrait.class).getPhysicalSession().rotateToFace(to);
         }
-
     }
 
     @Override
@@ -1182,7 +1129,6 @@ public class NMSImpl implements NMSBridge {
                                     this, anvil),
                             this);
                 }
-
                 return this.bukkitEntity;
             }
         };
@@ -1229,13 +1175,11 @@ public class NMSImpl implements NMSBridge {
             if (key == null || type == null) {
                 continue;
             }
-
             CITIZENS_ENTITY_TYPES.put(clazz, type);
             int code = ENTITY_REGISTRY.getId(type);
             ENTITY_REGISTRY.put(code, key, type);
             return;
         }
-
         throw new IllegalArgumentException("unable to find valid entity superclass for class " + clazz.toString());
     }
 
@@ -1273,7 +1217,6 @@ public class NMSImpl implements NMSBridge {
             hook.hookedIn = null;
             hook.getBukkitEntity().remove();
         }
-
     }
 
     @Override
@@ -1288,7 +1231,6 @@ public class NMSImpl implements NMSBridge {
         if (getHandle(entity) instanceof EntityHumanNPC) {
             ((EntityHumanNPC) getHandle(entity)).setTracked(replace);
         }
-
     }
 
     @Override
@@ -1298,11 +1240,9 @@ public class NMSImpl implements NMSBridge {
         if (bodyYaw == null) {
             bodyYaw = handle.getYRot();
         }
-
         if (pitch == null) {
             pitch = handle.getXRot();
         }
-
         List<Packet<?>> toSend = Lists.newArrayList();
         if (position) {
             TrackedEntity entry = ((ServerLevel) handle.level).getChunkProvider().chunkMap.G.get(handle.getId());
@@ -1313,7 +1253,6 @@ public class NMSImpl implements NMSBridge {
                 e.printStackTrace();
                 return;
             }
-
             Vec3 pos = handle.position().subtract(se.sentPos());
             toSend.add(
                     new ClientboundMoveEntityPacket.PosRot(handle.getId(), (short) pos.x, (short) pos.y, (short) pos.z,
@@ -1322,11 +1261,9 @@ public class NMSImpl implements NMSBridge {
             toSend.add(new ClientboundMoveEntityPacket.Rot(handle.getId(), (byte) (bodyYaw * 256.0F / 360.0F),
                     (byte) (pitch * 256.0F / 360.0F), handle.isOnGround()));
         }
-
         if (headYaw != null) {
             toSend.add(new ClientboundRotateHeadPacket(handle, (byte) (headYaw * 256.0F / 360.0F)));
         }
-
         sendPacketsNearby(null, from.getLocation(), toSend, 64);
     }
 
@@ -1350,7 +1287,6 @@ public class NMSImpl implements NMSBridge {
             entities[i] = (ServerPlayer) skinnable;
             i++;
         }
-
         NMSImpl.sendPacket(recipient,
                 new ClientboundPlayerInfoPacket(ClientboundPlayerInfoPacket.Action.REMOVE_PLAYER, entities));
     }
@@ -1371,7 +1307,6 @@ public class NMSImpl implements NMSBridge {
         if (TEAM_FIELD == null) {
             TEAM_FIELD = NMS.getGetter(team.getClass(), "team");
         }
-
         try {
             PlayerTeam nmsTeam = (PlayerTeam) TEAM_FIELD.invoke(team);
             if (mode == 1) {
@@ -1380,11 +1315,9 @@ public class NMSImpl implements NMSBridge {
                 sendPacket(recipient,
                         ClientboundSetPlayerTeamPacket.createAddOrModifyPacket(nmsTeam, mode == 0 ? true : false));
             }
-
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     @Override
@@ -1420,7 +1353,6 @@ public class NMSImpl implements NMSBridge {
         } else if (handle instanceof MobAI) {
             ((MobAI) handle).getMoveControl().setWantedPosition(x, y, z, speed);
         }
-
     }
 
     @Override
@@ -1445,7 +1377,6 @@ public class NMSImpl implements NMSBridge {
         if (!(handle instanceof net.minecraft.world.entity.player.Player)) {
             handle.setYBodyRot(yaw);
         }
-
         handle.setYHeadRot(yaw);
     }
 
@@ -1491,11 +1422,9 @@ public class NMSImpl implements NMSBridge {
                 FLYING_MOVECONTROL_FLOAT_SETTER.invoke(mob.getMoveControl(), npc.data().get("flying-nogravity-float"));
                 npc.data().remove("flying-nogravity-float");
             }
-
         } catch (Throwable t) {
             t.printStackTrace();
         }
-
     }
 
     @Override
@@ -1532,13 +1461,11 @@ public class NMSImpl implements NMSBridge {
             if (SET_PROFILE_METHOD == null)
                 return;
         }
-
         try {
             SET_PROFILE_METHOD.invoke(meta, profile);
         } catch (Throwable t) {
             t.printStackTrace();
         }
-
     }
 
     @Override
@@ -1550,7 +1477,6 @@ public class NMSImpl implements NMSBridge {
         if (ai != null) {
             ai.getJumpControl().jump();
         }
-
     }
 
     @Override
@@ -1568,7 +1494,6 @@ public class NMSImpl implements NMSBridge {
         if (entity instanceof Player) {
             ((Player) entity).setSneaking(sneaking);
         }
-
         Pose pose = sneaking ? Pose.CROUCHING : Pose.STANDING;
         getHandle(entity).setPose(pose);
     }
@@ -1601,7 +1526,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         return false;
     }
 
@@ -1613,7 +1537,6 @@ public class NMSImpl implements NMSBridge {
             ENTITY_REGISTRY_SETTER.invoke(null, ENTITY_REGISTRY.get());
         } catch (Throwable e) {
         }
-
     }
 
     @Override
@@ -1635,7 +1558,6 @@ public class NMSImpl implements NMSBridge {
             handle.setDeltaMovement(handle.getDeltaMovement().x, handle.getDeltaMovement().y + power,
                     handle.getDeltaMovement().z);
         }
-
     }
 
     @Override
@@ -1727,7 +1649,6 @@ public class NMSImpl implements NMSBridge {
                 menuType = MenuType.CRAFTING;
                 break;
         }
-
         handle.connection.send(new ClientboundOpenScreenPacket(handle.containerMenu.containerId, menuType,
                 new TextComponent(newTitle)));
         player.updateInventory();
@@ -1749,7 +1670,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     @Override
@@ -1762,7 +1682,6 @@ public class NMSImpl implements NMSBridge {
             ((MobAI) en).updatePathfindingRange(pathfindingRange);
             return;
         }
-
         if (NAVIGATION_PATHFINDER == null)
             return;
         PathNavigation navigation = ((Mob) en).getNavigation();
@@ -1774,7 +1693,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     private static class CitizensInventoryAnvil extends CraftInventoryAnvil implements ForwardingInventory {
@@ -1885,7 +1803,6 @@ public class NMSImpl implements NMSBridge {
             e.printStackTrace();
             return;
         }
-
         float oldw = size.width;
         float oldl = size.height;
         cb.accept(datawatcherobject);
@@ -1893,7 +1810,6 @@ public class NMSImpl implements NMSBridge {
             living.setPos(living.getX() - 0.01, living.getY(), living.getZ() - 0.01);
             living.setPos(living.getX() + 0.01, living.getY(), living.getZ() + 0.01);
         }
-
     }
 
     public static void clearGoals(NPC npc, GoalSelector... goalSelectors) {
@@ -1906,17 +1822,14 @@ public class NMSImpl implements NMSBridge {
                 if (!list.isEmpty()) {
                     npc.data().set("selector" + i, Lists.newArrayList(list));
                 }
-
                 list.clear();
             } catch (Exception e) {
                 Messaging.logTr(Messages.ERROR_CLEARING_GOALS, e.getLocalizedMessage());
             } catch (Throwable e) {
                 Messaging.logTr(Messages.ERROR_CLEARING_GOALS, e.getLocalizedMessage());
             }
-
             i++;
         }
-
     }
 
     private static CompoundTag convertNBT(net.minecraft.nbt.CompoundTag tag) {
@@ -1926,7 +1839,6 @@ public class NMSImpl implements NMSBridge {
         for (String key : tag.getAllKeys()) {
             tags.put(key, convertNBT(key, tag.get(key)));
         }
-
         return new CompoundTag("", tags);
     }
 
@@ -1957,10 +1869,8 @@ public class NMSImpl implements NMSBridge {
                 for (int i = 0; i < list.size(); i++) {
                     converted.add(convertNBT("", list.get(i)));
                 }
-
                 return new ListTag(key, tagType, converted);
             }
-
         } else if (base instanceof net.minecraft.nbt.CompoundTag)
             return convertNBT((net.minecraft.nbt.CompoundTag) base);
         else if (base instanceof net.minecraft.nbt.EndTag)
@@ -1976,7 +1886,6 @@ public class NMSImpl implements NMSBridge {
                 d0 = 0.01D;
                 entity.fallDistance = 0.0F;
             }
-
             FluidState fluid = entity.level.getFluidState(entity.blockPosition());
             if (entity.isInWater() && !entity.canStandOnFluid(fluid.getType())) {
                 double d1 = entity.getY();
@@ -1986,27 +1895,22 @@ public class NMSImpl implements NMSBridge {
                 if (f2 > 3.0F) {
                     f2 = 3.0F;
                 }
-
                 if (!entity.isOnGround()) {
                     f2 *= 0.5F;
                 }
-
                 if (f2 > 0.0F) {
                     f += (0.54600006F - f) * f2 / 3.0F;
                     f1 += (entity.getSpeed() - f1) * f2 / 3.0F;
                 }
-
                 if (entity.hasEffect(MobEffects.DOLPHINS_GRACE)) {
                     f = 0.96F;
                 }
-
                 entity.moveRelative(f1, vec3d);
                 entity.move(MoverType.SELF, entity.getDeltaMovement());
                 Vec3 vec3d1 = entity.getDeltaMovement();
                 if (entity.horizontalCollision && entity.onClimbable()) {
                     vec3d1 = new Vec3(vec3d1.x, 0.2D, vec3d1.z);
                 }
-
                 entity.setDeltaMovement(vec3d1.multiply(f, 0.800000011920929D, f));
                 Vec3 vec3d2 = entity.getFluidFallingAdjustedMovement(d0, flag, entity.getDeltaMovement());
                 entity.setDeltaMovement(vec3d2);
@@ -2014,7 +1918,6 @@ public class NMSImpl implements NMSBridge {
                         && entity.isFree(vec3d2.x, vec3d2.y + 0.6000000238418579D - entity.getY() + d1, vec3d2.z)) {
                     entity.setDeltaMovement(vec3d2.x, 0.30000001192092896D, vec3d2.z);
                 }
-
             } else if (entity.isInLava() && !entity.canStandOnFluid(fluid.getType())) {
                 double d1 = entity.getY();
                 entity.moveRelative(0.02F, vec3d);
@@ -2026,23 +1929,19 @@ public class NMSImpl implements NMSBridge {
                 } else {
                     entity.setDeltaMovement(entity.getDeltaMovement().scale(0.5D));
                 }
-
                 if (!entity.isNoGravity()) {
                     entity.setDeltaMovement(entity.getDeltaMovement().add(0.0D, -d0 / 4.0D, 0.0D));
                 }
-
                 Vec3 vec3d3 = entity.getDeltaMovement();
                 if (entity.horizontalCollision
                         && entity.isFree(vec3d3.x, vec3d3.y + 0.6000000238418579D - entity.getY() + d1, vec3d3.z)) {
                     entity.setDeltaMovement(vec3d3.x, 0.30000001192092896D, vec3d3.z);
                 }
-
             } else if (entity.isFallFlying()) {
                 Vec3 vec3d4 = entity.getDeltaMovement();
                 if (vec3d4.y > -0.5D) {
                     entity.fallDistance = 1.0F;
                 }
-
                 Vec3 vec3d5 = entity.getLookAngle();
                 float f = entity.getXRot() * 0.017453292F;
                 double d2 = Math.sqrt(vec3d5.x * vec3d5.x + vec3d5.z * vec3d5.z);
@@ -2055,17 +1954,14 @@ public class NMSImpl implements NMSBridge {
                     double d5 = vec3d4.y * -0.1D * f3;
                     vec3d4 = vec3d4.add(vec3d5.x * d5 / d2, d5, vec3d5.z * d5 / d2);
                 }
-
                 if (f < 0.0F && d2 > 0.0D) {
                     double d5 = d3 * -Mth.sin(f) * 0.04D;
                     vec3d4 = vec3d4.add(-vec3d5.x * d5 / d2, d5 * 3.2D, -vec3d5.z * d5 / d2);
                 }
-
                 if (d2 > 0.0D) {
                     vec3d4 = vec3d4.add((vec3d5.x / d2 * d3 - vec3d4.x) * 0.1D, 0.0D,
                             (vec3d5.z / d2 * d3 - vec3d4.z) * 0.1D);
                 }
-
                 entity.setDeltaMovement(vec3d4.multiply(0.9900000095367432D, 0.9800000190734863D, 0.9900000095367432D));
                 entity.move(MoverType.SELF, entity.getDeltaMovement());
                 if (entity.horizontalCollision && !entity.level.isClientSide) {
@@ -2078,17 +1974,13 @@ public class NMSImpl implements NMSBridge {
                         } catch (Throwable e) {
                             e.printStackTrace();
                         }
-
                         entity.hurt(DamageSource.FLY_INTO_WALL, f4);
                     }
-
                 }
-
                 if (entity.isOnGround() && !entity.level.isClientSide && entity.getSharedFlag(7)
                         && !CraftEventFactory.callToggleGlideEvent(entity, false).isCancelled()) {
                     entity.setSharedFlag(7, false);
                 }
-
             } else {
                 BlockPos blockposition = new BlockPos(entity.getX(), entity.getBoundingBox().minY - 0.5000001D,
                         entity.getZ());
@@ -2105,21 +1997,16 @@ public class NMSImpl implements NMSBridge {
                     } else {
                         d7 = 0.0D;
                     }
-
                 } else if (!entity.isNoGravity()) {
                     d7 -= d0;
                 }
-
                 if (entity.shouldDiscardFriction()) {
                     entity.setDeltaMovement(vec3d6.x, d7, vec3d6.z);
                 } else {
                     entity.setDeltaMovement(vec3d6.x * f, d7 * 0.9800000190734863D, vec3d6.z * f);
                 }
-
             }
-
         }
-
         entity.calculateEntityAnimation(entity, entity instanceof net.minecraft.world.entity.animal.FlyingAnimal);
     }
 
@@ -2129,7 +2016,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         return null;
     }
 
@@ -2165,7 +2051,6 @@ public class NMSImpl implements NMSBridge {
             e.printStackTrace();
             return null;
         }
-
     }
 
     public static EntityDataAccessor<Integer> getRabbitTypeField() {
@@ -2178,7 +2063,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         return null;
     }
 
@@ -2212,7 +2096,6 @@ public class NMSImpl implements NMSBridge {
         if (mat != null) {
             minecart.setDisplayBlockState(Registry.BLOCK.byId(mat.getId()).defaultBlockState());
         }
-
         minecart.setDisplayOffset(offset);
     }
 
@@ -2226,7 +2109,6 @@ public class NMSImpl implements NMSBridge {
             handle.setDeltaMovement(handle.getDeltaMovement().scale(0.9));
             return true;
         }
-
         return false;
     }
 
@@ -2237,7 +2119,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     public static void restoreGoals(NPC npc, GoalSelector... goalSelectors) {
@@ -2252,16 +2133,13 @@ public class NMSImpl implements NMSBridge {
                 if (old != null) {
                     list.addAll(old);
                 }
-
             } catch (Exception e) {
                 Messaging.logTr(Messages.ERROR_RESTORING_GOALS, e.getLocalizedMessage());
             } catch (Throwable e) {
                 Messaging.logTr(Messages.ERROR_RESTORING_GOALS, e.getLocalizedMessage());
             }
-
             i++;
         }
-
     }
 
     public static void sendPacket(Player player, Packet<?> packet) {
@@ -2288,13 +2166,10 @@ public class NMSImpl implements NMSBridge {
                     || location.distanceSquared(player.getLocation(PACKET_CACHE_LOCATION)) > radius) {
                 continue;
             }
-
             for (Packet<?> packet : packets) {
                 NMSImpl.sendPacket(player, packet);
             }
-
         }
-
     }
 
     public static void sendPacketsNearby(Player from, Location location, Packet<?>... packets) {
@@ -2307,7 +2182,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     public static void setAttribute(LivingEntity entity, Attribute attribute, double value) {
@@ -2325,10 +2199,8 @@ public class NMSImpl implements NMSBridge {
             } catch (Throwable e) {
                 e.printStackTrace();
             }
-
             attr = entity.getAttribute(attribute);
         }
-
         attr.setBaseValue(value);
     }
 
@@ -2338,7 +2210,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     public static void setLife(FishingHook entity, int life) {
@@ -2347,7 +2218,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     public static void setLookControl(Mob mob, LookControl control) {
@@ -2356,7 +2226,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     public static void setNotInSchool(AbstractFish entity) {
@@ -2364,11 +2233,9 @@ public class NMSImpl implements NMSBridge {
             if (ENTITY_FISH_NUM_IN_SCHOOL != null) {
                 ENTITY_FISH_NUM_IN_SCHOOL.invoke(entity, 2);
             }
-
         } catch (Throwable ex) {
             ex.printStackTrace();
         }
-
     }
 
     public static void setSize(Entity entity, boolean justCreated) {
@@ -2391,13 +2258,10 @@ public class NMSImpl implements NMSBridge {
                     float f = entitysize.width - entitysize1.width;
                     entity.move(MoverType.SELF, new Vec3(f, 0.0D, f));
                 }
-
             }
-
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     public static void setSize(Entity entity, EntityDimensions size) {
@@ -2408,7 +2272,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     public static void updateAI(LivingEntity entity) {
@@ -2422,7 +2285,6 @@ public class NMSImpl implements NMSBridge {
         } else if (entity instanceof MobAI) {
             ((MobAI) entity).tickAI();
         }
-
     }
 
     public static void updateMinecraftAIState(NPC npc, Mob entity) {
@@ -2435,7 +2297,6 @@ public class NMSImpl implements NMSBridge {
                 getBehaviorMap(entity).putAll(behavior);
                 npc.data().remove("behavior-map");
             }
-
         } else {
             NMSImpl.clearGoals(npc, entity.goalSelector, entity.targetSelector);
             TreeMap behaviorMap = getBehaviorMap(entity);
@@ -2443,9 +2304,7 @@ public class NMSImpl implements NMSBridge {
                 npc.data().set("behavior-map", new TreeMap(behaviorMap));
                 behaviorMap.clear();
             }
-
         }
-
     }
 
     private static final MethodHandle ADVANCEMENTS_PLAYER_FIELD = NMS.getFinalSetter(ServerPlayer.class, "cr");
@@ -2515,7 +2374,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             Messaging.logTr(Messages.ERROR_GETTING_ID_MAPPING, e.getMessage());
         }
-
         try {
             ENDERMAN_CREEPY = (EntityDataAccessor<Boolean>) NMS.getField(EnderMan.class, "bV").get(null);
         } catch (IllegalArgumentException e) {
@@ -2523,13 +2381,11 @@ public class NMSImpl implements NMSBridge {
         } catch (IllegalAccessException e) {
             e.printStackTrace();
         }
-
         try {
             RABBIT_TYPE_DATAWATCHER = (EntityDataAccessor<Integer>) NMS
                     .getFirstStaticGetter(Rabbit.class, EntityDataAccessor.class).invoke();
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/PitchableLookControl.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/PitchableLookControl.java
index 1484b26aa..d555ca85a 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/PitchableLookControl.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/PitchableLookControl.java
@@ -18,7 +18,6 @@ public class PitchableLookControl extends LookControl {
         } else {
             resetOnTick = () -> true;
         }
-
     }
 
     @Override
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/PlayerAnimationImpl.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/PlayerAnimationImpl.java
index e9ebe1761..6cbdd5bcb 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/PlayerAnimationImpl.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/PlayerAnimationImpl.java
@@ -23,7 +23,6 @@ public class PlayerAnimationImpl {
             playDefaultAnimation(player, to, DEFAULTS.get(animation));
             return;
         }
-
         switch (animation) {
             case SNEAK:
                 player.setPose(Pose.CROUCHING);
@@ -58,7 +57,6 @@ public class PlayerAnimationImpl {
             default:
                 throw new UnsupportedOperationException();
         }
-
     }
 
     protected static void playDefaultAnimation(ServerPlayer player, Iterable<Player> to, int code) {
@@ -70,7 +68,6 @@ public class PlayerAnimationImpl {
         for (Player player : to) {
             NMSImpl.sendPacket(player, packet);
         }
-
     }
 
     private static EnumMap<PlayerAnimation, Integer> DEFAULTS = Maps.newEnumMap(PlayerAnimation.class);
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/PlayerlistTracker.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/PlayerlistTracker.java
index a487672f7..272862122 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/PlayerlistTracker.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/PlayerlistTracker.java
@@ -36,7 +36,6 @@ public class PlayerlistTracker extends ChunkMap.TrackedEntity {
                     new NPCLinkToPlayerEvent(((NPCHolder) tracker).getNPC(), lastUpdatedPlayer.getBukkitEntity()));
             lastUpdatedPlayer = null;
         }
-
     }
 
     @Override
@@ -49,7 +48,6 @@ public class PlayerlistTracker extends ChunkMap.TrackedEntity {
             if (REQUIRES_SYNC == null) {
                 REQUIRES_SYNC = !Bukkit.isPrimaryThread();
             }
-
             boolean cancelled = Util.callPossiblySync(() -> {
                 NPCSeenByPlayerEvent event = new NPCSeenByPlayerEvent(npc, entityplayer.getBukkitEntity());
                 try {
@@ -58,7 +56,6 @@ public class PlayerlistTracker extends ChunkMap.TrackedEntity {
                     REQUIRES_SYNC = true;
                     throw e;
                 }
-
                 if (event.isCancelled())
                     return true;
                 Integer trackingRange = npc.data().<Integer> get(NPC.Metadata.TRACKING_RANGE);
@@ -70,16 +67,13 @@ public class PlayerlistTracker extends ChunkMap.TrackedEntity {
                     } catch (Throwable e) {
                         e.printStackTrace();
                     }
-
                 }
-
                 return false;
             }, REQUIRES_SYNC);
 
             if (cancelled)
                 return;
         }
-
         this.lastUpdatedPlayer = entityplayer;
         super.updatePlayer(entityplayer);
     }
@@ -90,7 +84,6 @@ public class PlayerlistTracker extends ChunkMap.TrackedEntity {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         return 0;
     }
 
@@ -100,7 +93,6 @@ public class PlayerlistTracker extends ChunkMap.TrackedEntity {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         return false;
     }
 
@@ -110,7 +102,6 @@ public class PlayerlistTracker extends ChunkMap.TrackedEntity {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         return null;
     }
 
@@ -120,7 +111,6 @@ public class PlayerlistTracker extends ChunkMap.TrackedEntity {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         return 0;
     }
 
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ArmorStandController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ArmorStandController.java
index 6bc77319f..1578fb479 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ArmorStandController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ArmorStandController.java
@@ -61,7 +61,6 @@ public class ArmorStandController extends MobEntityController {
             if (npc != null) {
                 ai = new BasicMobAI(this);
             }
-
         }
 
         @Override
@@ -74,7 +73,6 @@ public class ArmorStandController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ArmorStandNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -110,7 +108,6 @@ public class ArmorStandController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -121,7 +118,6 @@ public class ArmorStandController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -143,7 +139,6 @@ public class ArmorStandController extends MobEntityController {
                 npc.update();
                 ai.tickAI();
             }
-
         }
 
         @Override
@@ -155,7 +150,6 @@ public class ArmorStandController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/AxolotlController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/AxolotlController.java
index ff6e74414..e2b232635 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/AxolotlController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/AxolotlController.java
@@ -76,7 +76,6 @@ public class AxolotlController extends MobEntityController {
                 this.getAttribute(Attributes.MOVEMENT_SPEED)
                         .setBaseValue(this.getAttribute(Attributes.MOVEMENT_SPEED).getBaseValue() / 10);
             }
-
         }
 
         @Override
@@ -98,7 +97,6 @@ public class AxolotlController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -106,7 +104,6 @@ public class AxolotlController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -119,7 +116,6 @@ public class AxolotlController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new AxolotlNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -206,7 +202,6 @@ public class AxolotlController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -217,7 +212,6 @@ public class AxolotlController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -240,14 +234,11 @@ public class AxolotlController extends MobEntityController {
                 if (npc.useMinecraftAI() && this.moveControl != this.oldMoveController) {
                     this.moveControl = this.oldMoveController;
                 }
-
                 if (!npc.useMinecraftAI() && this.moveControl == this.oldMoveController) {
                     this.moveControl = new MoveControl(this);
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
@@ -256,11 +247,9 @@ public class AxolotlController extends MobEntityController {
                 if (!NMSImpl.moveFish(npc, this, vec3d)) {
                     super.travel(vec3d);
                 }
-
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -272,7 +261,6 @@ public class AxolotlController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/BatController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/BatController.java
index 98fd7936f..d0b4987ab 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/BatController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/BatController.java
@@ -60,7 +60,6 @@ public class BatController extends MobEntityController {
             if (npc != null) {
                 setResting(false);
             }
-
         }
 
         @Override
@@ -75,7 +74,6 @@ public class BatController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -87,10 +85,8 @@ public class BatController extends MobEntityController {
                 if (npc.useMinecraftAI()) {
                     super.customServerAiStep();
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
@@ -103,7 +99,6 @@ public class BatController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new BatNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -165,7 +160,6 @@ public class BatController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -176,7 +170,6 @@ public class BatController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -200,7 +193,6 @@ public class BatController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/BeeController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/BeeController.java
index f796f09d4..32f510f4a 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/BeeController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/BeeController.java
@@ -71,7 +71,6 @@ public class BeeController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -83,10 +82,8 @@ public class BeeController extends MobEntityController {
                 if (npc.useMinecraftAI()) {
                     super.customServerAiStep();
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
@@ -99,7 +96,6 @@ public class BeeController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new BeeNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -161,7 +157,6 @@ public class BeeController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -172,7 +167,6 @@ public class BeeController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -196,7 +190,6 @@ public class BeeController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/BlazeController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/BlazeController.java
index 2de451b00..559883c52 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/BlazeController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/BlazeController.java
@@ -71,7 +71,6 @@ public class BlazeController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -80,7 +79,6 @@ public class BlazeController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -93,7 +91,6 @@ public class BlazeController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new BlazeNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -155,7 +152,6 @@ public class BlazeController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -166,7 +162,6 @@ public class BlazeController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -190,7 +185,6 @@ public class BlazeController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CatController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CatController.java
index f66a8f3bd..9f01a88fe 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CatController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CatController.java
@@ -80,7 +80,6 @@ public class CatController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -88,7 +87,6 @@ public class CatController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -98,7 +96,6 @@ public class CatController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -111,7 +108,6 @@ public class CatController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new CatNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -181,7 +177,6 @@ public class CatController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -191,7 +186,6 @@ public class CatController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -202,7 +196,6 @@ public class CatController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -224,7 +217,6 @@ public class CatController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -236,7 +228,6 @@ public class CatController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CaveSpiderController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CaveSpiderController.java
index c8636c666..aff68f9dc 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CaveSpiderController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CaveSpiderController.java
@@ -79,7 +79,6 @@ public class CaveSpiderController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -87,7 +86,6 @@ public class CaveSpiderController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -97,7 +95,6 @@ public class CaveSpiderController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -110,7 +107,6 @@ public class CaveSpiderController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new CaveSpiderNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -180,7 +176,6 @@ public class CaveSpiderController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -191,7 +186,6 @@ public class CaveSpiderController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -201,7 +195,6 @@ public class CaveSpiderController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -223,7 +216,6 @@ public class CaveSpiderController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -235,7 +227,6 @@ public class CaveSpiderController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ChickenController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ChickenController.java
index 707e475d7..4b8ef5288 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ChickenController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ChickenController.java
@@ -66,7 +66,6 @@ public class ChickenController extends MobEntityController {
             if (npc != null) {
                 this.eggTime = 100;
             }
-
             super.aiStep();
         }
 
@@ -89,7 +88,6 @@ public class ChickenController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -97,7 +95,6 @@ public class ChickenController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -107,7 +104,6 @@ public class ChickenController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -120,7 +116,6 @@ public class ChickenController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ChickenNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -190,7 +185,6 @@ public class ChickenController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -200,7 +194,6 @@ public class ChickenController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -211,7 +204,6 @@ public class ChickenController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -233,7 +225,6 @@ public class ChickenController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -245,7 +236,6 @@ public class ChickenController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CodController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CodController.java
index 95188c8c6..0815915b4 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CodController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CodController.java
@@ -71,7 +71,6 @@ public class CodController extends MobEntityController {
                 this.oldMoveController = this.moveControl;
                 this.moveControl = new MoveControl(this);
             }
-
         }
 
         @Override
@@ -80,12 +79,10 @@ public class CodController extends MobEntityController {
             if (npc != null) {
                 this.verticalCollision = false;
             }
-
             super.aiStep();
             if (npc != null) {
                 this.verticalCollision = lastInWater;
             }
-
         }
 
         @Override
@@ -107,7 +104,6 @@ public class CodController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -115,7 +111,6 @@ public class CodController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -124,23 +119,18 @@ public class CodController extends MobEntityController {
                 if (!npc.useMinecraftAI()) {
                     NMSImpl.setNotInSchool(this);
                 }
-
                 NMSImpl.updateMinecraftAIState(npc, this);
                 if (npc.useMinecraftAI() && this.moveControl != this.oldMoveController) {
                     this.moveControl = this.oldMoveController;
                 }
-
                 if (!npc.useMinecraftAI() && this.moveControl == this.oldMoveController) {
                     this.moveControl = new EntityMoveControl(this);
                 }
-
             }
-
             super.customServerAiStep();
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -153,7 +143,6 @@ public class CodController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new CodNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -233,7 +222,6 @@ public class CodController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -244,7 +232,6 @@ public class CodController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -265,11 +252,9 @@ public class CodController extends MobEntityController {
                 if (!NMSImpl.moveFish(npc, this, vec3d)) {
                     super.travel(vec3d);
                 }
-
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -281,7 +266,6 @@ public class CodController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CowController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CowController.java
index b3364349e..942c7d4f5 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CowController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CowController.java
@@ -85,7 +85,6 @@ public class CowController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -93,7 +92,6 @@ public class CowController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -103,7 +101,6 @@ public class CowController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -116,7 +113,6 @@ public class CowController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new CowNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -196,7 +192,6 @@ public class CowController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -206,7 +201,6 @@ public class CowController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -217,7 +211,6 @@ public class CowController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -239,7 +232,6 @@ public class CowController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -251,7 +243,6 @@ public class CowController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CreeperController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CreeperController.java
index 737883996..9662e9e1f 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CreeperController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/CreeperController.java
@@ -82,7 +82,6 @@ public class CreeperController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -90,7 +89,6 @@ public class CreeperController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -100,7 +98,6 @@ public class CreeperController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -113,7 +110,6 @@ public class CreeperController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new CreeperNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -152,7 +148,6 @@ public class CreeperController extends MobEntityController {
             if (npc == null || !npc.isProtected()) {
                 super.ignite();
             }
-
         }
 
         @Override
@@ -191,7 +186,6 @@ public class CreeperController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -202,7 +196,6 @@ public class CreeperController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -212,7 +205,6 @@ public class CreeperController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -236,7 +228,6 @@ public class CreeperController extends MobEntityController {
             if (npc == null || allowPowered) {
                 super.thunderHit(worldserver, entitylightning);
             }
-
         }
 
         @Override
@@ -246,7 +237,6 @@ public class CreeperController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -258,7 +248,6 @@ public class CreeperController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/DolphinController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/DolphinController.java
index 67d399fe7..33ff19bfa 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/DolphinController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/DolphinController.java
@@ -70,7 +70,6 @@ public class DolphinController extends MobEntityController {
                 this.getAttribute(Attributes.MOVEMENT_SPEED)
                         .setBaseValue(this.getAttribute(Attributes.MOVEMENT_SPEED).getBaseValue() / 10);
             }
-
         }
 
         @Override
@@ -92,7 +91,6 @@ public class DolphinController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -100,7 +98,6 @@ public class DolphinController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -113,7 +110,6 @@ public class DolphinController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new DolphinNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -188,7 +184,6 @@ public class DolphinController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -199,7 +194,6 @@ public class DolphinController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -219,7 +213,6 @@ public class DolphinController extends MobEntityController {
             if (npc != null && npc.isProtected()) {
                 inProtectedTick = true;
             }
-
             super.tick();
             inProtectedTick = false;
             if (npc != null) {
@@ -227,14 +220,11 @@ public class DolphinController extends MobEntityController {
                 if (npc.useMinecraftAI() && this.moveControl != this.oldMoveController) {
                     this.moveControl = this.oldMoveController;
                 }
-
                 if (!npc.useMinecraftAI() && this.moveControl == this.oldMoveController) {
                     this.moveControl = new MoveControl(this);
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
@@ -243,11 +233,9 @@ public class DolphinController extends MobEntityController {
                 if (!NMSImpl.moveFish(npc, this, vec3d)) {
                     super.travel(vec3d);
                 }
-
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -259,7 +247,6 @@ public class DolphinController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/DrownedController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/DrownedController.java
index 44f000645..6d1b0f7ca 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/DrownedController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/DrownedController.java
@@ -79,7 +79,6 @@ public class DrownedController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -87,7 +86,6 @@ public class DrownedController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -97,7 +95,6 @@ public class DrownedController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -110,7 +107,6 @@ public class DrownedController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new DrownedNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -180,7 +176,6 @@ public class DrownedController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -191,7 +186,6 @@ public class DrownedController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -213,7 +207,6 @@ public class DrownedController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -225,7 +218,6 @@ public class DrownedController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EnderDragonController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EnderDragonController.java
index 55b897450..927fef8e5 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EnderDragonController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EnderDragonController.java
@@ -71,25 +71,20 @@ public class EnderDragonController extends MobEntityController {
                 npc.update();
                 NMSImpl.updateMinecraftAIState(npc, this);
             }
-
             if (npc != null && !npc.useMinecraftAI()) {
                 if (isDeadOrDying()) {
                     setHealth(0F);
                     return;
                 }
-
                 if (this.posPointer < 0) {
                     for (int i = 0; i < this.positions.length; ++i) {
                         this.positions[i][0] = this.getYRot();
                         this.positions[i][1] = this.getY();
                     }
-
                 }
-
                 if (++this.posPointer == this.positions.length) {
                     this.posPointer = 0;
                 }
-
                 this.positions[this.posPointer][0] = this.getYRot();
                 this.positions[this.posPointer][1] = this.getY();
 
@@ -104,22 +99,18 @@ public class EnderDragonController extends MobEntityController {
                     subEntities[j].yo = subEntities[j].yOld = vec3.y;
                     subEntities[j].zo = subEntities[j].zOld = vec3.z;
                 }
-
                 if (getFirstPassenger() != null) {
                     setYRot(getFirstPassenger().getBukkitYaw() - 180);
                 }
-
                 Vec3 mot = getDeltaMovement();
                 if (mot.x != 0 || mot.y != 0 || mot.z != 0) {
                     mot = mot.multiply(0.98, 0.98, 0.98);
                     if (getFirstPassenger() == null) {
                         setYRot(Util.getDragonYaw(getBukkitEntity(), mot.x, mot.z));
                     }
-
                     setPos(getX() + mot.x, getY() + mot.y, getZ() + mot.z);
                     setDeltaMovement(mot);
                 }
-
                 if (npc.hasTrait(EnderDragonTrait.class) && npc.getOrAddTrait(EnderDragonTrait.class).isDestroyWalls()
                         && NMSImpl.ENDERDRAGON_CHECK_WALLS != null) {
                     for (int i = 0; i < 3; i++) {
@@ -129,11 +120,8 @@ public class EnderDragonController extends MobEntityController {
                         } catch (Throwable e) {
                             e.printStackTrace();
                         }
-
                     }
-
                 }
-
                 if (npc.data().get(NPC.Metadata.COLLIDABLE, false)) {
                     try {
                         KNOCKBACK.invoke(this,
@@ -151,13 +139,10 @@ public class EnderDragonController extends MobEntityController {
                     } catch (Throwable t) {
                         t.printStackTrace();
                     }
-
                 }
-
             } else {
                 super.aiStep();
             }
-
         }
 
         @Override
@@ -172,7 +157,6 @@ public class EnderDragonController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -185,7 +169,6 @@ public class EnderDragonController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new EnderDragonNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -247,7 +230,6 @@ public class EnderDragonController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -258,7 +240,6 @@ public class EnderDragonController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -271,7 +252,6 @@ public class EnderDragonController extends MobEntityController {
             if (getPhaseManager().getCurrentPhase().getPhase() == EnderDragonPhase.HOVERING) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
 
@@ -296,7 +276,6 @@ public class EnderDragonController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
 
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EndermanController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EndermanController.java
index 4a43f3933..93ab7b7a5 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EndermanController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EndermanController.java
@@ -82,7 +82,6 @@ public class EndermanController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -90,7 +89,6 @@ public class EndermanController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -100,7 +98,6 @@ public class EndermanController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -113,7 +110,6 @@ public class EndermanController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new EndermanNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -183,7 +179,6 @@ public class EndermanController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -194,7 +189,6 @@ public class EndermanController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -212,7 +206,6 @@ public class EndermanController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -234,7 +227,6 @@ public class EndermanController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -246,7 +238,6 @@ public class EndermanController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EndermiteController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EndermiteController.java
index 61bb7253a..97d639777 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EndermiteController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EndermiteController.java
@@ -79,7 +79,6 @@ public class EndermiteController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -87,7 +86,6 @@ public class EndermiteController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -97,7 +95,6 @@ public class EndermiteController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -110,7 +107,6 @@ public class EndermiteController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new EndermiteNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -180,7 +176,6 @@ public class EndermiteController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -191,7 +186,6 @@ public class EndermiteController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -201,7 +195,6 @@ public class EndermiteController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -223,7 +216,6 @@ public class EndermiteController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -235,7 +227,6 @@ public class EndermiteController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EntityHumanNPC.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EntityHumanNPC.java
index edad4ef75..123c474d3 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EntityHumanNPC.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EntityHumanNPC.java
@@ -75,12 +75,10 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
             } catch (Throwable e) {
                 e.printStackTrace();
             }
-
             initialise(minecraftServer);
         } else {
             skinTracker = null;
         }
-
     }
 
     @Override
@@ -102,7 +100,6 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
         if (npc == null || !npc.isFlyable()) {
             super.checkFallDamage(d0, flag, iblockdata, blockposition);
         }
-
     }
 
     @Override
@@ -124,7 +121,6 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
             super.doTick();
             return;
         }
-
         super.baseTick();
         boolean navigating = npc.getNavigator().isNavigating() || ai.getMoveControl().hasWanted();
         if (!navigating && getBukkitEntity() != null
@@ -133,20 +129,16 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
                 && (!npc.isProtected() || SpigotUtil.checkYSafe(getY(), getBukkitEntity().getWorld()))) {
             moveWithFallDamage(Vec3.ZERO);
         }
-
         Vec3 mot = getDeltaMovement();
         if (Math.abs(mot.x) < EPSILON && Math.abs(mot.y) < EPSILON && Math.abs(mot.z) < EPSILON) {
             setDeltaMovement(Vec3.ZERO);
         }
-
         if (navigating) {
             if (!ai.getNavigation().isDone()) {
                 ai.getNavigation().tick();
             }
-
             moveOnCurrentHeading();
         }
-
         ai.getJumpControl().tick();
         ai.getMoveControl().tick();
         detectEquipmentUpdates();
@@ -154,7 +146,6 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
         if (isSpectator()) {
             this.onGround = false;
         }
-
         pushEntities();
 
         if (npc.data().get(NPC.Metadata.PICKUP_ITEMS, false)) {
@@ -164,13 +155,10 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
             } else {
                 axisalignedbb = this.getBoundingBox().inflate(1.0, 0.5, 1.0);
             }
-
             for (Entity entity : this.level.getEntities(this, axisalignedbb)) {
                 entity.playerTouch(this);
             }
-
         }
-
     }
 
     @Override
@@ -178,7 +166,6 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
         if (playerlistTracker != null) {
             playerlistTracker.updateLastPlayer();
         }
-
         return super.getAddEntityPacket();
     }
 
@@ -192,7 +179,6 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
         if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
             NMSImpl.setBukkitEntity(this, new PlayerNPC(this));
         }
-
         return super.getBukkitEntity();
     }
 
@@ -222,7 +208,6 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
         if (skinName == null) {
             skinName = npc.getName();
         }
-
         return skinName.toLowerCase();
     }
 
@@ -254,7 +239,6 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
             Bukkit.getScheduler().runTask(CitizensAPI.getPlugin(),
                     (Runnable) () -> EntityHumanNPC.this.hurtMarked = true);
         }
-
         return damaged;
     }
 
@@ -265,7 +249,6 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
             conn.setListener(connection);
         } catch (IOException e) {
         }
-
         this.invulnerableTime = 0;
         NMS.setStepHeight(getBukkitEntity(), 1); // the default (0) breaks step climbing
         setSkinFlags((byte) 0xFF);
@@ -293,11 +276,9 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
                 jumpFromGround();
                 jumpTicks = 10;
             }
-
         } else {
             jumpTicks = 0;
         }
-
         xxa *= 0.98F;
         zza *= 0.98F;
         moveWithFallDamage(new Vec3(this.xxa, this.yya, this.zza));
@@ -305,7 +286,6 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
         if (jumpTicks > 0) {
             jumpTicks--;
         }
-
     }
 
     private void moveWithFallDamage(Vec3 vec) {
@@ -314,7 +294,6 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
         if (!npc.isProtected()) {
             doCheckFallDamage(getY() - y, onGround);
         }
-
     }
 
     @Override
@@ -331,7 +310,6 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
         if (vector != null) {
             super.push(vector.getX(), vector.getY(), vector.getZ());
         }
-
     }
 
     @Override
@@ -342,7 +320,6 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
         if (npc != null) {
             Util.callCollisionEvent(npc, entity.getBukkitEntity());
         }
-
     }
 
     @Override
@@ -392,7 +369,6 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
         } else {
             NMSImpl.flyingMoveLogic(this, vec3d);
         }
-
     }
 
     private void updatePackets(boolean navigating) {
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EvokerController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EvokerController.java
index 70a005d42..cb72c1563 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EvokerController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/EvokerController.java
@@ -73,7 +73,6 @@ public class EvokerController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -81,7 +80,6 @@ public class EvokerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -91,7 +89,6 @@ public class EvokerController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -104,7 +101,6 @@ public class EvokerController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new EvokerNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -174,7 +170,6 @@ public class EvokerController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -185,7 +180,6 @@ public class EvokerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -207,7 +201,6 @@ public class EvokerController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -219,7 +212,6 @@ public class EvokerController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/FoxController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/FoxController.java
index 3da395432..50e7907f0 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/FoxController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/FoxController.java
@@ -74,7 +74,6 @@ public class FoxController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -82,7 +81,6 @@ public class FoxController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -92,7 +90,6 @@ public class FoxController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -105,7 +102,6 @@ public class FoxController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new FoxNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -175,7 +171,6 @@ public class FoxController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -185,7 +180,6 @@ public class FoxController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -196,7 +190,6 @@ public class FoxController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -218,7 +211,6 @@ public class FoxController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -230,7 +222,6 @@ public class FoxController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GhastController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GhastController.java
index c5829b557..ee037866e 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GhastController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GhastController.java
@@ -65,7 +65,6 @@ public class GhastController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -74,7 +73,6 @@ public class GhastController extends MobEntityController {
                 npc.update();
                 NMSImpl.updateMinecraftAIState(npc, this);
             }
-
             super.customServerAiStep();
         }
 
@@ -88,7 +86,6 @@ public class GhastController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new GhastNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -155,7 +152,6 @@ public class GhastController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -166,7 +162,6 @@ public class GhastController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -190,7 +185,6 @@ public class GhastController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GiantController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GiantController.java
index cfde879d3..8d307ce26 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GiantController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GiantController.java
@@ -73,7 +73,6 @@ public class GiantController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -81,7 +80,6 @@ public class GiantController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -91,7 +89,6 @@ public class GiantController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -104,7 +101,6 @@ public class GiantController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new GiantNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -174,7 +170,6 @@ public class GiantController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -185,7 +180,6 @@ public class GiantController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -195,7 +189,6 @@ public class GiantController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -217,7 +210,6 @@ public class GiantController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -229,7 +221,6 @@ public class GiantController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GlowSquidController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GlowSquidController.java
index b7b5303b9..8223c09bf 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GlowSquidController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GlowSquidController.java
@@ -73,7 +73,6 @@ public class GlowSquidController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -81,7 +80,6 @@ public class GlowSquidController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -91,7 +89,6 @@ public class GlowSquidController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -104,7 +101,6 @@ public class GlowSquidController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new GlowSquidNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -174,7 +170,6 @@ public class GlowSquidController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -185,7 +180,6 @@ public class GlowSquidController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -195,7 +189,6 @@ public class GlowSquidController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -217,7 +210,6 @@ public class GlowSquidController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -229,7 +221,6 @@ public class GlowSquidController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GoatController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GoatController.java
index f16e06c50..29bdbc154 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GoatController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GoatController.java
@@ -74,7 +74,6 @@ public class GoatController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -82,7 +81,6 @@ public class GoatController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -92,7 +90,6 @@ public class GoatController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -105,7 +102,6 @@ public class GoatController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new GoatNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -175,7 +171,6 @@ public class GoatController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -185,7 +180,6 @@ public class GoatController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -196,7 +190,6 @@ public class GoatController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -218,7 +211,6 @@ public class GoatController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -230,7 +222,6 @@ public class GoatController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GuardianController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GuardianController.java
index b3d85e0d8..fce8b5fe4 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GuardianController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GuardianController.java
@@ -65,10 +65,8 @@ public class GuardianController extends MobEntityController {
                 } else {
                     super.aiStep();
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
@@ -90,7 +88,6 @@ public class GuardianController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -98,7 +95,6 @@ public class GuardianController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -111,7 +107,6 @@ public class GuardianController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new GuardianNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -181,7 +176,6 @@ public class GuardianController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -192,7 +186,6 @@ public class GuardianController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -202,7 +195,6 @@ public class GuardianController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -224,7 +216,6 @@ public class GuardianController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -236,7 +227,6 @@ public class GuardianController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GuardianElderController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GuardianElderController.java
index 52255eb86..f0dd92f60 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GuardianElderController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/GuardianElderController.java
@@ -65,10 +65,8 @@ public class GuardianElderController extends MobEntityController {
                 } else {
                     super.aiStep();
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
@@ -90,7 +88,6 @@ public class GuardianElderController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -98,7 +95,6 @@ public class GuardianElderController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -111,7 +107,6 @@ public class GuardianElderController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new GuardianElderNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -181,7 +176,6 @@ public class GuardianElderController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -192,7 +186,6 @@ public class GuardianElderController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -202,7 +195,6 @@ public class GuardianElderController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -224,7 +216,6 @@ public class GuardianElderController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -236,7 +227,6 @@ public class GuardianElderController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HoglinController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HoglinController.java
index 5977f4ed9..8397b09fe 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HoglinController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HoglinController.java
@@ -73,7 +73,6 @@ public class HoglinController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -81,7 +80,6 @@ public class HoglinController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -90,12 +88,10 @@ public class HoglinController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 setImmuneToZombification(true);
             }
-
             super.customServerAiStep();
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -108,7 +104,6 @@ public class HoglinController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new HoglinNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -178,7 +173,6 @@ public class HoglinController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -189,7 +183,6 @@ public class HoglinController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -211,7 +204,6 @@ public class HoglinController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -223,7 +215,6 @@ public class HoglinController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseController.java
index 87e7bb793..28eaef40a 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseController.java
@@ -72,7 +72,6 @@ public class HorseController extends MobEntityController {
                 horse.setDomestication(horse.getMaxDomestication());
                 baseMovementSpeed = this.getAttribute(Attributes.MOVEMENT_SPEED).getValue();
             }
-
         }
 
         @Override
@@ -99,7 +98,6 @@ public class HorseController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -107,7 +105,6 @@ public class HorseController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -123,16 +120,13 @@ public class HorseController extends MobEntityController {
             } else {
                 riding = false;
             }
-
             if (riding) {
                 if (npc.getNavigator().isNavigating()) {
                     org.bukkit.entity.Entity basePassenger = passengers.get(0).getBukkitEntity();
                     NMS.look(basePassenger, getYRot(), getXRot());
                 }
-
                 setFlag(4, true); // datawatcher method
             }
-
             NMS.setStepHeight(getBukkitEntity(), 1);
             npc.update();
         }
@@ -147,7 +141,6 @@ public class HorseController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new HorseNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -224,7 +217,6 @@ public class HorseController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -234,7 +226,6 @@ public class HorseController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -245,7 +236,6 @@ public class HorseController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -267,7 +257,6 @@ public class HorseController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -279,7 +268,6 @@ public class HorseController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseDonkeyController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseDonkeyController.java
index a9a65ff90..a919647dc 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseDonkeyController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseDonkeyController.java
@@ -72,7 +72,6 @@ public class HorseDonkeyController extends MobEntityController {
                         .setDomestication(((org.bukkit.entity.Donkey) getBukkitEntity()).getMaxDomestication());
                 baseMovementSpeed = this.getAttribute(Attributes.MOVEMENT_SPEED).getValue();
             }
-
         }
 
         @Override
@@ -99,7 +98,6 @@ public class HorseDonkeyController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -107,7 +105,6 @@ public class HorseDonkeyController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -122,20 +119,16 @@ public class HorseDonkeyController extends MobEntityController {
                 } else {
                     riding = false;
                 }
-
                 if (riding) {
                     if (npc.getNavigator().isNavigating()) {
                         org.bukkit.entity.Entity basePassenger = passengers.get(0).getBukkitEntity();
                         NMS.look(basePassenger, getYRot(), getXRot());
                     }
-
                     setFlag(4, true); // datawatcher method
                 }
-
                 NMS.setStepHeight(getBukkitEntity(), 1);
                 npc.update();
             }
-
         }
 
         @Override
@@ -148,7 +141,6 @@ public class HorseDonkeyController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new HorseDonkeyNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -225,7 +217,6 @@ public class HorseDonkeyController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -235,7 +226,6 @@ public class HorseDonkeyController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -246,7 +236,6 @@ public class HorseDonkeyController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -268,7 +257,6 @@ public class HorseDonkeyController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -280,7 +268,6 @@ public class HorseDonkeyController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseMuleController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseMuleController.java
index 0331cd650..a23f5a0cb 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseMuleController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseMuleController.java
@@ -72,7 +72,6 @@ public class HorseMuleController extends MobEntityController {
                         .setDomestication(((org.bukkit.entity.Mule) getBukkitEntity()).getMaxDomestication());
                 baseMovementSpeed = this.getAttribute(Attributes.MOVEMENT_SPEED).getValue();
             }
-
         }
 
         @Override
@@ -99,7 +98,6 @@ public class HorseMuleController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -107,7 +105,6 @@ public class HorseMuleController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -122,20 +119,16 @@ public class HorseMuleController extends MobEntityController {
                 } else {
                     riding = false;
                 }
-
                 if (riding) {
                     if (npc.getNavigator().isNavigating()) {
                         org.bukkit.entity.Entity basePassenger = passengers.get(0).getBukkitEntity();
                         NMS.look(basePassenger, getYRot(), getXRot());
                     }
-
                     setFlag(4, true); // datawatcher method
                 }
-
                 NMS.setStepHeight(getBukkitEntity(), 1);
                 npc.update();
             }
-
         }
 
         @Override
@@ -148,7 +141,6 @@ public class HorseMuleController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new HorseMuleNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -225,7 +217,6 @@ public class HorseMuleController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -235,7 +226,6 @@ public class HorseMuleController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -246,7 +236,6 @@ public class HorseMuleController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -268,7 +257,6 @@ public class HorseMuleController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -280,7 +268,6 @@ public class HorseMuleController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseSkeletonController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseSkeletonController.java
index 7d96d358d..e0d041fa6 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseSkeletonController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseSkeletonController.java
@@ -72,7 +72,6 @@ public class HorseSkeletonController extends MobEntityController {
                         .setDomestication(((org.bukkit.entity.SkeletonHorse) getBukkitEntity()).getMaxDomestication());
                 baseMovementSpeed = this.getAttribute(Attributes.MOVEMENT_SPEED).getValue();
             }
-
         }
 
         @Override
@@ -99,7 +98,6 @@ public class HorseSkeletonController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -107,7 +105,6 @@ public class HorseSkeletonController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -122,20 +119,16 @@ public class HorseSkeletonController extends MobEntityController {
                 } else {
                     riding = false;
                 }
-
                 if (riding) {
                     if (npc.getNavigator().isNavigating()) {
                         org.bukkit.entity.Entity basePassenger = passengers.get(0).getBukkitEntity();
                         NMS.look(basePassenger, getYRot(), getXRot());
                     }
-
                     setFlag(4, true); // datawatcher method
                 }
-
                 NMS.setStepHeight(getBukkitEntity(), 1);
                 npc.update();
             }
-
         }
 
         @Override
@@ -148,7 +141,6 @@ public class HorseSkeletonController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new HorseSkeletonNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -225,7 +217,6 @@ public class HorseSkeletonController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -235,7 +226,6 @@ public class HorseSkeletonController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -246,7 +236,6 @@ public class HorseSkeletonController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -268,7 +257,6 @@ public class HorseSkeletonController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -280,7 +268,6 @@ public class HorseSkeletonController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseZombieController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseZombieController.java
index 643646d51..be1367ce1 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseZombieController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HorseZombieController.java
@@ -72,7 +72,6 @@ public class HorseZombieController extends MobEntityController {
                         .setDomestication(((org.bukkit.entity.ZombieHorse) getBukkitEntity()).getMaxDomestication());
                 baseMovementSpeed = this.getAttribute(Attributes.MOVEMENT_SPEED).getValue();
             }
-
         }
 
         @Override
@@ -99,7 +98,6 @@ public class HorseZombieController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -107,7 +105,6 @@ public class HorseZombieController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -122,20 +119,16 @@ public class HorseZombieController extends MobEntityController {
                 } else {
                     riding = false;
                 }
-
                 if (riding) {
                     if (npc.getNavigator().isNavigating()) {
                         org.bukkit.entity.Entity basePassenger = passengers.get(0).getBukkitEntity();
                         NMS.look(basePassenger, getYRot(), getXRot());
                     }
-
                     setFlag(4, true); // datawatcher method
                 }
-
                 NMS.setStepHeight(getBukkitEntity(), 1);
                 npc.update();
             }
-
         }
 
         @Override
@@ -148,7 +141,6 @@ public class HorseZombieController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new HorseZombieNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -225,7 +217,6 @@ public class HorseZombieController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -235,7 +226,6 @@ public class HorseZombieController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -246,7 +236,6 @@ public class HorseZombieController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -268,7 +257,6 @@ public class HorseZombieController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -280,7 +268,6 @@ public class HorseZombieController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HumanController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HumanController.java
index 1143d8db1..656df879c 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HumanController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/HumanController.java
@@ -35,18 +35,15 @@ public class HumanController extends AbstractEntityController {
         if (npc.requiresNameHologram()) {
             name = teamName;
         }
-
         if (Setting.USE_SCOREBOARD_TEAMS.asBoolean()) {
             npc.getOrAddTrait(ScoreboardTrait.class).createTeam(name);
         }
-
         final GameProfile profile = new GameProfile(uuid, name);
         final EntityHumanNPC handle = new EntityHumanNPC(MinecraftServer.getServer(), nmsWorld, profile, npc);
         Skin skin = handle.getSkinTracker().getSkin();
         if (skin != null) {
             skin.apply(handle);
         }
-
         Bukkit.getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(), () -> {
             if (getBukkitEntity() == null || !getBukkitEntity().isValid()
                     || getBukkitEntity() != handle.getBukkitEntity())
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/IllusionerController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/IllusionerController.java
index 82502779e..6059b99db 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/IllusionerController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/IllusionerController.java
@@ -73,7 +73,6 @@ public class IllusionerController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -81,7 +80,6 @@ public class IllusionerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -91,7 +89,6 @@ public class IllusionerController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -104,7 +101,6 @@ public class IllusionerController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new IllusionerNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -174,7 +170,6 @@ public class IllusionerController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -185,7 +180,6 @@ public class IllusionerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -207,7 +201,6 @@ public class IllusionerController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -219,7 +212,6 @@ public class IllusionerController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/IronGolemController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/IronGolemController.java
index fe877f738..5e2530759 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/IronGolemController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/IronGolemController.java
@@ -73,7 +73,6 @@ public class IronGolemController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -81,7 +80,6 @@ public class IronGolemController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -91,7 +89,6 @@ public class IronGolemController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -104,7 +101,6 @@ public class IronGolemController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new IronGolemNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -174,7 +170,6 @@ public class IronGolemController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -185,7 +180,6 @@ public class IronGolemController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -195,7 +189,6 @@ public class IronGolemController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -217,7 +210,6 @@ public class IronGolemController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -229,7 +221,6 @@ public class IronGolemController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/LlamaController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/LlamaController.java
index 5059c1ac3..0cc9fc7ec 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/LlamaController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/LlamaController.java
@@ -72,7 +72,6 @@ public class LlamaController extends MobEntityController {
                         .setDomestication(((org.bukkit.entity.Llama) getBukkitEntity()).getMaxDomestication());
                 baseMovementSpeed = this.getAttribute(Attributes.MOVEMENT_SPEED).getValue();
             }
-
         }
 
         @Override
@@ -94,7 +93,6 @@ public class LlamaController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -102,7 +100,6 @@ public class LlamaController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -117,20 +114,16 @@ public class LlamaController extends MobEntityController {
                 } else {
                     riding = false;
                 }
-
                 if (riding) {
                     if (npc.getNavigator().isNavigating()) {
                         org.bukkit.entity.Entity basePassenger = passengers.get(0).getBukkitEntity();
                         NMS.look(basePassenger, getYRot(), getXRot());
                     }
-
                     setFlag(4, true); // datawatcher method
                 }
-
                 NMS.setStepHeight(getBukkitEntity(), 1);
                 npc.update();
             }
-
         }
 
         @Override
@@ -143,7 +136,6 @@ public class LlamaController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new LlamaNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -220,7 +212,6 @@ public class LlamaController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -230,7 +221,6 @@ public class LlamaController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -241,7 +231,6 @@ public class LlamaController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -263,7 +252,6 @@ public class LlamaController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -275,7 +263,6 @@ public class LlamaController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/MagmaCubeController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/MagmaCubeController.java
index e6f101196..668197d00 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/MagmaCubeController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/MagmaCubeController.java
@@ -62,7 +62,6 @@ public class MagmaCubeController extends MobEntityController {
                 this.oldMoveController = this.moveControl;
                 this.moveControl = new EntityMoveControl(this);
             }
-
         }
 
         @Override
@@ -84,7 +83,6 @@ public class MagmaCubeController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -92,7 +90,6 @@ public class MagmaCubeController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -105,7 +102,6 @@ public class MagmaCubeController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new MagmaCubeNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -174,7 +170,6 @@ public class MagmaCubeController extends MobEntityController {
             if (npc == null) {
                 super.playerTouch(human);
             }
-
         }
 
         @Override
@@ -183,7 +178,6 @@ public class MagmaCubeController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -194,7 +188,6 @@ public class MagmaCubeController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -204,7 +197,6 @@ public class MagmaCubeController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -227,14 +219,11 @@ public class MagmaCubeController extends MobEntityController {
                 if (npc.useMinecraftAI() && this.moveControl != this.oldMoveController) {
                     this.moveControl = this.oldMoveController;
                 }
-
                 if (!npc.useMinecraftAI() && this.moveControl == this.oldMoveController) {
                     this.moveControl = new EntityMoveControl(this);
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
@@ -244,7 +233,6 @@ public class MagmaCubeController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -256,7 +244,6 @@ public class MagmaCubeController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/MobEntityController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/MobEntityController.java
index 33bc9c1d6..c317c3bbf 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/MobEntityController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/MobEntityController.java
@@ -39,9 +39,7 @@ public abstract class MobEntityController extends AbstractEntityController {
             if (mob.getLookControl().getClass() == LookControl.class) {
                 NMSImpl.setLookControl(mob, new PitchableLookControl(mob));
             }
-
         }
-
         entity.absMoveTo(at.getX(), at.getY(), at.getZ(), at.getYaw(), at.getPitch());
         if (npc != null) {
             // entity.onGround isn't updatedright away - we approximate here so
@@ -50,14 +48,11 @@ public abstract class MobEntityController extends AbstractEntityController {
             if (beneath.isSolid()) {
                 entity.setOnGround(true);
             }
-
             entity.setUUID(npc.getUniqueId());
             if (Setting.USE_SCOREBOARD_TEAMS.asBoolean()) {
                 npc.getOrAddTrait(ScoreboardTrait.class).createTeam(npc.getUniqueId().toString());
             }
-
         }
-
         return entity.getBukkitEntity();
     }
 
@@ -68,7 +63,6 @@ public abstract class MobEntityController extends AbstractEntityController {
             ex.printStackTrace();
             return null;
         }
-
     }
 
     private static Constructor<?> getConstructor(Class<?> clazz) {
@@ -81,7 +75,6 @@ public abstract class MobEntityController extends AbstractEntityController {
         } catch (Exception ex) {
             throw new IllegalStateException("unable to find an entity constructor");
         }
-
     }
 
     private static final Map<Class<?>, Constructor<?>> CONSTRUCTOR_CACHE = new WeakHashMap<>();
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/MushroomCowController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/MushroomCowController.java
index d53bbed2c..ecac3037e 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/MushroomCowController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/MushroomCowController.java
@@ -77,7 +77,6 @@ public class MushroomCowController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -85,7 +84,6 @@ public class MushroomCowController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -95,7 +93,6 @@ public class MushroomCowController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -108,7 +105,6 @@ public class MushroomCowController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new MushroomCowNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -185,7 +181,6 @@ public class MushroomCowController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -195,7 +190,6 @@ public class MushroomCowController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -206,7 +200,6 @@ public class MushroomCowController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -228,7 +221,6 @@ public class MushroomCowController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -240,7 +232,6 @@ public class MushroomCowController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/OcelotController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/OcelotController.java
index 26be8daae..cc3698aef 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/OcelotController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/OcelotController.java
@@ -75,7 +75,6 @@ public class OcelotController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -83,7 +82,6 @@ public class OcelotController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -94,12 +92,10 @@ public class OcelotController extends MobEntityController {
             if (restorePose) {
                 this.setPose(old);
             }
-
             if (npc != null) {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -112,7 +108,6 @@ public class OcelotController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new OcelotNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -182,7 +177,6 @@ public class OcelotController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -192,7 +186,6 @@ public class OcelotController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -203,7 +196,6 @@ public class OcelotController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -225,7 +217,6 @@ public class OcelotController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -237,7 +228,6 @@ public class OcelotController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PandaController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PandaController.java
index a56c6a506..88858ca4e 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PandaController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PandaController.java
@@ -74,7 +74,6 @@ public class PandaController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -82,7 +81,6 @@ public class PandaController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -92,7 +90,6 @@ public class PandaController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -105,7 +102,6 @@ public class PandaController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new PandaNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -175,7 +171,6 @@ public class PandaController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -185,7 +180,6 @@ public class PandaController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -196,7 +190,6 @@ public class PandaController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -218,7 +211,6 @@ public class PandaController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -230,7 +222,6 @@ public class PandaController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ParrotController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ParrotController.java
index 0aa040f38..596a44a9f 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ParrotController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ParrotController.java
@@ -68,7 +68,6 @@ public class ParrotController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -80,10 +79,8 @@ public class ParrotController extends MobEntityController {
                 if (npc.useMinecraftAI()) {
                     super.customServerAiStep();
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
@@ -96,7 +93,6 @@ public class ParrotController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ParrotNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -140,7 +136,6 @@ public class ParrotController extends MobEntityController {
             if (super.isLeashed()) {
                 dropLeash(true, false); // clearLeash with client update
             }
-
             return false; // shouldLeash
         }
 
@@ -175,7 +170,6 @@ public class ParrotController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -186,7 +180,6 @@ public class ParrotController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -210,7 +203,6 @@ public class ParrotController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PhantomController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PhantomController.java
index 0f2312312..81217532e 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PhantomController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PhantomController.java
@@ -67,7 +67,6 @@ public class PhantomController extends MobEntityController {
                 this.lookControl = new LookControl(this);
                 // TODO: phantom pitch reversed
             }
-
         }
 
         @Override
@@ -79,19 +78,15 @@ public class PhantomController extends MobEntityController {
                     this.moveControl = this.oldMoveController;
                     this.lookControl = this.oldLookController;
                 }
-
                 if (!npc.useMinecraftAI() && this.moveControl == this.oldMoveController) {
                     this.moveControl = new EntityMoveControl(this);
                     this.lookControl = new LookControl(this);
                 }
-
                 if (npc.isProtected()) {
                     this.setSecondsOnFire(0);
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
@@ -113,7 +108,6 @@ public class PhantomController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -121,7 +115,6 @@ public class PhantomController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -134,7 +127,6 @@ public class PhantomController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new PhantomNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -211,7 +203,6 @@ public class PhantomController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -221,7 +212,6 @@ public class PhantomController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -232,7 +222,6 @@ public class PhantomController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -259,7 +248,6 @@ public class PhantomController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -271,7 +259,6 @@ public class PhantomController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PigController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PigController.java
index daf8c3e59..05fdac1ab 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PigController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PigController.java
@@ -81,7 +81,6 @@ public class PigController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -89,7 +88,6 @@ public class PigController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -99,7 +97,6 @@ public class PigController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -112,7 +109,6 @@ public class PigController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new PigNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -182,7 +178,6 @@ public class PigController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -192,7 +187,6 @@ public class PigController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -203,7 +197,6 @@ public class PigController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -223,7 +216,6 @@ public class PigController extends MobEntityController {
             if (npc == null) {
                 super.thunderHit(worldserver, entitylightning);
             }
-
         }
 
         @Override
@@ -233,7 +225,6 @@ public class PigController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -245,7 +236,6 @@ public class PigController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PigZombieController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PigZombieController.java
index 4cf5e603a..8f5440dde 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PigZombieController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PigZombieController.java
@@ -73,7 +73,6 @@ public class PigZombieController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -81,7 +80,6 @@ public class PigZombieController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -91,7 +89,6 @@ public class PigZombieController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -104,7 +101,6 @@ public class PigZombieController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new PigZombieNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -174,7 +170,6 @@ public class PigZombieController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -185,7 +180,6 @@ public class PigZombieController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -207,7 +201,6 @@ public class PigZombieController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -219,7 +212,6 @@ public class PigZombieController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PiglinBruteController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PiglinBruteController.java
index 8a3a90720..51895d112 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PiglinBruteController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PiglinBruteController.java
@@ -73,7 +73,6 @@ public class PiglinBruteController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -81,7 +80,6 @@ public class PiglinBruteController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -90,12 +88,10 @@ public class PiglinBruteController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 setImmuneToZombification(true);
             }
-
             super.customServerAiStep();
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -108,7 +104,6 @@ public class PiglinBruteController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new PiglinBruteNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -178,7 +173,6 @@ public class PiglinBruteController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -189,7 +183,6 @@ public class PiglinBruteController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -211,7 +204,6 @@ public class PiglinBruteController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -223,7 +215,6 @@ public class PiglinBruteController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PiglinController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PiglinController.java
index 7ac5bbe18..385061240 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PiglinController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PiglinController.java
@@ -73,7 +73,6 @@ public class PiglinController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -81,7 +80,6 @@ public class PiglinController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -90,12 +88,10 @@ public class PiglinController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 setImmuneToZombification(true);
             }
-
             super.customServerAiStep();
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -108,7 +104,6 @@ public class PiglinController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new PiglinNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -178,7 +173,6 @@ public class PiglinController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -189,7 +183,6 @@ public class PiglinController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -211,7 +204,6 @@ public class PiglinController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -223,7 +215,6 @@ public class PiglinController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PillagerController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PillagerController.java
index 4c2d63068..b1017d28a 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PillagerController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PillagerController.java
@@ -74,7 +74,6 @@ public class PillagerController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -82,7 +81,6 @@ public class PillagerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -92,7 +90,6 @@ public class PillagerController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -105,7 +102,6 @@ public class PillagerController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new PillagerNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -175,7 +171,6 @@ public class PillagerController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -185,7 +180,6 @@ public class PillagerController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -196,7 +190,6 @@ public class PillagerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -218,7 +211,6 @@ public class PillagerController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -230,7 +222,6 @@ public class PillagerController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PolarBearController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PolarBearController.java
index 19c79015b..1bd5cee6d 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PolarBearController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PolarBearController.java
@@ -66,7 +66,6 @@ public class PolarBearController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -76,7 +75,6 @@ public class PolarBearController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -89,7 +87,6 @@ public class PolarBearController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new PolarBearNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -151,7 +148,6 @@ public class PolarBearController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -161,7 +157,6 @@ public class PolarBearController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -172,7 +167,6 @@ public class PolarBearController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -196,7 +190,6 @@ public class PolarBearController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PufferFishController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PufferFishController.java
index b1d78f7ca..381d4cc8e 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PufferFishController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/PufferFishController.java
@@ -68,7 +68,6 @@ public class PufferFishController extends MobEntityController {
                 this.oldMoveController = this.moveControl;
                 this.moveControl = new MoveControl(this);
             }
-
         }
 
         @Override
@@ -79,13 +78,11 @@ public class PufferFishController extends MobEntityController {
                 this.verticalCollision = false;
                 setPuffState(0);
             }
-
             super.aiStep();
             if (npc != null) {
                 this.verticalCollision = lastInWater;
                 setPuffState(lastPuffState);
             }
-
         }
 
         @Override
@@ -107,7 +104,6 @@ public class PufferFishController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -115,7 +111,6 @@ public class PufferFishController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -126,14 +121,11 @@ public class PufferFishController extends MobEntityController {
                 if (npc.useMinecraftAI() && this.moveControl != this.oldMoveController) {
                     this.moveControl = this.oldMoveController;
                 }
-
                 if (!npc.useMinecraftAI() && this.moveControl == this.oldMoveController) {
                     this.moveControl = new EntityMoveControl(this);
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
@@ -146,7 +138,6 @@ public class PufferFishController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new PufferFishNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -233,7 +224,6 @@ public class PufferFishController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -244,7 +234,6 @@ public class PufferFishController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -264,13 +253,11 @@ public class PufferFishController extends MobEntityController {
             if (npc != null) {
                 NMSImpl.resetPuffTicks(this);
             }
-
             super.tick();
             PufferFishTrait trait = null;
             if (npc != null && (trait = npc.getTraitNullable(PufferFishTrait.class)) != null) {
                 setPuffState(trait.getPuffState());
             }
-
         }
 
         @Override
@@ -279,11 +266,9 @@ public class PufferFishController extends MobEntityController {
                 if (!NMSImpl.moveFish(npc, this, vec3d)) {
                     super.travel(vec3d);
                 }
-
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -295,7 +280,6 @@ public class PufferFishController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
 
@@ -308,7 +292,6 @@ public class PufferFishController extends MobEntityController {
                 default:
                     return 1.0F;
             }
-
         }
     }
 
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/RabbitController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/RabbitController.java
index ce5ad361c..dfdc660fb 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/RabbitController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/RabbitController.java
@@ -75,7 +75,6 @@ public class RabbitController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -83,7 +82,6 @@ public class RabbitController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -94,10 +92,8 @@ public class RabbitController extends MobEntityController {
                 if (npc.getNavigator().isNavigating()) {
                     NMS.setShouldJump(getBukkitEntity());
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
@@ -110,7 +106,6 @@ public class RabbitController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new RabbitNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -185,7 +180,6 @@ public class RabbitController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -195,7 +189,6 @@ public class RabbitController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -206,7 +199,6 @@ public class RabbitController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -222,7 +214,6 @@ public class RabbitController extends MobEntityController {
                 this.entityData.set(NMSImpl.getRabbitTypeField(), i);
                 return;
             }
-
             super.setRabbitType(i);
         }
 
@@ -240,7 +231,6 @@ public class RabbitController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -252,7 +242,6 @@ public class RabbitController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/RavagerController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/RavagerController.java
index 9113dad9a..9829e75e2 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/RavagerController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/RavagerController.java
@@ -79,7 +79,6 @@ public class RavagerController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -87,7 +86,6 @@ public class RavagerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -97,7 +95,6 @@ public class RavagerController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -110,7 +107,6 @@ public class RavagerController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new RavagerNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -180,7 +176,6 @@ public class RavagerController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -190,7 +185,6 @@ public class RavagerController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -201,7 +195,6 @@ public class RavagerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -223,7 +216,6 @@ public class RavagerController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -235,7 +227,6 @@ public class RavagerController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SalmonController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SalmonController.java
index 7b56007e9..80d345f15 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SalmonController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SalmonController.java
@@ -65,7 +65,6 @@ public class SalmonController extends MobEntityController {
                 this.oldMoveController = this.moveControl;
                 this.moveControl = new MoveControl(this);
             }
-
         }
 
         @Override
@@ -74,12 +73,10 @@ public class SalmonController extends MobEntityController {
             if (npc != null) {
                 this.verticalCollision = false;
             }
-
             super.aiStep();
             if (npc != null) {
                 this.verticalCollision = lastInWater;
             }
-
         }
 
         @Override
@@ -101,7 +98,6 @@ public class SalmonController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -109,7 +105,6 @@ public class SalmonController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -120,18 +115,14 @@ public class SalmonController extends MobEntityController {
                 if (npc.useMinecraftAI() && this.moveControl != this.oldMoveController) {
                     this.moveControl = this.oldMoveController;
                 }
-
                 if (!npc.useMinecraftAI() && this.moveControl == this.oldMoveController) {
                     this.moveControl = new EntityMoveControl(this);
                 }
-
             }
-
             super.customServerAiStep();
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -144,7 +135,6 @@ public class SalmonController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SalmonNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -224,7 +214,6 @@ public class SalmonController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -235,7 +224,6 @@ public class SalmonController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -256,11 +244,9 @@ public class SalmonController extends MobEntityController {
                 if (!NMSImpl.moveFish(npc, this, vec3d)) {
                     super.travel(vec3d);
                 }
-
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -272,7 +258,6 @@ public class SalmonController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SheepController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SheepController.java
index c0270cb2e..037e3f407 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SheepController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SheepController.java
@@ -74,7 +74,6 @@ public class SheepController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -82,7 +81,6 @@ public class SheepController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -92,7 +90,6 @@ public class SheepController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -105,7 +102,6 @@ public class SheepController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SheepNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -175,7 +171,6 @@ public class SheepController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -185,7 +180,6 @@ public class SheepController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -196,7 +190,6 @@ public class SheepController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -218,7 +211,6 @@ public class SheepController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -230,7 +222,6 @@ public class SheepController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ShulkerController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ShulkerController.java
index 3d0a7a740..91659252e 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ShulkerController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ShulkerController.java
@@ -60,7 +60,6 @@ public class ShulkerController extends MobEntityController {
             if (npc == null || npc.useMinecraftAI()) {
                 super.aiStep();
             }
-
         }
 
         @Override
@@ -82,7 +81,6 @@ public class ShulkerController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -90,7 +88,6 @@ public class ShulkerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -108,7 +105,6 @@ public class ShulkerController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ShulkerNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -178,7 +174,6 @@ public class ShulkerController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -189,7 +184,6 @@ public class ShulkerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -199,7 +193,6 @@ public class ShulkerController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -221,12 +214,10 @@ public class ShulkerController extends MobEntityController {
                 if (npc.useMinecraftAI()) {
                     super.tick();
                 }
-
                 npc.update();
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -236,7 +227,6 @@ public class ShulkerController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -248,7 +238,6 @@ public class ShulkerController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SilverfishController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SilverfishController.java
index efa5d4dbb..bcc17e59a 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SilverfishController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SilverfishController.java
@@ -73,7 +73,6 @@ public class SilverfishController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -81,7 +80,6 @@ public class SilverfishController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -91,7 +89,6 @@ public class SilverfishController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -104,7 +101,6 @@ public class SilverfishController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SilverfishNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -174,7 +170,6 @@ public class SilverfishController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -185,7 +180,6 @@ public class SilverfishController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -195,7 +189,6 @@ public class SilverfishController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -217,7 +210,6 @@ public class SilverfishController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -229,7 +221,6 @@ public class SilverfishController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SkeletonController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SkeletonController.java
index 6c5809a7d..28c6d8d0f 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SkeletonController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SkeletonController.java
@@ -73,7 +73,6 @@ public class SkeletonController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -81,7 +80,6 @@ public class SkeletonController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -91,7 +89,6 @@ public class SkeletonController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -104,7 +101,6 @@ public class SkeletonController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SkeletonNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -174,7 +170,6 @@ public class SkeletonController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -185,7 +180,6 @@ public class SkeletonController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -195,7 +189,6 @@ public class SkeletonController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -217,7 +210,6 @@ public class SkeletonController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -229,7 +221,6 @@ public class SkeletonController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SkeletonStrayController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SkeletonStrayController.java
index 42da5ead2..4a7a0bdbf 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SkeletonStrayController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SkeletonStrayController.java
@@ -73,7 +73,6 @@ public class SkeletonStrayController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -81,7 +80,6 @@ public class SkeletonStrayController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -91,7 +89,6 @@ public class SkeletonStrayController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -104,7 +101,6 @@ public class SkeletonStrayController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new StrayNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -174,7 +170,6 @@ public class SkeletonStrayController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -185,7 +180,6 @@ public class SkeletonStrayController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -195,7 +189,6 @@ public class SkeletonStrayController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -217,7 +210,6 @@ public class SkeletonStrayController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -229,7 +221,6 @@ public class SkeletonStrayController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SkeletonWitherController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SkeletonWitherController.java
index e65f49f68..b6674be42 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SkeletonWitherController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SkeletonWitherController.java
@@ -73,7 +73,6 @@ public class SkeletonWitherController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -81,7 +80,6 @@ public class SkeletonWitherController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -91,7 +89,6 @@ public class SkeletonWitherController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -104,7 +101,6 @@ public class SkeletonWitherController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SkeletonWitherNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -174,7 +170,6 @@ public class SkeletonWitherController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -185,7 +180,6 @@ public class SkeletonWitherController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -195,7 +189,6 @@ public class SkeletonWitherController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -217,7 +210,6 @@ public class SkeletonWitherController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -229,7 +221,6 @@ public class SkeletonWitherController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SlimeController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SlimeController.java
index 6b2918341..ac2b3eb2d 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SlimeController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SlimeController.java
@@ -62,7 +62,6 @@ public class SlimeController extends MobEntityController {
                 this.oldMoveController = this.moveControl;
                 this.moveControl = new EntityMoveControl(this);
             }
-
         }
 
         @Override
@@ -84,7 +83,6 @@ public class SlimeController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -92,7 +90,6 @@ public class SlimeController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -105,7 +102,6 @@ public class SlimeController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SlimeNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -174,7 +170,6 @@ public class SlimeController extends MobEntityController {
             if (npc == null) {
                 super.playerTouch(human);
             }
-
         }
 
         @Override
@@ -183,7 +178,6 @@ public class SlimeController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -194,7 +188,6 @@ public class SlimeController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -204,7 +197,6 @@ public class SlimeController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -227,14 +219,11 @@ public class SlimeController extends MobEntityController {
                 if (npc.useMinecraftAI() && this.moveControl != this.oldMoveController) {
                     this.moveControl = this.oldMoveController;
                 }
-
                 if (!npc.useMinecraftAI() && this.moveControl == this.oldMoveController) {
                     this.moveControl = new EntityMoveControl(this);
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
@@ -244,7 +233,6 @@ public class SlimeController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -256,7 +244,6 @@ public class SlimeController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SnowmanController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SnowmanController.java
index eb2a48eef..fcff552dc 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SnowmanController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SnowmanController.java
@@ -73,7 +73,6 @@ public class SnowmanController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -81,7 +80,6 @@ public class SnowmanController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -91,7 +89,6 @@ public class SnowmanController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -104,7 +101,6 @@ public class SnowmanController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SnowmanNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -174,7 +170,6 @@ public class SnowmanController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -185,7 +180,6 @@ public class SnowmanController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -195,7 +189,6 @@ public class SnowmanController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -217,7 +210,6 @@ public class SnowmanController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -229,7 +221,6 @@ public class SnowmanController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SpiderController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SpiderController.java
index a1b4e9baa..b595508e3 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SpiderController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SpiderController.java
@@ -73,7 +73,6 @@ public class SpiderController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -81,7 +80,6 @@ public class SpiderController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -91,7 +89,6 @@ public class SpiderController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -104,7 +101,6 @@ public class SpiderController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SpiderNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -174,7 +170,6 @@ public class SpiderController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -185,7 +180,6 @@ public class SpiderController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -195,7 +189,6 @@ public class SpiderController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -217,7 +210,6 @@ public class SpiderController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -229,7 +221,6 @@ public class SpiderController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SquidController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SquidController.java
index 2f1aa5a13..e13b3edb9 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SquidController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/SquidController.java
@@ -73,7 +73,6 @@ public class SquidController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -81,7 +80,6 @@ public class SquidController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -91,7 +89,6 @@ public class SquidController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -104,7 +101,6 @@ public class SquidController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SquidNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -174,7 +170,6 @@ public class SquidController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -185,7 +180,6 @@ public class SquidController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -195,7 +189,6 @@ public class SquidController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -217,7 +210,6 @@ public class SquidController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -229,7 +221,6 @@ public class SquidController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/StriderController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/StriderController.java
index 16d9ba9a3..7e04c8f68 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/StriderController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/StriderController.java
@@ -73,7 +73,6 @@ public class StriderController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -81,7 +80,6 @@ public class StriderController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -91,7 +89,6 @@ public class StriderController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -104,7 +101,6 @@ public class StriderController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new StriderNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -174,7 +170,6 @@ public class StriderController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -185,7 +180,6 @@ public class StriderController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -207,7 +201,6 @@ public class StriderController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -219,7 +212,6 @@ public class StriderController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/TraderLlamaController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/TraderLlamaController.java
index 875ba5cbc..b4d136ee3 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/TraderLlamaController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/TraderLlamaController.java
@@ -65,7 +65,6 @@ public class TraderLlamaController extends MobEntityController {
                 ((org.bukkit.entity.TraderLlama) getBukkitEntity())
                         .setDomestication(((org.bukkit.entity.TraderLlama) getBukkitEntity()).getMaxDomestication());
             }
-
         }
 
         @Override
@@ -87,7 +86,6 @@ public class TraderLlamaController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -95,7 +93,6 @@ public class TraderLlamaController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -107,12 +104,10 @@ public class TraderLlamaController extends MobEntityController {
                 if (npc.useMinecraftAI()) {
                     super.customServerAiStep();
                 }
-
                 setDespawnDelay(10);
                 NMS.setStepHeight(getBukkitEntity(), 1);
                 npc.update();
             }
-
         }
 
         @Override
@@ -125,7 +120,6 @@ public class TraderLlamaController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new TraderLlamaNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -195,7 +189,6 @@ public class TraderLlamaController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -205,7 +198,6 @@ public class TraderLlamaController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -216,7 +208,6 @@ public class TraderLlamaController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -238,7 +229,6 @@ public class TraderLlamaController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -250,7 +240,6 @@ public class TraderLlamaController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/TropicalFishController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/TropicalFishController.java
index 5f34fdedb..3286b22dc 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/TropicalFishController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/TropicalFishController.java
@@ -65,7 +65,6 @@ public class TropicalFishController extends MobEntityController {
                 this.oldMoveController = this.moveControl;
                 this.moveControl = new MoveControl(this);
             }
-
         }
 
         @Override
@@ -74,12 +73,10 @@ public class TropicalFishController extends MobEntityController {
             if (npc != null) {
                 this.verticalCollision = false;
             }
-
             super.aiStep();
             if (npc != null) {
                 this.verticalCollision = lastInWater;
             }
-
         }
 
         @Override
@@ -101,7 +98,6 @@ public class TropicalFishController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -109,7 +105,6 @@ public class TropicalFishController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -118,23 +113,18 @@ public class TropicalFishController extends MobEntityController {
                 if (!npc.useMinecraftAI()) {
                     NMSImpl.setNotInSchool(this);
                 }
-
                 NMSImpl.updateMinecraftAIState(npc, this);
                 if (npc.useMinecraftAI() && this.moveControl != this.oldMoveController) {
                     this.moveControl = this.oldMoveController;
                 }
-
                 if (!npc.useMinecraftAI() && this.moveControl == this.oldMoveController) {
                     this.moveControl = new EntityMoveControl(this);
                 }
-
             }
-
             super.customServerAiStep();
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -147,7 +137,6 @@ public class TropicalFishController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new TropicalFishNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -227,7 +216,6 @@ public class TropicalFishController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -238,7 +226,6 @@ public class TropicalFishController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -259,11 +246,9 @@ public class TropicalFishController extends MobEntityController {
                 if (!NMSImpl.moveFish(npc, this, vec3d)) {
                     super.travel(vec3d);
                 }
-
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -275,7 +260,6 @@ public class TropicalFishController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/TurtleController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/TurtleController.java
index a21bee67f..f0d237700 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/TurtleController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/TurtleController.java
@@ -66,7 +66,6 @@ public class TurtleController extends MobEntityController {
                 this.moveControl = new MoveControl(this);
                 this.jumpControl = new EmptyControllerJump(this);
             }
-
         }
 
         @Override
@@ -88,7 +87,6 @@ public class TurtleController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -96,7 +94,6 @@ public class TurtleController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -108,15 +105,12 @@ public class TurtleController extends MobEntityController {
                     this.moveControl = this.oldMoveController;
                     this.jumpControl = this.oldJumpController;
                 }
-
                 if (!npc.useMinecraftAI() && this.moveControl == this.oldMoveController) {
                     this.moveControl = new EntityMoveControl(this);
                     this.jumpControl = new EmptyControllerJump(this);
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
@@ -129,7 +123,6 @@ public class TurtleController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new TurtleNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -199,7 +192,6 @@ public class TurtleController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -210,7 +202,6 @@ public class TurtleController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -231,11 +222,9 @@ public class TurtleController extends MobEntityController {
                 if (!NMSImpl.moveFish(npc, this, vec3d)) {
                     super.travel(vec3d);
                 }
-
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -247,7 +236,6 @@ public class TurtleController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
 
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/VexController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/VexController.java
index b35f12dc8..d0595f798 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/VexController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/VexController.java
@@ -54,7 +54,6 @@ public class VexController extends MobEntityController {
             if (npc != null) {
                 setNoGravity(true);
             }
-
         }
 
         @Override
@@ -69,7 +68,6 @@ public class VexController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -79,7 +77,6 @@ public class VexController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -92,7 +89,6 @@ public class VexController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new VexNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -154,7 +150,6 @@ public class VexController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -165,7 +160,6 @@ public class VexController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -189,7 +183,6 @@ public class VexController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/VillagerController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/VillagerController.java
index 08c7f3dd8..cafd955be 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/VillagerController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/VillagerController.java
@@ -64,7 +64,6 @@ public class VillagerController extends MobEntityController {
             if (npc != null) {
                 getAttribute(Attributes.MOVEMENT_SPEED).setBaseValue(0.3);
             }
-
         }
 
         @Override
@@ -86,7 +85,6 @@ public class VillagerController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -94,7 +92,6 @@ public class VillagerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -102,12 +99,10 @@ public class VillagerController extends MobEntityController {
             if (npc != null) {
                 NMSImpl.updateMinecraftAIState(npc, this);
             }
-
             super.customServerAiStep();
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -120,7 +115,6 @@ public class VillagerController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new VillagerNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -171,7 +165,6 @@ public class VillagerController extends MobEntityController {
                 blockingATrade = false;
                 return true;
             }
-
             return super.isTrading();
         }
 
@@ -194,9 +187,7 @@ public class VillagerController extends MobEntityController {
                 if (list != null) {
                     list.clear();
                 }
-
             }
-
             return super.mobInteract(entityhuman, enumhand);
         }
 
@@ -214,7 +205,6 @@ public class VillagerController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -224,7 +214,6 @@ public class VillagerController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -235,7 +224,6 @@ public class VillagerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -255,7 +243,6 @@ public class VillagerController extends MobEntityController {
             if (npc == null) {
                 super.thunderHit(worldserver, entitylightning);
             }
-
         }
 
         @Override
@@ -265,7 +252,6 @@ public class VillagerController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -277,7 +263,6 @@ public class VillagerController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/VindicatorController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/VindicatorController.java
index 3215aca13..4cbf8ba82 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/VindicatorController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/VindicatorController.java
@@ -74,7 +74,6 @@ public class VindicatorController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -82,7 +81,6 @@ public class VindicatorController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -92,7 +90,6 @@ public class VindicatorController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -105,7 +102,6 @@ public class VindicatorController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new VindicatorNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -175,7 +171,6 @@ public class VindicatorController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -185,7 +180,6 @@ public class VindicatorController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -196,7 +190,6 @@ public class VindicatorController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -218,7 +211,6 @@ public class VindicatorController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -230,7 +222,6 @@ public class VindicatorController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WanderingTraderController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WanderingTraderController.java
index 205f50b83..1b4f849f1 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WanderingTraderController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WanderingTraderController.java
@@ -83,7 +83,6 @@ public class WanderingTraderController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -91,7 +90,6 @@ public class WanderingTraderController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -99,13 +97,11 @@ public class WanderingTraderController extends MobEntityController {
             if (npc != null) {
                 NMSImpl.updateMinecraftAIState(npc, this);
             }
-
             super.customServerAiStep();
             if (npc != null) {
                 setDespawnDelay(10);
                 npc.update();
             }
-
         }
 
         @Override
@@ -118,7 +114,6 @@ public class WanderingTraderController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new WanderingTraderNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -173,7 +168,6 @@ public class WanderingTraderController extends MobEntityController {
                 blockingATrade = false;
                 return true;
             }
-
             return super.isTrading();
         }
 
@@ -196,9 +190,7 @@ public class WanderingTraderController extends MobEntityController {
                 if (list != null) {
                     list.clear();
                 }
-
             }
-
             return super.mobInteract(entityhuman, enumhand);
         }
 
@@ -216,7 +208,6 @@ public class WanderingTraderController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -226,7 +217,6 @@ public class WanderingTraderController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -237,7 +227,6 @@ public class WanderingTraderController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -261,7 +250,6 @@ public class WanderingTraderController extends MobEntityController {
             if (npc == null) {
                 super.thunderHit(worldserver, entitylightning);
             }
-
         }
 
         @Override
@@ -271,7 +259,6 @@ public class WanderingTraderController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -283,7 +270,6 @@ public class WanderingTraderController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WitchController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WitchController.java
index aca24c2c6..536a8b29a 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WitchController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WitchController.java
@@ -73,7 +73,6 @@ public class WitchController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -81,7 +80,6 @@ public class WitchController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -91,7 +89,6 @@ public class WitchController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -104,7 +101,6 @@ public class WitchController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new WitchNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -174,7 +170,6 @@ public class WitchController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -185,7 +180,6 @@ public class WitchController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -195,7 +189,6 @@ public class WitchController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -217,7 +210,6 @@ public class WitchController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -229,7 +221,6 @@ public class WitchController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WitherController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WitherController.java
index 54cf4bf52..6a0885fcc 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WitherController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WitherController.java
@@ -65,7 +65,6 @@ public class WitherController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -77,10 +76,8 @@ public class WitherController extends MobEntityController {
                 if (npc.useMinecraftAI()) {
                     super.customServerAiStep();
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
@@ -98,7 +95,6 @@ public class WitherController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new WitherNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -166,7 +162,6 @@ public class WitherController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -177,7 +172,6 @@ public class WitherController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -201,7 +195,6 @@ public class WitherController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WolfController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WolfController.java
index a362bd90e..0ba4ff209 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WolfController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/WolfController.java
@@ -76,7 +76,6 @@ public class WolfController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -84,7 +83,6 @@ public class WolfController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -94,7 +92,6 @@ public class WolfController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -107,7 +104,6 @@ public class WolfController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new WolfNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -177,7 +173,6 @@ public class WolfController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -187,7 +182,6 @@ public class WolfController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -198,7 +192,6 @@ public class WolfController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -225,7 +218,6 @@ public class WolfController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -237,7 +229,6 @@ public class WolfController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZoglinController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZoglinController.java
index 2112c0d95..83138ce1f 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZoglinController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZoglinController.java
@@ -73,7 +73,6 @@ public class ZoglinController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -81,7 +80,6 @@ public class ZoglinController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -89,12 +87,10 @@ public class ZoglinController extends MobEntityController {
             if (npc != null) {
                 NMSImpl.updateMinecraftAIState(npc, this);
             }
-
             super.customServerAiStep();
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -107,7 +103,6 @@ public class ZoglinController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ZoglinNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -177,7 +172,6 @@ public class ZoglinController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -188,7 +182,6 @@ public class ZoglinController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -210,7 +203,6 @@ public class ZoglinController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -222,7 +214,6 @@ public class ZoglinController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZombieController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZombieController.java
index eab243ea6..7556c37ec 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZombieController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZombieController.java
@@ -73,7 +73,6 @@ public class ZombieController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -81,7 +80,6 @@ public class ZombieController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -91,7 +89,6 @@ public class ZombieController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -104,7 +101,6 @@ public class ZombieController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ZombieNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -174,7 +170,6 @@ public class ZombieController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -185,7 +180,6 @@ public class ZombieController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -207,7 +201,6 @@ public class ZombieController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -219,7 +212,6 @@ public class ZombieController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZombieHuskController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZombieHuskController.java
index db94dc36b..6b3c5e88e 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZombieHuskController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZombieHuskController.java
@@ -73,7 +73,6 @@ public class ZombieHuskController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -81,7 +80,6 @@ public class ZombieHuskController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -91,7 +89,6 @@ public class ZombieHuskController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -104,7 +101,6 @@ public class ZombieHuskController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ZombieHuskNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -174,7 +170,6 @@ public class ZombieHuskController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -185,7 +180,6 @@ public class ZombieHuskController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -207,7 +201,6 @@ public class ZombieHuskController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -219,7 +212,6 @@ public class ZombieHuskController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZombieVillagerController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZombieVillagerController.java
index 3d403804f..5f3168a51 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZombieVillagerController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ZombieVillagerController.java
@@ -73,7 +73,6 @@ public class ZombieVillagerController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -81,7 +80,6 @@ public class ZombieVillagerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -91,7 +89,6 @@ public class ZombieVillagerController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -104,7 +101,6 @@ public class ZombieVillagerController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ZombieVillagerNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -174,7 +170,6 @@ public class ZombieVillagerController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -185,7 +180,6 @@ public class ZombieVillagerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -207,7 +201,6 @@ public class ZombieVillagerController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -219,7 +212,6 @@ public class ZombieVillagerController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/AreaEffectCloudController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/AreaEffectCloudController.java
index 2358dec94..deb2b22d4 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/AreaEffectCloudController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/AreaEffectCloudController.java
@@ -60,7 +60,6 @@ public class AreaEffectCloudController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new AreaEffectCloudNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -91,7 +90,6 @@ public class AreaEffectCloudController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -102,7 +100,6 @@ public class AreaEffectCloudController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -124,7 +121,6 @@ public class AreaEffectCloudController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -136,7 +132,6 @@ public class AreaEffectCloudController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/BoatController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/BoatController.java
index 2d053d0e4..0044b2714 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/BoatController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/BoatController.java
@@ -72,7 +72,6 @@ public class BoatController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new BoatNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -92,7 +91,6 @@ public class BoatController extends MobEntityController {
                 this.aC = getBoundingBox().maxY;
                 return entityboat_Status;
             }
-
             if (t())
                 return Status.IN_WATER;
             float f = getGroundFriction();
@@ -100,7 +98,6 @@ public class BoatController extends MobEntityController {
                 this.aD = f;
                 return Status.ON_LAND;
             }
-
             return Status.IN_AIR;
         }
 
@@ -121,7 +118,6 @@ public class BoatController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -132,7 +128,6 @@ public class BoatController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -142,7 +137,6 @@ public class BoatController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -172,13 +166,9 @@ public class BoatController extends MobEntityController {
                             this.aC = Math.max(f, this.aC);
                             m = flag | (axisalignedbb.minY < f ? true : false);
                         }
-
                     }
-
                 }
-
             }
-
             return m;
         }
 
@@ -220,9 +210,7 @@ public class BoatController extends MobEntityController {
                         if (getControllingPassenger() instanceof ServerPlayer) {
                             this.aD /= 2.0F;
                         }
-
                     }
-
                     Vec3 vec3d = getDeltaMovement();
                     setDeltaMovement(vec3d.x * this.ap, vec3d.y + d1, vec3d.z * this.ap);
                     this.ar *= this.ap;
@@ -230,18 +218,14 @@ public class BoatController extends MobEntityController {
                         Vec3 vec3d1 = getDeltaMovement();
                         setDeltaMovement(vec3d1.x, vec3d1.y + d2 * 0.0615D, vec3d1.z);
                     }
-
                 }
-
                 move(MoverType.SELF, getDeltaMovement());
                 if (isVehicle()) {
                     setYRot((float) (getYRot() + this.ar));
                 }
-
             } else {
                 super.tick();
             }
-
         }
 
         private Status u() {
@@ -266,13 +250,9 @@ public class BoatController extends MobEntityController {
                                 return Status.UNDER_FLOWING_WATER;
                             flag = true;
                         }
-
                     }
-
                 }
-
             }
-
             return flag ? Status.UNDER_WATER : null;
         }
 
@@ -285,7 +265,6 @@ public class BoatController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/DragonFireballController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/DragonFireballController.java
index 5637f61bf..92a5a4661 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/DragonFireballController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/DragonFireballController.java
@@ -60,7 +60,6 @@ public class DragonFireballController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new DragonFireballNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -91,7 +90,6 @@ public class DragonFireballController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -102,7 +100,6 @@ public class DragonFireballController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -112,7 +109,6 @@ public class DragonFireballController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -134,11 +130,9 @@ public class DragonFireballController extends MobEntityController {
                 if (!npc.isProtected()) {
                     super.tick();
                 }
-
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -150,7 +144,6 @@ public class DragonFireballController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/EggController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/EggController.java
index 06f836810..a59e6da02 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/EggController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/EggController.java
@@ -74,7 +74,6 @@ public class EggController extends AbstractEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new EggNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -105,7 +104,6 @@ public class EggController extends AbstractEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -116,7 +114,6 @@ public class EggController extends AbstractEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -138,11 +135,9 @@ public class EggController extends AbstractEntityController {
                 if (!npc.isProtected()) {
                     super.tick();
                 }
-
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -154,7 +149,6 @@ public class EggController extends AbstractEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/EnderCrystalController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/EnderCrystalController.java
index 7689008ec..bac93b3eb 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/EnderCrystalController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/EnderCrystalController.java
@@ -60,7 +60,6 @@ public class EnderCrystalController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new EnderCrystalNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -91,7 +90,6 @@ public class EnderCrystalController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -102,7 +100,6 @@ public class EnderCrystalController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -124,7 +121,6 @@ public class EnderCrystalController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -136,7 +132,6 @@ public class EnderCrystalController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/EnderPearlController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/EnderPearlController.java
index 9da7407dc..08bf45868 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/EnderPearlController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/EnderPearlController.java
@@ -61,7 +61,6 @@ public class EnderPearlController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new EnderPearlNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -92,7 +91,6 @@ public class EnderPearlController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -103,7 +101,6 @@ public class EnderPearlController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -125,11 +122,9 @@ public class EnderPearlController extends MobEntityController {
                 if (!npc.isProtected()) {
                     super.tick();
                 }
-
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -141,7 +136,6 @@ public class EnderPearlController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/EnderSignalController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/EnderSignalController.java
index a9ace39f1..b50c5e9f9 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/EnderSignalController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/EnderSignalController.java
@@ -61,7 +61,6 @@ public class EnderSignalController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new EnderSignalNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -92,7 +91,6 @@ public class EnderSignalController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -103,7 +101,6 @@ public class EnderSignalController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -125,7 +122,6 @@ public class EnderSignalController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -137,7 +133,6 @@ public class EnderSignalController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/EvokerFangsController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/EvokerFangsController.java
index 30e0e008a..9b1bdc825 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/EvokerFangsController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/EvokerFangsController.java
@@ -58,7 +58,6 @@ public class EvokerFangsController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new EvokerFangsNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -99,7 +98,6 @@ public class EvokerFangsController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -110,7 +108,6 @@ public class EvokerFangsController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -131,7 +128,6 @@ public class EvokerFangsController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -143,7 +139,6 @@ public class EvokerFangsController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ExperienceOrbController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ExperienceOrbController.java
index 5f5235735..26dbb247d 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ExperienceOrbController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ExperienceOrbController.java
@@ -54,7 +54,6 @@ public class ExperienceOrbController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ExperienceOrbNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -85,7 +84,6 @@ public class ExperienceOrbController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -96,7 +94,6 @@ public class ExperienceOrbController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -118,7 +115,6 @@ public class ExperienceOrbController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -130,7 +126,6 @@ public class ExperienceOrbController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/FallingBlockController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/FallingBlockController.java
index 566fafec9..6c0cfaefd 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/FallingBlockController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/FallingBlockController.java
@@ -71,7 +71,6 @@ public class FallingBlockController extends AbstractEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new FallingBlockNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -102,7 +101,6 @@ public class FallingBlockController extends AbstractEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -113,7 +111,6 @@ public class FallingBlockController extends AbstractEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -123,7 +120,6 @@ public class FallingBlockController extends AbstractEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -148,11 +144,9 @@ public class FallingBlockController extends AbstractEntityController {
                     setDeltaMovement(mot);
                     move(MoverType.SELF, mot);
                 }
-
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -164,7 +158,6 @@ public class FallingBlockController extends AbstractEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
 
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/FireworkController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/FireworkController.java
index 4eebab824..2d0a5447e 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/FireworkController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/FireworkController.java
@@ -55,7 +55,6 @@ public class FireworkController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new FireworkNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -86,7 +85,6 @@ public class FireworkController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -97,7 +95,6 @@ public class FireworkController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -119,7 +116,6 @@ public class FireworkController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -131,7 +127,6 @@ public class FireworkController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/FishingHookController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/FishingHookController.java
index 799be4eb5..4e65065cf 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/FishingHookController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/FishingHookController.java
@@ -72,7 +72,6 @@ public class FishingHookController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new FishingHookNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -103,7 +102,6 @@ public class FishingHookController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -114,7 +112,6 @@ public class FishingHookController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -141,7 +138,6 @@ public class FishingHookController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -153,7 +149,6 @@ public class FishingHookController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/GlowItemFrameController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/GlowItemFrameController.java
index d2fa9b1c3..cec58b4f6 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/GlowItemFrameController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/GlowItemFrameController.java
@@ -65,7 +65,6 @@ public class GlowItemFrameController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new GlowItemFrameNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -96,7 +95,6 @@ public class GlowItemFrameController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -107,7 +105,6 @@ public class GlowItemFrameController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -134,7 +131,6 @@ public class GlowItemFrameController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -146,7 +142,6 @@ public class GlowItemFrameController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ItemController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ItemController.java
index 592d3f07b..431c64c16 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ItemController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ItemController.java
@@ -67,7 +67,6 @@ public class ItemController extends AbstractEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ItemNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -97,7 +96,6 @@ public class ItemController extends AbstractEntityController {
             if (npc == null) {
                 super.playerTouch(entityhuman);
             }
-
         }
 
         @Override
@@ -106,7 +104,6 @@ public class ItemController extends AbstractEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -117,7 +114,6 @@ public class ItemController extends AbstractEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -139,7 +135,6 @@ public class ItemController extends AbstractEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -151,7 +146,6 @@ public class ItemController extends AbstractEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ItemFrameController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ItemFrameController.java
index 648325819..ac1aa9a11 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ItemFrameController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ItemFrameController.java
@@ -64,7 +64,6 @@ public class ItemFrameController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ItemFrameNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -95,7 +94,6 @@ public class ItemFrameController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -106,7 +104,6 @@ public class ItemFrameController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -133,7 +130,6 @@ public class ItemFrameController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -145,7 +141,6 @@ public class ItemFrameController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/LargeFireballController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/LargeFireballController.java
index db037e4e7..707230948 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/LargeFireballController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/LargeFireballController.java
@@ -54,7 +54,6 @@ public class LargeFireballController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new LargeFireballNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -85,7 +84,6 @@ public class LargeFireballController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -96,7 +94,6 @@ public class LargeFireballController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -106,7 +103,6 @@ public class LargeFireballController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -128,11 +124,9 @@ public class LargeFireballController extends MobEntityController {
                 if (!npc.isProtected()) {
                     super.tick();
                 }
-
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -144,7 +138,6 @@ public class LargeFireballController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/LeashController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/LeashController.java
index f6467f2d7..14f9f8be5 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/LeashController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/LeashController.java
@@ -55,7 +55,6 @@ public class LeashController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new LeashNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -86,7 +85,6 @@ public class LeashController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -97,7 +95,6 @@ public class LeashController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -124,7 +121,6 @@ public class LeashController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -136,7 +132,6 @@ public class LeashController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/LlamaSpitController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/LlamaSpitController.java
index 909c3fa5e..f8819cf6f 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/LlamaSpitController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/LlamaSpitController.java
@@ -71,7 +71,6 @@ public class LlamaSpitController extends AbstractEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new LlamaSpitNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -102,7 +101,6 @@ public class LlamaSpitController extends AbstractEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -113,7 +111,6 @@ public class LlamaSpitController extends AbstractEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -135,11 +132,9 @@ public class LlamaSpitController extends AbstractEntityController {
                 if (!npc.isProtected()) {
                     super.tick();
                 }
-
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -151,7 +146,6 @@ public class LlamaSpitController extends AbstractEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MarkerController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MarkerController.java
index 95e6ce8ec..a525a7522 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MarkerController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MarkerController.java
@@ -54,7 +54,6 @@ public class MarkerController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new MarkerNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -85,7 +84,6 @@ public class MarkerController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -96,7 +94,6 @@ public class MarkerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -118,7 +115,6 @@ public class MarkerController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -130,7 +126,6 @@ public class MarkerController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartChestController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartChestController.java
index a9b7023ab..53ad8d552 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartChestController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartChestController.java
@@ -55,7 +55,6 @@ public class MinecartChestController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new MinecartChestNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -86,7 +85,6 @@ public class MinecartChestController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -97,7 +95,6 @@ public class MinecartChestController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -119,7 +116,6 @@ public class MinecartChestController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
 
         @Override
@@ -131,7 +127,6 @@ public class MinecartChestController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartCommandController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartCommandController.java
index be100810c..279d36621 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartCommandController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartCommandController.java
@@ -55,7 +55,6 @@ public class MinecartCommandController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new MinecartCommandNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -86,7 +85,6 @@ public class MinecartCommandController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -97,7 +95,6 @@ public class MinecartCommandController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -119,7 +116,6 @@ public class MinecartCommandController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
 
         @Override
@@ -131,7 +127,6 @@ public class MinecartCommandController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartFurnaceController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartFurnaceController.java
index e08a11919..94c35981c 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartFurnaceController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartFurnaceController.java
@@ -55,7 +55,6 @@ public class MinecartFurnaceController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new MinecartFurnaceNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -86,7 +85,6 @@ public class MinecartFurnaceController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -97,7 +95,6 @@ public class MinecartFurnaceController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -119,7 +116,6 @@ public class MinecartFurnaceController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
 
         @Override
@@ -131,7 +127,6 @@ public class MinecartFurnaceController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartHopperController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartHopperController.java
index 0b63be545..18a1bbe9b 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartHopperController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartHopperController.java
@@ -72,7 +72,6 @@ public class MinecartHopperController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -83,7 +82,6 @@ public class MinecartHopperController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -105,7 +103,6 @@ public class MinecartHopperController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
 
         @Override
@@ -117,7 +114,6 @@ public class MinecartHopperController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartRideableController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartRideableController.java
index c943eb960..43397f770 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartRideableController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartRideableController.java
@@ -54,7 +54,6 @@ public class MinecartRideableController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new MinecartRideableNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -85,7 +84,6 @@ public class MinecartRideableController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -96,7 +94,6 @@ public class MinecartRideableController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -118,7 +115,6 @@ public class MinecartRideableController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
 
         @Override
@@ -130,7 +126,6 @@ public class MinecartRideableController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartSpawnerController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartSpawnerController.java
index af0db9d2a..2a21de005 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartSpawnerController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartSpawnerController.java
@@ -72,7 +72,6 @@ public class MinecartSpawnerController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -83,7 +82,6 @@ public class MinecartSpawnerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -105,7 +103,6 @@ public class MinecartSpawnerController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
 
         @Override
@@ -117,7 +114,6 @@ public class MinecartSpawnerController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartTNTController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartTNTController.java
index bf4c9b357..c9d0bbb87 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartTNTController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/MinecartTNTController.java
@@ -72,7 +72,6 @@ public class MinecartTNTController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -83,7 +82,6 @@ public class MinecartTNTController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -105,7 +103,6 @@ public class MinecartTNTController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
 
         @Override
@@ -117,7 +114,6 @@ public class MinecartTNTController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/PaintingController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/PaintingController.java
index 660c6f46a..8c47604c9 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/PaintingController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/PaintingController.java
@@ -54,7 +54,6 @@ public class PaintingController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new PaintingNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -85,7 +84,6 @@ public class PaintingController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -96,7 +94,6 @@ public class PaintingController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -123,7 +120,6 @@ public class PaintingController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -135,7 +131,6 @@ public class PaintingController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ShulkerBulletController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ShulkerBulletController.java
index 0ebaeea90..a13632b32 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ShulkerBulletController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ShulkerBulletController.java
@@ -54,7 +54,6 @@ public class ShulkerBulletController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ShulkerBulletNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -85,7 +84,6 @@ public class ShulkerBulletController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -96,7 +94,6 @@ public class ShulkerBulletController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -118,7 +115,6 @@ public class ShulkerBulletController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -130,7 +126,6 @@ public class ShulkerBulletController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/SmallFireballController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/SmallFireballController.java
index aedb0b700..e02612a34 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/SmallFireballController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/SmallFireballController.java
@@ -54,7 +54,6 @@ public class SmallFireballController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SmallFireballNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -85,7 +84,6 @@ public class SmallFireballController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -96,7 +94,6 @@ public class SmallFireballController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -118,11 +115,9 @@ public class SmallFireballController extends MobEntityController {
                 if (!npc.isProtected()) {
                     super.tick();
                 }
-
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -134,7 +129,6 @@ public class SmallFireballController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/SnowballController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/SnowballController.java
index fda9227aa..94dbf991c 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/SnowballController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/SnowballController.java
@@ -54,7 +54,6 @@ public class SnowballController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SnowballNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -85,7 +84,6 @@ public class SnowballController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -96,7 +94,6 @@ public class SnowballController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -118,7 +115,6 @@ public class SnowballController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -130,7 +126,6 @@ public class SnowballController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/SpectralArrowController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/SpectralArrowController.java
index 4ba364c20..548518765 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/SpectralArrowController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/SpectralArrowController.java
@@ -55,7 +55,6 @@ public class SpectralArrowController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SpectralArrowNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -86,7 +85,6 @@ public class SpectralArrowController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -97,7 +95,6 @@ public class SpectralArrowController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -119,7 +116,6 @@ public class SpectralArrowController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -131,7 +127,6 @@ public class SpectralArrowController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/TNTPrimedController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/TNTPrimedController.java
index aa6f69735..4282e6cbd 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/TNTPrimedController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/TNTPrimedController.java
@@ -55,7 +55,6 @@ public class TNTPrimedController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new TNTPrimedNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -86,7 +85,6 @@ public class TNTPrimedController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -97,7 +95,6 @@ public class TNTPrimedController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -119,7 +116,6 @@ public class TNTPrimedController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -131,7 +127,6 @@ public class TNTPrimedController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ThrownExpBottleController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ThrownExpBottleController.java
index 3f6b8d804..85fc578bd 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ThrownExpBottleController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ThrownExpBottleController.java
@@ -55,7 +55,6 @@ public class ThrownExpBottleController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ThrownExpBottleNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -86,7 +85,6 @@ public class ThrownExpBottleController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -97,7 +95,6 @@ public class ThrownExpBottleController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -119,11 +116,9 @@ public class ThrownExpBottleController extends MobEntityController {
                 if (!npc.isProtected()) {
                     super.tick();
                 }
-
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -135,7 +130,6 @@ public class ThrownExpBottleController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ThrownPotionController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ThrownPotionController.java
index 092d802a0..5db3e9ab5 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ThrownPotionController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ThrownPotionController.java
@@ -58,9 +58,7 @@ public class ThrownPotionController extends MobEntityController {
                 } else {
                     NMSImpl.setBukkitEntity(this, new SplashThrownPotionNPC(this));
                 }
-
             }
-
             return super.getBukkitEntity();
         }
 
@@ -91,7 +89,6 @@ public class ThrownPotionController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -102,7 +99,6 @@ public class ThrownPotionController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -124,7 +120,6 @@ public class ThrownPotionController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -136,7 +131,6 @@ public class ThrownPotionController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ThrownTridentController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ThrownTridentController.java
index 8b9ffad57..707af0e03 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ThrownTridentController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/ThrownTridentController.java
@@ -55,7 +55,6 @@ public class ThrownTridentController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ThrownTridentNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -86,7 +85,6 @@ public class ThrownTridentController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -97,7 +95,6 @@ public class ThrownTridentController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -119,7 +116,6 @@ public class ThrownTridentController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -131,7 +127,6 @@ public class ThrownTridentController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/TippedArrowController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/TippedArrowController.java
index 8b0741fb5..7bc999ec0 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/TippedArrowController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/TippedArrowController.java
@@ -54,7 +54,6 @@ public class TippedArrowController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new TippedArrowNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -85,7 +84,6 @@ public class TippedArrowController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -96,7 +94,6 @@ public class TippedArrowController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -118,7 +115,6 @@ public class TippedArrowController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -130,7 +126,6 @@ public class TippedArrowController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/WitherSkullController.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/WitherSkullController.java
index bec9c7bd3..85429cc91 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/WitherSkullController.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/WitherSkullController.java
@@ -54,7 +54,6 @@ public class WitherSkullController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new WitherSkullNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -85,7 +84,6 @@ public class WitherSkullController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -96,7 +94,6 @@ public class WitherSkullController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -118,7 +115,6 @@ public class WitherSkullController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -130,7 +126,6 @@ public class WitherSkullController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/CitizensBlockBreaker.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/CitizensBlockBreaker.java
index 48755edcc..39efcf30d 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/CitizensBlockBreaker.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/CitizensBlockBreaker.java
@@ -47,7 +47,6 @@ public class CitizensBlockBreaker extends AbstractBlockBreaker {
             ItemStack current = getCurrentItem();
             return current != null ? current.isCorrectToolForDrops(block) : false;
         }
-
     }
 
     @Override
@@ -66,13 +65,10 @@ public class CitizensBlockBreaker extends AbstractBlockBreaker {
                 if (i > 0) {
                     f += i * i + 1;
                 }
-
             }
-
             if (MobEffectUtil.hasDigSpeed(handle)) {
                 f *= 1.0F + (MobEffectUtil.getDigSpeedAmplification(handle) + 1) * 0.2F;
             }
-
             if (handle.hasEffect(MobEffects.DIG_SLOWDOWN)) {
                 float f1 = 1.0F;
                 switch (handle.getEffect(MobEffects.DIG_SLOWDOWN).getAmplifier()) {
@@ -89,20 +85,15 @@ public class CitizensBlockBreaker extends AbstractBlockBreaker {
                     default:
                         f1 = 8.1E-4F;
                 }
-
                 f *= f1;
             }
-
             if (handle.isEyeInFluid(FluidTags.WATER) && !EnchantmentHelper.hasAquaAffinity(handle)) {
                 f /= 5.0F;
             }
-
         }
-
         if (!entity.isOnGround()) {
             f /= 5.0F;
         }
-
         return f;
     }
 }
\ No newline at end of file
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/EmptyAdvancementDataPlayer.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/EmptyAdvancementDataPlayer.java
index 246cfd929..cff3d03ad 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/EmptyAdvancementDataPlayer.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/EmptyAdvancementDataPlayer.java
@@ -68,7 +68,6 @@ public class EmptyAdvancementDataPlayer extends PlayerAdvancements {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     private static final MethodHandle I = NMS.getGetter(PlayerAdvancements.class, "i");
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/EntityMoveControl.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/EntityMoveControl.java
index 6542b79f4..d8a356a39 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/EntityMoveControl.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/EntityMoveControl.java
@@ -64,18 +64,15 @@ public class EntityMoveControl extends MoveControl {
         if (f3 > f2) {
             f3 = f2;
         }
-
         if (f3 < -f2) {
             f3 = -f2;
         }
-
         float f4 = f + f3;
         if (f4 < 0.0F) {
             f4 += 360.0F;
         } else if (f4 > 360.0F) {
             f4 -= 360.0F;
         }
-
         return f4;
     }
 
@@ -105,7 +102,6 @@ public class EntityMoveControl extends MoveControl {
                 this.entity.setYRot(rotlerp(this.entity.getYRot(), f, 90.0F));
                 NMS.setHeadYaw(entity.getBukkitEntity(), this.entity.getYRot());
             }
-
             float movement = (float) (this.speedMod * this.entity.getAttribute(Attributes.MOVEMENT_SPEED).getValue());
             this.entity.setSpeed(movement);
             this.entity.zza = movement;
@@ -114,17 +110,13 @@ public class EntityMoveControl extends MoveControl {
                 if (((Slime) entity).isAggressive()) {
                     this.jumpTicks /= 3;
                 }
-
                 ((Slime) entity).getJumpControl().jump();
             } else if (dY >= NMS.getStepHeight(entity.getBukkitEntity()) && dXZ < 0.4D) {
                 if (entity instanceof Mob) {
                     ((Mob) entity).getJumpControl().jump();
                 }
-
                 entity.setJumping(true);
             }
-
         }
-
     }
 }
\ No newline at end of file
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/EntityNavigation.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/EntityNavigation.java
index 790ca946f..4713a413e 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/EntityNavigation.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/EntityNavigation.java
@@ -191,26 +191,21 @@ public class EntityNavigation extends PathNavigation {
             while (var2.getY() > this.level.getMinBuildHeight() && this.level.getBlockState(var2).isAir()) {
                 var2 = var2.below();
             }
-
             if (var2.getY() > this.level.getMinBuildHeight())
                 return supercreatePath(var2.above(), var1);
             while (var2.getY() < this.level.getMaxBuildHeight() && this.level.getBlockState(var2).isAir()) {
                 var2 = var2.above();
             }
-
             var0 = var2;
         }
-
         if (this.level.getBlockState(var0).getMaterial().isSolid()) {
             BlockPos var2 = var0.above();
             while (var2.getY() < this.level.getMaxBuildHeight()
                     && this.level.getBlockState(var2).getMaterial().isSolid()) {
                 var2 = var2.above();
             }
-
             return supercreatePath(var2, var1);
         }
-
         return supercreatePath(var0, var1);
     }
 
@@ -252,7 +247,6 @@ public class EntityNavigation extends PathNavigation {
             this.reachRange = var3;
             resetStuckTimeout();
         }
-
         return var8;
     }
 
@@ -275,11 +269,9 @@ public class EntityNavigation extends PathNavigation {
             } else {
                 this.isStuck = false;
             }
-
             this.lastStuckCheck = this.tick;
             this.lastStuckCheckPos = var0;
         }
-
         if (this.path != null && !this.path.isDone()) {
             BlockPos blockPos = this.path.getNextNodePos();
             if (blockPos.equals(this.timeoutCachedNode)) {
@@ -289,14 +281,11 @@ public class EntityNavigation extends PathNavigation {
                 double var2 = var0.distanceTo(Vec3.atBottomCenterOf(this.timeoutCachedNode));
                 this.timeoutLimit = this.mob.getSpeed() > 0.0F ? var2 / this.mob.getSpeed() * 1000.0D : 0.0D;
             }
-
             if (this.timeoutLimit > 0.0D && this.timeoutTimer > this.timeoutLimit * 3.0D) {
                 timeoutPath();
             }
-
             this.lastTimeoutCheck = System.currentTimeMillis();
         }
-
     }
 
     @Override
@@ -312,7 +301,6 @@ public class EntityNavigation extends PathNavigation {
         if (var8 || canCutCorner(this.path.getNextNode().type) && shouldTargetNextNodeInDirection(var0)) {
             this.path.advance();
         }
-
         doStuckDetection(var0);
     }
 
@@ -347,7 +335,6 @@ public class EntityNavigation extends PathNavigation {
             if (++var2 > 16)
                 return this.mob.getBlockY();
         }
-
         return var0;
     }
 
@@ -410,11 +397,9 @@ public class EntityNavigation extends PathNavigation {
             this.path = null;
             return false;
         }
-
         if (!var0.sameAs(this.path)) {
             this.path = var0;
         }
-
         if (isDone())
             return false;
         trimPath();
@@ -436,11 +421,9 @@ public class EntityNavigation extends PathNavigation {
                 this.timeLastRecompute = this.level.getGameTime();
                 this.hasDelayedRecomputation = false;
             }
-
         } else {
             this.hasDelayedRecomputation = true;
         }
-
     }
 
     @Override
@@ -497,7 +480,6 @@ public class EntityNavigation extends PathNavigation {
                     (var1.z + this.mob.getZ()) / 2.0D);
             return var0.closerToCenterThan(var2, this.path.getNodeCount() - this.path.getNextNodeIndex());
         }
-
     }
 
     private boolean shouldTargetNextNodeInDirection(Vec3 var0) {
@@ -533,11 +515,8 @@ public class EntityNavigation extends PathNavigation {
                 if (var2 != null && var1.y >= var2.y) {
                     this.path.replaceNode(var0 + 1, var1.cloneAndMove(var2.x, var1.y + 1, var2.z));
                 }
-
             }
-
         }
-
     }
 
     @Override
@@ -546,7 +525,6 @@ public class EntityNavigation extends PathNavigation {
         if (this.hasDelayedRecomputation) {
             recomputePath();
         }
-
         if (isDone())
             return;
         if (canUpdatePath()) {
@@ -558,9 +536,7 @@ public class EntityNavigation extends PathNavigation {
                     && Mth.floor(vec31.z) == Mth.floor(vec32.z)) {
                 this.path.advance();
             }
-
         }
-
         if (isDone())
             return;
         Vec3 var0 = this.path.getNextEntityPos(this.mob);
@@ -586,11 +562,8 @@ public class EntityNavigation extends PathNavigation {
                     this.path.truncateNodes(var0);
                     return;
                 }
-
             }
-
         }
-
     }
 
     private static Mob getDummyInsentient(EntityHumanNPC from, Level world) {
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/EntityNodeEvaluator.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/EntityNodeEvaluator.java
index 3096a420c..964362ba3 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/EntityNodeEvaluator.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/EntityNodeEvaluator.java
@@ -48,7 +48,6 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
             if (hasCollisions(var2))
                 return false;
         }
-
         return true;
     }
 
@@ -65,22 +64,18 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
         if (var4 == BlockPathTypes.DOOR_WOOD_CLOSED && var1 && var2) {
             var4 = BlockPathTypes.WALKABLE_DOOR;
         }
-
         if (var4 == BlockPathTypes.DOOR_OPEN && !var2) {
             var4 = BlockPathTypes.BLOCKED;
         }
-
         if (var4 == BlockPathTypes.RAIL
                 && !(var0.getBlockState(var3).getBlock() instanceof net.minecraft.world.level.block.BaseRailBlock)
                 && !(var0.getBlockState(var3.below())
                         .getBlock() instanceof net.minecraft.world.level.block.BaseRailBlock)) {
             var4 = BlockPathTypes.UNPASSABLE_RAIL;
         }
-
         if (var4 == BlockPathTypes.LEAVES) {
             var4 = BlockPathTypes.BLOCKED;
         }
-
         return var4;
     }
 
@@ -99,11 +94,9 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
             var8.type = var12;
             var8.costMalus = Math.max(var8.costMalus, var13);
         }
-
         if (var7 == BlockPathTypes.FENCE && var8 != null && var8.costMalus >= 0.0F && !canReachWithoutCollision(var8)) {
             var8 = null;
         }
-
         if (var12 == BlockPathTypes.WALKABLE || isAmphibious() && var12 == BlockPathTypes.WATER)
             return var8;
         if ((var8 == null || var8.costMalus < 0.0F) && var3 > 0 && var12 != BlockPathTypes.FENCE
@@ -122,11 +115,8 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
                 if (hasCollisions(var20)) {
                     var8 = null;
                 }
-
             }
-
         }
-
         if (!isAmphibious() && var12 == BlockPathTypes.WATER && !canFloat()) {
             if (getCachedBlockType(this.mob, var0, var1 - 1, var2) != BlockPathTypes.WATER)
                 return var8;
@@ -139,12 +129,9 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
                     var8.costMalus = Math.max(var8.costMalus, this.mvmt.getPathfindingMalus(var12));
                     continue;
                 }
-
                 return var8;
             }
-
         }
-
         if (var12 == BlockPathTypes.OPEN) {
             int var16 = 0;
             int var17 = var1;
@@ -156,14 +143,12 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
                     var18.costMalus = -1.0F;
                     return var18;
                 }
-
                 if (var16++ >= this.mob.getMaxFallDistance()) {
                     Node var18 = getNode(var0, var1, var2);
                     var18.type = BlockPathTypes.BLOCKED;
                     var18.costMalus = -1.0F;
                     return var18;
                 }
-
                 var12 = getCachedBlockType(this.mob, var0, var1, var2);
                 var13 = this.mvmt.getPathfindingMalus(var12);
                 if (var12 != BlockPathTypes.OPEN && var13 >= 0.0F) {
@@ -172,25 +157,20 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
                     var8.costMalus = Math.max(var8.costMalus, var13);
                     break;
                 }
-
                 if (var13 < 0.0F) {
                     Node var18 = getNode(var0, var1, var2);
                     var18.type = BlockPathTypes.BLOCKED;
                     var18.costMalus = -1.0F;
                     return var18;
                 }
-
             }
-
         }
-
         if (var12 == BlockPathTypes.FENCE) {
             var8 = getNode(var0, var1, var2);
             var8.closed = true;
             var8.type = var12;
             var8.costMalus = var12.getMalus();
         }
-
         return var8;
     }
 
@@ -216,9 +196,7 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
             if (mvmt.getPathfindingMalus(var15) >= mvmt.getPathfindingMalus(var13)) {
                 var13 = var15;
             }
-
         }
-
         if (var11 == BlockPathTypes.OPEN && mvmt.getPathfindingMalus(var13) == 0.0F && var5 <= 1)
             return BlockPathTypes.OPEN;
         return var13;
@@ -242,9 +220,7 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
             if (var4.getPathfindingMalus(var15) >= var4.getPathfindingMalus(var13)) {
                 var13 = var15;
             }
-
         }
-
         if (var11 == BlockPathTypes.OPEN && var4.getPathfindingMalus(var13) == 0.0F && var5 <= 1)
             return BlockPathTypes.OPEN;
         return var13;
@@ -271,9 +247,7 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
             if (mvmt.getPathfindingMalus(var15) >= mvmt.getPathfindingMalus(var13)) {
                 var13 = var15;
             }
-
         }
-
         if (var11 == BlockPathTypes.OPEN && mvmt.getPathfindingMalus(var13) == 0.0F && var5 <= 1)
             return BlockPathTypes.OPEN;
         return var13;
@@ -292,14 +266,10 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
                     if (var12 == 0 && var13 == 0 && var14 == 0) {
                         var10 = var18;
                     }
-
                     var9.add(var18);
                 }
-
             }
-
         }
-
         return var10;
     }
 
@@ -333,48 +303,39 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
         if (this.mvmt.getPathfindingMalus(var4) >= 0.0F && var5 != BlockPathTypes.STICKY_HONEY) {
             var3 = Mth.floor(Math.max(1.0F, this.mob.maxUpStep));
         }
-
         double var6 = getFloorLevel(new BlockPos(var1.x, var1.y, var1.z));
         Node var8 = findAcceptedNode(var1.x, var1.y, var1.z + 1, var3, var6, Direction.SOUTH, var5);
         if (isNeighborValid(var8, var1)) {
             var0[var2++] = var8;
         }
-
         Node var9 = findAcceptedNode(var1.x - 1, var1.y, var1.z, var3, var6, Direction.WEST, var5);
         if (isNeighborValid(var9, var1)) {
             var0[var2++] = var9;
         }
-
         Node var10 = findAcceptedNode(var1.x + 1, var1.y, var1.z, var3, var6, Direction.EAST, var5);
         if (isNeighborValid(var10, var1)) {
             var0[var2++] = var10;
         }
-
         Node var11 = findAcceptedNode(var1.x, var1.y, var1.z - 1, var3, var6, Direction.NORTH, var5);
         if (isNeighborValid(var11, var1)) {
             var0[var2++] = var11;
         }
-
         Node var12 = findAcceptedNode(var1.x - 1, var1.y, var1.z - 1, var3, var6, Direction.NORTH, var5);
         if (isDiagonalValid(var1, var9, var11, var12)) {
             var0[var2++] = var12;
         }
-
         Node var13 = findAcceptedNode(var1.x + 1, var1.y, var1.z - 1, var3, var6, Direction.NORTH, var5);
         if (isDiagonalValid(var1, var10, var11, var13)) {
             var0[var2++] = var13;
         }
-
         Node var14 = findAcceptedNode(var1.x - 1, var1.y, var1.z + 1, var3, var6, Direction.SOUTH, var5);
         if (isDiagonalValid(var1, var9, var8, var14)) {
             var0[var2++] = var14;
         }
-
         Node var15 = findAcceptedNode(var1.x + 1, var1.y, var1.z + 1, var3, var6, Direction.SOUTH, var5);
         if (isDiagonalValid(var1, var10, var8, var15)) {
             var0[var2++] = var15;
         }
-
         return var2;
     }
 
@@ -388,14 +349,12 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
                 var0++;
                 var2 = this.level.getBlockState(var1.set(this.mob.getX(), var0, this.mob.getZ()));
             }
-
             var0--;
         } else if (canFloat() && this.mob.isInWater()) {
             while (var2.is(Blocks.WATER) || var2.getFluidState() == Fluids.WATER.getSource(false)) {
                 var0++;
                 var2 = this.level.getBlockState(var1.set(this.mob.getX(), var0, this.mob.getZ()));
             }
-
             var0--;
         } else if (this.mob.isOnGround()) {
             var0 = Mth.floor(this.mob.getY() + 0.5D);
@@ -406,10 +365,8 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
                     && blockPos.getY() > this.mob.level.getMinBuildHeight()) {
                 blockPos = blockPos.below();
             }
-
             var0 = blockPos.above().getY();
         }
-
         BlockPos var3 = this.mob.blockPosition();
         BlockPathTypes var4 = getCachedBlockType(this.mob, var3.getX(), var0, var3.getZ());
         if (this.mvmt.getPathfindingMalus(var4) < 0.0F) {
@@ -423,9 +380,7 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
                 var6.costMalus = this.mvmt.getPathfindingMalus(var6.type);
                 return var6;
             }
-
         }
-
         Node var5 = getNode(var3.getX(), var0, var3.getZ());
         var5.type = getBlockPathType(this.mob, var5.asBlockPos());
         var5.costMalus = this.mvmt.getPathfindingMalus(var5.type);
@@ -489,13 +444,9 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
                         if (var0.getFluidState(var1).is(FluidTags.WATER))
                             return BlockPathTypes.WATER_BORDER;
                     }
-
                 }
-
             }
-
         }
-
         return var2;
     }
 
@@ -555,25 +506,19 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
             if (var6 == BlockPathTypes.DAMAGE_FIRE) {
                 var5 = BlockPathTypes.DAMAGE_FIRE;
             }
-
             if (var6 == BlockPathTypes.DAMAGE_CACTUS) {
                 var5 = BlockPathTypes.DAMAGE_CACTUS;
             }
-
             if (var6 == BlockPathTypes.DAMAGE_OTHER) {
                 var5 = BlockPathTypes.DAMAGE_OTHER;
             }
-
             if (var6 == BlockPathTypes.STICKY_HONEY) {
                 var5 = BlockPathTypes.STICKY_HONEY;
             }
-
         }
-
         if (var5 == BlockPathTypes.WALKABLE) {
             var5 = checkNeighbourBlocks(var0, var1.set(var2, var3, var4), var5);
         }
-
         return var5;
     }
 
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/EntityPathfinder.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/EntityPathfinder.java
index d571171ff..347cc12ca 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/EntityPathfinder.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/EntityPathfinder.java
@@ -90,17 +90,13 @@ public class EntityPathfinder extends PathFinder {
                     target.setReached();
                     var9.add(target);
                 }
-
             }
-
             if (!var9.isEmpty()) {
                 break;
             }
-
             if (node.distanceTo(var1) >= var3) {
                 continue;
             }
-
             int i = this.nodeEvaluator.getNeighbors(this.neighbors, node);
             for (int var13 = 0; var13 < i; var13++) {
                 Node var14 = this.neighbors[var13];
@@ -117,13 +113,9 @@ public class EntityPathfinder extends PathFinder {
                         var14.f = var14.g + var14.h;
                         this.openSet.insert(var14);
                     }
-
                 }
-
             }
-
         }
-
         Optional<Path> var11 = !var9.isEmpty()
                 ? var9.stream().map(p -> reconstructPath(p.getBestNode(), var2.get(p), true)).min(
                         Comparator.comparingInt(Path::getNodeCount))
@@ -142,7 +134,6 @@ public class EntityPathfinder extends PathFinder {
             var4.updateBest(var5, var0);
             var2 = Math.min(var5, var2);
         }
-
         return var2;
     }
 
@@ -161,7 +152,6 @@ public class EntityPathfinder extends PathFinder {
             var4 = var4.cameFrom;
             var3.add(0, var4);
         }
-
         return new Path(var3, var1, var2);
     }
 }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/ForwardingNPCHolder.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/ForwardingNPCHolder.java
index 6fb1de5f3..097ad1c10 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/ForwardingNPCHolder.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/ForwardingNPCHolder.java
@@ -17,7 +17,6 @@ public interface ForwardingNPCHolder extends NPCHolder, Entity {
                     () -> Joiner.on(' ').join("ForwardingNPCHolder with an improper bukkit entity", this, handle));
             return null;
         }
-
         return ((NPCHolder) handle).getNPC();
     }
 }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/MobAI.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/MobAI.java
index 271c1a84e..2a4f7fb32 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/MobAI.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/MobAI.java
@@ -41,7 +41,6 @@ public interface MobAI {
         if (!nav.isDone()) {
             nav.tick();
         }
-
     }
 
     default void updatePathfindingRange(float range) {
@@ -171,7 +170,6 @@ public interface MobAI {
             };
         } else if (handle instanceof MobAI)
             return (MobAI) handle;
-
         return null;
     }
 }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/NMSImpl.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/NMSImpl.java
index 9547b8a24..120530e77 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/NMSImpl.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/NMSImpl.java
@@ -353,21 +353,17 @@ public class NMSImpl implements NMSBridge {
                 viewDistance = (int) PLAYER_CHUNK_MAP_VIEW_DISTANCE_GETTER.invoke(chunkMap);
                 PLAYER_CHUNK_MAP_VIEW_DISTANCE_SETTER.invoke(chunkMap, -1);
             }
-
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         boolean success = getHandle(entity).level.addFreshEntity(getHandle(entity), custom);
         try {
             if (chunkMap != null) {
                 PLAYER_CHUNK_MAP_VIEW_DISTANCE_SETTER.invoke(chunkMap, viewDistance);
             }
-
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         return success;
     }
 
@@ -383,14 +379,12 @@ public class NMSImpl implements NMSBridge {
         } else if (!handle.level.players().contains(handle)) {
             ((List) handle.level.players()).add(handle);
         }
-
         try {
             CHUNKMAP_UPDATE_PLAYER_STATUS.invoke(((ServerLevel) handle.level).getChunkSource().chunkMap, handle,
                     !remove);
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         // PlayerUpdateTask.addOrRemove(entity, remove);
     }
 
@@ -403,12 +397,10 @@ public class NMSImpl implements NMSBridge {
             PlayerAnimation.ARM_SWING.play((Player) source.getBukkitEntity());
             return;
         }
-
         if (source instanceof Mob) {
             ((Mob) source).doHurtTarget(target);
             return;
         }
-
         float f = (float) (source.getAttributes().hasAttribute(Attributes.ATTACK_DAMAGE)
                 ? source.getAttributeValue(Attributes.ATTACK_DAMAGE)
                 : 1f);
@@ -423,12 +415,10 @@ public class NMSImpl implements NMSBridge {
                     Math.cos(source.getYRot() * Math.PI / 180.0F) * i * 0.5F);
             source.setDeltaMovement(source.getDeltaMovement().multiply(0.6, 1, 0.6));
         }
-
         int fireAspectLevel = EnchantmentHelper.getFireAspect(source);
         if (fireAspectLevel > 0) {
             target.setSecondsOnFire(fireAspectLevel * 4, false);
         }
-
         if (target instanceof ServerPlayer) {
             ServerPlayer entityhuman = (ServerPlayer) target;
             ItemStack itemstack = source.getMainHandItem();
@@ -440,11 +430,8 @@ public class NMSImpl implements NMSBridge {
                     entityhuman.getCooldowns().addCooldown(Items.SHIELD, 100);
                     source.level.broadcastEntityEvent(entityhuman, (byte) 30);
                 }
-
             }
-
         }
-
         EnchantmentHelper.doPostHurtEffects(source, target);
         EnchantmentHelper.doPostDamageEffects(target, source);
     }
@@ -463,9 +450,7 @@ public class NMSImpl implements NMSBridge {
             } catch (Throwable t) {
                 t.printStackTrace();
             }
-
         }
-
     }
 
     @Override
@@ -496,21 +481,16 @@ public class NMSImpl implements NMSBridge {
                         if (!changed && !ItemStack.matches(old, curr)) {
                             changed = true;
                         }
-
                         equipment.put(slot, curr);
                     }
-
                     if (changed) {
                         List<com.mojang.datafixers.util.Pair<EquipmentSlot, ItemStack>> vals = Lists.newArrayList();
                         for (EquipmentSlot slot : EquipmentSlot.values()) {
                             vals.add(com.mojang.datafixers.util.Pair.of(slot, equipment.get(slot)));
                         }
-
                         agg.send(new ClientboundSetEquipmentPacket(handle.getId(), vals));
                     }
-
                 }
-
                 tracker.sendChanges();
             }
 
@@ -531,9 +511,7 @@ public class NMSImpl implements NMSBridge {
                     if (callback != null) {
                         callback.accept(entity);
                     }
-
                 }
-
                 linked.clear();
             }
         };
@@ -582,13 +560,10 @@ public class NMSImpl implements NMSBridge {
                 if (df != null) {
                     bserver = df.dragonEvent;
                 }
-
             }
-
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         if (bserver == null)
             return null;
         BossBar ret = Bukkit.createBossBar("", BarColor.BLUE, BarStyle.SEGMENTED_10);
@@ -597,7 +572,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         return ret;
     }
 
@@ -708,14 +682,12 @@ public class NMSImpl implements NMSBridge {
             if (SKULL_META_PROFILE == null)
                 return null;
         }
-
         try {
             return (GameProfile) SKULL_META_PROFILE.invoke(meta);
         } catch (Throwable t) {
             t.printStackTrace();
             return null;
         }
-
     }
 
     @Override
@@ -728,7 +700,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             throw new CommandException(Messages.INVALID_SOUND);
         }
-
     }
 
     @Override
@@ -744,7 +715,6 @@ public class NMSImpl implements NMSBridge {
         LivingEntity handle = NMSImpl.getHandle((org.bukkit.entity.LivingEntity) npc.getEntity());
         if (handle == null) {
         }
-
         return DEFAULT_SPEED;
         // return (float)
         // handle.getAttribute(Attributes.d).getValue();
@@ -788,9 +758,7 @@ public class NMSImpl implements NMSBridge {
             } else {
                 ((Mob) raw).setPathfindingMalus(BlockPathTypes.WATER, oldWater + 1F);
             }
-
         }
-
         navigation.getNodeEvaluator().setCanOpenDoors(params.hasExaminer(DoorExaminer.class));
         return new MCNavigator() {
             float lastSpeed;
@@ -802,7 +770,6 @@ public class NMSImpl implements NMSBridge {
                     Node pp = path.getNode(i);
                     blocks.add(entity.getWorld().getBlockAt(pp.x, pp.y, pp.z));
                 }
-
                 return blocks;
             }
 
@@ -823,16 +790,13 @@ public class NMSImpl implements NMSBridge {
                     List<org.bukkit.block.Block> blocks = getBlocks(entity, path);
                     Util.sendBlockChanges(blocks, null);
                 }
-
                 if (oldWater >= 0) {
                     if (raw instanceof MobAI) {
                         ((MobAI) raw).setPathfindingMalus(BlockPathTypes.WATER, oldWater);
                     } else {
                         ((Mob) raw).setPathfindingMalus(BlockPathTypes.WATER, oldWater);
                     }
-
                 }
-
                 navigation.stop();
             }
 
@@ -847,15 +811,12 @@ public class NMSImpl implements NMSBridge {
                             SIZE_FIELD_SETTER.invoke(handle,
                                     new EntityDimensions(Math.min(0.99F, size.width), size.height, false));
                         }
-
                     } catch (Throwable e) {
                         e.printStackTrace();
                     }
-
                     if (!function.apply(navigation)) {
                         reason = CancelReason.STUCK;
                     }
-
                     try {
                         SIZE_FIELD_SETTER.invoke(handle, size);
                     } catch (Throwable e) {
@@ -863,14 +824,11 @@ public class NMSImpl implements NMSBridge {
                         // minecraft requires that an entity fit onto both blocks if width >= 1f, but we'd prefer to
                         // make it just fit on 1 so hack around it a bit.
                     }
-
                     lastSpeed = params.speed();
                 }
-
                 if (params.debug() && !navigation.isDone()) {
                     Util.sendBlockChanges(getBlocks(entity, getPathEntity(navigation)), Material.DANDELION);
                 }
-
                 navigation.setSpeedModifier(params.speed());
                 return navigation.isDone();
             }
@@ -1097,37 +1055,30 @@ public class NMSImpl implements NMSBridge {
             if (zDiff < 0.0) {
                 yaw += Math.abs(180 - yaw) * 2;
             }
-
             if (handle.getBukkitEntity().getType() == EntityType.ENDER_DRAGON) {
                 yaw = Util.getDragonYaw(handle.getBukkitEntity(), xDiff, zDiff);
             } else {
                 yaw = yaw - 90;
             }
-
             if (headOnly) {
                 setHeadYaw(entity, (float) yaw);
             } else {
                 look(entity, (float) yaw, (float) pitch);
             }
-
             return;
         }
-
         if (handle instanceof Mob) {
             ((Mob) handle).getLookControl().setLookAt(to.getX(), to.getY(), to.getZ(), ((Mob) handle).getHeadRotSpeed(),
                     ((Mob) handle).getMaxHeadXRot());
             while (((LivingEntity) handle).yHeadRot >= 180F) {
                 ((LivingEntity) handle).yHeadRot -= 360F;
             }
-
             while (((LivingEntity) handle).yHeadRot < -180F) {
                 ((LivingEntity) handle).yHeadRot += 360F;
             }
-
         } else if (handle instanceof NPCHolder) {
             ((NPCHolder) handle).getNPC().getOrAddTrait(RotationTrait.class).getPhysicalSession().rotateToFace(to);
         }
-
     }
 
     @Override
@@ -1140,22 +1091,18 @@ public class NMSImpl implements NMSBridge {
             } else {
                 look(from, to.getLocation(), false, true);
             }
-
         } else if (handle instanceof Mob) {
             ((Mob) handle).getLookControl().setLookAt(target, ((Mob) handle).getHeadRotSpeed(),
                     ((Mob) handle).getMaxHeadXRot());
             while (((LivingEntity) handle).yHeadRot >= 180F) {
                 ((LivingEntity) handle).yHeadRot -= 360F;
             }
-
             while (((LivingEntity) handle).yHeadRot < -180F) {
                 ((LivingEntity) handle).yHeadRot += 360F;
             }
-
         } else if (handle instanceof NPCHolder) {
             ((NPCHolder) handle).getNPC().getOrAddTrait(RotationTrait.class).getPhysicalSession().rotateToFace(to);
         }
-
     }
 
     @Override
@@ -1190,7 +1137,6 @@ public class NMSImpl implements NMSBridge {
                                     this, anvil),
                             this);
                 }
-
                 return this.bukkitEntity;
             }
         };
@@ -1237,13 +1183,11 @@ public class NMSImpl implements NMSBridge {
             if (key == null || type == null) {
                 continue;
             }
-
             CITIZENS_ENTITY_TYPES.put(clazz, type);
             int code = ENTITY_REGISTRY.getId(type);
             ENTITY_REGISTRY.put(code, key, type);
             return;
         }
-
         throw new IllegalArgumentException("unable to find valid entity superclass for class " + clazz.toString());
     }
 
@@ -1281,7 +1225,6 @@ public class NMSImpl implements NMSBridge {
             hook.hookedIn = null;
             hook.getBukkitEntity().remove();
         }
-
     }
 
     @Override
@@ -1296,7 +1239,6 @@ public class NMSImpl implements NMSBridge {
         if (getHandle(entity) instanceof EntityHumanNPC) {
             ((EntityHumanNPC) getHandle(entity)).setTracked(replace);
         }
-
     }
 
     @Override
@@ -1306,11 +1248,9 @@ public class NMSImpl implements NMSBridge {
         if (bodyYaw == null) {
             bodyYaw = handle.getYRot();
         }
-
         if (pitch == null) {
             pitch = handle.getXRot();
         }
-
         List<Packet<?>> toSend = Lists.newArrayList();
         if (position) {
             TrackedEntity entry = ((ServerLevel) handle.level).getChunkSource().chunkMap.entityMap.get(handle.getId());
@@ -1321,7 +1261,6 @@ public class NMSImpl implements NMSBridge {
                 e.printStackTrace();
                 return;
             }
-
             Vec3 pos = handle.position().subtract(se.sentPos());
             toSend.add(
                     new ClientboundMoveEntityPacket.PosRot(handle.getId(), (short) pos.x, (short) pos.y, (short) pos.z,
@@ -1330,11 +1269,9 @@ public class NMSImpl implements NMSBridge {
             toSend.add(new ClientboundMoveEntityPacket.Rot(handle.getId(), (byte) (bodyYaw * 256.0F / 360.0F),
                     (byte) (pitch * 256.0F / 360.0F), handle.onGround));
         }
-
         if (headYaw != null) {
             toSend.add(new ClientboundRotateHeadPacket(handle, (byte) (headYaw * 256.0F / 360.0F)));
         }
-
         sendPacketsNearby(null, from.getLocation(), toSend, 64);
     }
 
@@ -1358,7 +1295,6 @@ public class NMSImpl implements NMSBridge {
             entities[i] = (ServerPlayer) skinnable;
             i++;
         }
-
         NMSImpl.sendPacket(recipient,
                 new ClientboundPlayerInfoPacket(ClientboundPlayerInfoPacket.Action.REMOVE_PLAYER, entities));
     }
@@ -1379,7 +1315,6 @@ public class NMSImpl implements NMSBridge {
         if (TEAM_FIELD == null) {
             TEAM_FIELD = NMS.getGetter(team.getClass(), "team");
         }
-
         try {
             PlayerTeam nmsTeam = (PlayerTeam) TEAM_FIELD.invoke(team);
             if (mode == 1) {
@@ -1388,11 +1323,9 @@ public class NMSImpl implements NMSBridge {
                 sendPacket(recipient,
                         ClientboundSetPlayerTeamPacket.createAddOrModifyPacket(nmsTeam, mode == 0 ? true : false));
             }
-
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     @Override
@@ -1428,7 +1361,6 @@ public class NMSImpl implements NMSBridge {
         } else if (handle instanceof MobAI) {
             ((MobAI) handle).getMoveControl().setWantedPosition(x, y, z, speed);
         }
-
     }
 
     @Override
@@ -1453,7 +1385,6 @@ public class NMSImpl implements NMSBridge {
         if (!(handle instanceof net.minecraft.world.entity.player.Player)) {
             handle.setYBodyRot(yaw);
         }
-
         handle.setYHeadRot(yaw);
     }
 
@@ -1499,11 +1430,9 @@ public class NMSImpl implements NMSBridge {
                 FLYING_MOVECONTROL_FLOAT_SETTER.invoke(mob.getMoveControl(), npc.data().get("flying-nogravity-float"));
                 npc.data().remove("flying-nogravity-float");
             }
-
         } catch (Throwable t) {
             t.printStackTrace();
         }
-
     }
 
     @Override
@@ -1540,13 +1469,11 @@ public class NMSImpl implements NMSBridge {
             if (SET_PROFILE_METHOD == null)
                 return;
         }
-
         try {
             SET_PROFILE_METHOD.invoke(meta, profile);
         } catch (Throwable t) {
             t.printStackTrace();
         }
-
     }
 
     @Override
@@ -1573,7 +1500,6 @@ public class NMSImpl implements NMSBridge {
         if (entity instanceof Player) {
             ((Player) entity).setSneaking(sneaking);
         }
-
         Pose pose = sneaking ? Pose.CROUCHING : Pose.STANDING;
         getHandle(entity).setPose(pose);
     }
@@ -1606,7 +1532,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         return false;
     }
 
@@ -1618,7 +1543,6 @@ public class NMSImpl implements NMSBridge {
             ENTITY_REGISTRY_SETTER.invoke(null, ENTITY_REGISTRY.get());
         } catch (Throwable e) {
         }
-
     }
 
     @Override
@@ -1640,7 +1564,6 @@ public class NMSImpl implements NMSBridge {
             handle.setDeltaMovement(handle.getDeltaMovement().x, handle.getDeltaMovement().y + power,
                     handle.getDeltaMovement().z);
         }
-
     }
 
     @Override
@@ -1732,7 +1655,6 @@ public class NMSImpl implements NMSBridge {
                 menuType = MenuType.CRAFTING;
                 break;
         }
-
         handle.connection.send(new ClientboundOpenScreenPacket(handle.containerMenu.containerId, menuType,
                 new TextComponent(newTitle)));
         player.updateInventory();
@@ -1754,7 +1676,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     @Override
@@ -1766,7 +1687,6 @@ public class NMSImpl implements NMSBridge {
             ((MobAI) en).updatePathfindingRange(pathfindingRange);
             return;
         }
-
         if (NAVIGATION_PATHFINDER == null)
             return;
         PathNavigation navigation = ((Mob) en).getNavigation();
@@ -1778,7 +1698,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     private static class CitizensInventoryAnvil extends CraftInventoryAnvil implements ForwardingInventory {
@@ -1889,7 +1808,6 @@ public class NMSImpl implements NMSBridge {
             e.printStackTrace();
             return;
         }
-
         float oldw = size.width;
         float oldl = size.height;
         cb.accept(datawatcherobject);
@@ -1897,7 +1815,6 @@ public class NMSImpl implements NMSBridge {
             living.setPos(living.getX() - 0.01, living.getY(), living.getZ() - 0.01);
             living.setPos(living.getX() + 0.01, living.getY(), living.getZ() + 0.01);
         }
-
     }
 
     public static void clearGoals(NPC npc, GoalSelector... goalSelectors) {
@@ -1910,17 +1827,14 @@ public class NMSImpl implements NMSBridge {
                 if (!list.isEmpty()) {
                     npc.data().set("selector" + i, Lists.newArrayList(list));
                 }
-
                 list.clear();
             } catch (Exception e) {
                 Messaging.logTr(Messages.ERROR_CLEARING_GOALS, e.getLocalizedMessage());
             } catch (Throwable e) {
                 Messaging.logTr(Messages.ERROR_CLEARING_GOALS, e.getLocalizedMessage());
             }
-
             i++;
         }
-
     }
 
     private static CompoundTag convertNBT(net.minecraft.nbt.CompoundTag tag) {
@@ -1930,7 +1844,6 @@ public class NMSImpl implements NMSBridge {
         for (String key : tag.getAllKeys()) {
             tags.put(key, convertNBT(key, tag.get(key)));
         }
-
         return new CompoundTag("", tags);
     }
 
@@ -1961,10 +1874,8 @@ public class NMSImpl implements NMSBridge {
                 for (int i = 0; i < list.size(); i++) {
                     converted.add(convertNBT("", list.get(i)));
                 }
-
                 return new ListTag(key, tagType, converted);
             }
-
         } else if (base instanceof net.minecraft.nbt.CompoundTag)
             return convertNBT((net.minecraft.nbt.CompoundTag) base);
         else if (base instanceof net.minecraft.nbt.EndTag)
@@ -1980,7 +1891,6 @@ public class NMSImpl implements NMSBridge {
                 d0 = 0.01D;
                 entity.fallDistance = 0.0F;
             }
-
             FluidState fluid = entity.level.getFluidState(entity.blockPosition());
             if (entity.isInWater() && !entity.canStandOnFluid(fluid)) {
                 double d1 = entity.getY();
@@ -1990,27 +1900,22 @@ public class NMSImpl implements NMSBridge {
                 if (f2 > 3.0F) {
                     f2 = 3.0F;
                 }
-
                 if (!entity.isOnGround()) {
                     f2 *= 0.5F;
                 }
-
                 if (f2 > 0.0F) {
                     f += (0.546F - f) * f2 / 3.0F;
                     f1 += (entity.getSpeed() - f1) * f2 / 3.0F;
                 }
-
                 if (entity.hasEffect(MobEffects.DOLPHINS_GRACE)) {
                     f = 0.96F;
                 }
-
                 entity.moveRelative(f1, vec3d);
                 entity.move(MoverType.SELF, entity.getDeltaMovement());
                 Vec3 vec3d1 = entity.getDeltaMovement();
                 if (entity.horizontalCollision && entity.onClimbable()) {
                     vec3d1 = new Vec3(vec3d1.x, 0.2D, vec3d1.z);
                 }
-
                 entity.setDeltaMovement(vec3d1.multiply(f, 0.8D, f));
                 Vec3 vec3d2 = entity.getFluidFallingAdjustedMovement(d0, flag, entity.getDeltaMovement());
                 entity.setDeltaMovement(vec3d2);
@@ -2018,7 +1923,6 @@ public class NMSImpl implements NMSBridge {
                         && entity.isFree(vec3d2.x, vec3d2.y + 0.6D - entity.getY() + d1, vec3d2.z)) {
                     entity.setDeltaMovement(vec3d2.x, 0.3D, vec3d2.z);
                 }
-
             } else if (entity.isInLava() && !entity.canStandOnFluid(fluid)) {
                 double d1 = entity.getY();
                 entity.moveRelative(0.02F, vec3d);
@@ -2030,23 +1934,19 @@ public class NMSImpl implements NMSBridge {
                 } else {
                     entity.setDeltaMovement(entity.getDeltaMovement().scale(0.5D));
                 }
-
                 if (!entity.isNoGravity()) {
                     entity.setDeltaMovement(entity.getDeltaMovement().add(0.0D, -d0 / 4.0D, 0.0D));
                 }
-
                 Vec3 vec3d3 = entity.getDeltaMovement();
                 if (entity.horizontalCollision
                         && entity.isFree(vec3d3.x, vec3d3.y + 0.6D - entity.getY() + d1, vec3d3.z)) {
                     entity.setDeltaMovement(vec3d3.x, 0.3D, vec3d3.z);
                 }
-
             } else if (entity.isFallFlying()) {
                 Vec3 vec3d4 = entity.getDeltaMovement();
                 if (vec3d4.y > -0.5D) {
                     entity.fallDistance = 1.0F;
                 }
-
                 Vec3 vec3d5 = entity.getLookAngle();
                 float f = entity.getXRot() * 0.017453292F;
                 double d2 = Math.sqrt(vec3d5.x * vec3d5.x + vec3d5.z * vec3d5.z);
@@ -2059,17 +1959,14 @@ public class NMSImpl implements NMSBridge {
                     double d5 = vec3d4.y * -0.1D * f3;
                     vec3d4 = vec3d4.add(vec3d5.x * d5 / d2, d5, vec3d5.z * d5 / d2);
                 }
-
                 if (f < 0.0F && d2 > 0.0D) {
                     double d5 = d3 * -Mth.sin(f) * 0.04D;
                     vec3d4 = vec3d4.add(-vec3d5.x * d5 / d2, d5 * 3.2D, -vec3d5.z * d5 / d2);
                 }
-
                 if (d2 > 0.0D) {
                     vec3d4 = vec3d4.add((vec3d5.x / d2 * d3 - vec3d4.x) * 0.1D, 0.0D,
                             (vec3d5.z / d2 * d3 - vec3d4.z) * 0.1D);
                 }
-
                 entity.setDeltaMovement(vec3d4.multiply(0.99D, 0.98D, 0.99D));
                 entity.move(MoverType.SELF, entity.getDeltaMovement());
                 if (entity.horizontalCollision && !entity.level.isClientSide) {
@@ -2082,17 +1979,13 @@ public class NMSImpl implements NMSBridge {
                         } catch (Throwable e) {
                             e.printStackTrace();
                         }
-
                         entity.hurt(DamageSource.FLY_INTO_WALL, f4);
                     }
-
                 }
-
                 if (entity.isOnGround() && !entity.level.isClientSide && entity.getSharedFlag(7)
                         && !CraftEventFactory.callToggleGlideEvent(entity, false).isCancelled()) {
                     entity.setSharedFlag(7, false);
                 }
-
             } else {
                 BlockPos blockposition = new BlockPos(entity.getX(), entity.getBoundingBox().minY - 0.5D,
                         entity.getZ());
@@ -2109,21 +2002,16 @@ public class NMSImpl implements NMSBridge {
                     } else {
                         d7 = 0.0D;
                     }
-
                 } else if (!entity.isNoGravity()) {
                     d7 -= d0;
                 }
-
                 if (entity.shouldDiscardFriction()) {
                     entity.setDeltaMovement(vec3d6.x, d7, vec3d6.z);
                 } else {
                     entity.setDeltaMovement(vec3d6.x * f, d7 * 0.98D, vec3d6.z * f);
                 }
-
             }
-
         }
-
         entity.calculateEntityAnimation(entity, entity instanceof net.minecraft.world.entity.animal.FlyingAnimal);
     }
 
@@ -2133,7 +2021,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         return null;
     }
 
@@ -2169,7 +2056,6 @@ public class NMSImpl implements NMSBridge {
             e.printStackTrace();
             return null;
         }
-
     }
 
     public static EntityDataAccessor<Integer> getRabbitTypeField() {
@@ -2182,7 +2068,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         return null;
     }
 
@@ -2216,7 +2101,6 @@ public class NMSImpl implements NMSBridge {
         if (mat != null) {
             minecart.setDisplayBlockState(Registry.BLOCK.byId(mat.getId()).defaultBlockState());
         }
-
         minecart.setDisplayOffset(offset);
     }
 
@@ -2230,7 +2114,6 @@ public class NMSImpl implements NMSBridge {
             handle.setDeltaMovement(handle.getDeltaMovement().scale(0.9));
             return true;
         }
-
         return false;
     }
 
@@ -2241,7 +2124,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     public static void restoreGoals(NPC npc, GoalSelector... goalSelectors) {
@@ -2256,16 +2138,13 @@ public class NMSImpl implements NMSBridge {
                 if (old != null) {
                     list.addAll(old);
                 }
-
             } catch (Exception e) {
                 Messaging.logTr(Messages.ERROR_RESTORING_GOALS, e.getLocalizedMessage());
             } catch (Throwable e) {
                 Messaging.logTr(Messages.ERROR_RESTORING_GOALS, e.getLocalizedMessage());
             }
-
             i++;
         }
-
     }
 
     public static void sendPacket(Player player, Packet<?> packet) {
@@ -2292,13 +2171,10 @@ public class NMSImpl implements NMSBridge {
                     || location.distanceSquared(player.getLocation(PACKET_CACHE_LOCATION)) > radius) {
                 continue;
             }
-
             for (Packet<?> packet : packets) {
                 NMSImpl.sendPacket(player, packet);
             }
-
         }
-
     }
 
     public static void sendPacketsNearby(Player from, Location location, Packet<?>... packets) {
@@ -2311,7 +2187,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     public static void setAttribute(LivingEntity entity, Attribute attribute, double value) {
@@ -2329,10 +2204,8 @@ public class NMSImpl implements NMSBridge {
             } catch (Throwable e) {
                 e.printStackTrace();
             }
-
             attr = entity.getAttribute(attribute);
         }
-
         attr.setBaseValue(value);
     }
 
@@ -2342,7 +2215,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     public static void setFallingBlockState(FallingBlockEntity handle, BlockState state) {
@@ -2351,7 +2223,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     public static void setLife(FishingHook entity, int life) {
@@ -2360,7 +2231,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     public static void setLookControl(Mob mob, LookControl control) {
@@ -2369,7 +2239,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     public static void setNotInSchool(AbstractFish entity) {
@@ -2377,11 +2246,9 @@ public class NMSImpl implements NMSBridge {
             if (ENTITY_FISH_NUM_IN_SCHOOL != null) {
                 ENTITY_FISH_NUM_IN_SCHOOL.invoke(entity, 2);
             }
-
         } catch (Throwable ex) {
             ex.printStackTrace();
         }
-
     }
 
     public static void setSize(Entity entity, boolean justCreated) {
@@ -2404,13 +2271,10 @@ public class NMSImpl implements NMSBridge {
                     float f = entitysize.width - entitysize1.width;
                     entity.move(MoverType.SELF, new Vec3(f, 0.0D, f));
                 }
-
             }
-
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     public static void setSize(Entity entity, EntityDimensions size) {
@@ -2421,7 +2285,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     public static Entity teleportAcrossWorld(Entity entity, ServerLevel worldserver, BlockPos location) {
@@ -2436,7 +2299,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         if (npc == null || sds == null)
             return null;
         npc.despawn(DespawnReason.PENDING_RESPAWN);
@@ -2449,7 +2311,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         return handle;
     }
 
@@ -2464,7 +2325,6 @@ public class NMSImpl implements NMSBridge {
         } else if (entity instanceof MobAI) {
             ((MobAI) entity).tickAI();
         }
-
     }
 
     public static void updateMinecraftAIState(NPC npc, Mob entity) {
@@ -2477,7 +2337,6 @@ public class NMSImpl implements NMSBridge {
                 getBehaviorMap(entity).putAll(behavior);
                 npc.data().remove("behavior-map");
             }
-
         } else {
             NMSImpl.clearGoals(npc, entity.goalSelector, entity.targetSelector);
             TreeMap behaviorMap = getBehaviorMap(entity);
@@ -2485,9 +2344,7 @@ public class NMSImpl implements NMSBridge {
                 npc.data().set("behavior-map", new TreeMap(behaviorMap));
                 behaviorMap.clear();
             }
-
         }
-
     }
 
     private static final MethodHandle ADVANCEMENTS_PLAYER_FIELD = NMS.getFinalSetter(ServerPlayer.class, "cr");
@@ -2568,7 +2425,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             Messaging.logTr(Messages.ERROR_GETTING_ID_MAPPING, e.getMessage());
         }
-
         try {
             ENDERMAN_CREEPY = (EntityDataAccessor<Boolean>) NMS.getField(EnderMan.class, "bX").get(null);
         } catch (IllegalArgumentException e) {
@@ -2576,13 +2432,11 @@ public class NMSImpl implements NMSBridge {
         } catch (IllegalAccessException e) {
             e.printStackTrace();
         }
-
         try {
             RABBIT_TYPE_DATAWATCHER = (EntityDataAccessor<Integer>) NMS
                     .getFirstStaticGetter(Rabbit.class, EntityDataAccessor.class).invoke();
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/PitchableLookControl.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/PitchableLookControl.java
index 617ead56e..8e1981a32 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/PitchableLookControl.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/PitchableLookControl.java
@@ -18,7 +18,6 @@ public class PitchableLookControl extends LookControl {
         } else {
             resetOnTick = () -> true;
         }
-
     }
 
     @Override
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/PlayerAnimationImpl.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/PlayerAnimationImpl.java
index 3077e336f..5f1c1c2f7 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/PlayerAnimationImpl.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/PlayerAnimationImpl.java
@@ -23,7 +23,6 @@ public class PlayerAnimationImpl {
             playDefaultAnimation(player, to, DEFAULTS.get(animation));
             return;
         }
-
         switch (animation) {
             case SNEAK:
                 player.setPose(Pose.CROUCHING);
@@ -58,7 +57,6 @@ public class PlayerAnimationImpl {
             default:
                 throw new UnsupportedOperationException();
         }
-
     }
 
     protected static void playDefaultAnimation(ServerPlayer player, Iterable<Player> to, int code) {
@@ -70,7 +68,6 @@ public class PlayerAnimationImpl {
         for (Player player : to) {
             NMSImpl.sendPacket(player, packet);
         }
-
     }
 
     private static Map<PlayerAnimation, Integer> DEFAULTS = Maps.newEnumMap(PlayerAnimation.class);
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/PlayerlistTracker.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/PlayerlistTracker.java
index e9b39ab67..69b051e1a 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/PlayerlistTracker.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/PlayerlistTracker.java
@@ -36,7 +36,6 @@ public class PlayerlistTracker extends ChunkMap.TrackedEntity {
                     new NPCLinkToPlayerEvent(((NPCHolder) tracker).getNPC(), lastUpdatedPlayer.getBukkitEntity()));
             lastUpdatedPlayer = null;
         }
-
     }
 
     @Override
@@ -49,7 +48,6 @@ public class PlayerlistTracker extends ChunkMap.TrackedEntity {
             if (REQUIRES_SYNC == null) {
                 REQUIRES_SYNC = !Bukkit.isPrimaryThread();
             }
-
             boolean cancelled = Util.callPossiblySync(() -> {
                 NPCSeenByPlayerEvent event = new NPCSeenByPlayerEvent(npc, entityplayer.getBukkitEntity());
                 try {
@@ -58,7 +56,6 @@ public class PlayerlistTracker extends ChunkMap.TrackedEntity {
                     REQUIRES_SYNC = true;
                     throw e;
                 }
-
                 if (event.isCancelled())
                     return true;
                 Integer trackingRange = npc.data().<Integer> get(NPC.Metadata.TRACKING_RANGE);
@@ -70,16 +67,13 @@ public class PlayerlistTracker extends ChunkMap.TrackedEntity {
                     } catch (Throwable e) {
                         e.printStackTrace();
                     }
-
                 }
-
                 return false;
             }, REQUIRES_SYNC);
 
             if (cancelled)
                 return;
         }
-
         this.lastUpdatedPlayer = entityplayer;
         super.updatePlayer(entityplayer);
     }
@@ -90,7 +84,6 @@ public class PlayerlistTracker extends ChunkMap.TrackedEntity {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         return 0;
     }
 
@@ -100,7 +93,6 @@ public class PlayerlistTracker extends ChunkMap.TrackedEntity {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         return false;
     }
 
@@ -110,7 +102,6 @@ public class PlayerlistTracker extends ChunkMap.TrackedEntity {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         return null;
     }
 
@@ -120,7 +111,6 @@ public class PlayerlistTracker extends ChunkMap.TrackedEntity {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         return 0;
     }
 
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/AllayController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/AllayController.java
index 3dfaf51ae..aa16ef127 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/AllayController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/AllayController.java
@@ -91,7 +91,6 @@ public class AllayController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -99,7 +98,6 @@ public class AllayController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -109,7 +107,6 @@ public class AllayController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -122,7 +119,6 @@ public class AllayController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new AllayNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -195,10 +191,8 @@ public class AllayController extends MobEntityController {
                         taskId = -1;
                     }, 2);
                 }
-
                 return InteractionResult.FAIL;
             }
-
             return super.mobInteract(var0, var1);
         }
 
@@ -216,7 +210,6 @@ public class AllayController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -227,7 +220,6 @@ public class AllayController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -249,7 +241,6 @@ public class AllayController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -261,7 +252,6 @@ public class AllayController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ArmorStandController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ArmorStandController.java
index 1b5d018bf..d4dd638d3 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ArmorStandController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ArmorStandController.java
@@ -61,7 +61,6 @@ public class ArmorStandController extends MobEntityController {
             if (npc != null) {
                 ai = new BasicMobAI(this);
             }
-
         }
 
         @Override
@@ -74,7 +73,6 @@ public class ArmorStandController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ArmorStandNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -110,7 +108,6 @@ public class ArmorStandController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -121,7 +118,6 @@ public class ArmorStandController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -143,7 +139,6 @@ public class ArmorStandController extends MobEntityController {
                 npc.update();
                 ai.tickAI();
             }
-
         }
 
         @Override
@@ -155,7 +150,6 @@ public class ArmorStandController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/AxolotlController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/AxolotlController.java
index c9676f4be..6fc3cbf69 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/AxolotlController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/AxolotlController.java
@@ -77,7 +77,6 @@ public class AxolotlController extends MobEntityController {
                 this.getAttribute(Attributes.MOVEMENT_SPEED)
                         .setBaseValue(this.getAttribute(Attributes.MOVEMENT_SPEED).getBaseValue() / 10);
             }
-
         }
 
         @Override
@@ -99,7 +98,6 @@ public class AxolotlController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -107,7 +105,6 @@ public class AxolotlController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -120,7 +117,6 @@ public class AxolotlController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new AxolotlNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -207,7 +203,6 @@ public class AxolotlController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -218,7 +213,6 @@ public class AxolotlController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -241,14 +235,11 @@ public class AxolotlController extends MobEntityController {
                 if (npc.useMinecraftAI() && this.moveControl != this.oldMoveController) {
                     this.moveControl = this.oldMoveController;
                 }
-
                 if (!npc.useMinecraftAI() && this.moveControl == this.oldMoveController) {
                     this.moveControl = new MoveControl(this);
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
@@ -257,11 +248,9 @@ public class AxolotlController extends MobEntityController {
                 if (!NMSImpl.moveFish(npc, this, vec3d)) {
                     super.travel(vec3d);
                 }
-
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -273,7 +262,6 @@ public class AxolotlController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/BatController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/BatController.java
index 4dc8c9816..3c95c12df 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/BatController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/BatController.java
@@ -60,7 +60,6 @@ public class BatController extends MobEntityController {
             if (npc != null) {
                 setResting(false);
             }
-
         }
 
         @Override
@@ -75,7 +74,6 @@ public class BatController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -87,10 +85,8 @@ public class BatController extends MobEntityController {
                 if (npc.useMinecraftAI()) {
                     super.customServerAiStep();
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
@@ -103,7 +99,6 @@ public class BatController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new BatNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -165,7 +160,6 @@ public class BatController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -176,7 +170,6 @@ public class BatController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -200,7 +193,6 @@ public class BatController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/BeeController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/BeeController.java
index bdeed81c1..4c9953e57 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/BeeController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/BeeController.java
@@ -71,7 +71,6 @@ public class BeeController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -83,10 +82,8 @@ public class BeeController extends MobEntityController {
                 if (npc.useMinecraftAI()) {
                     super.customServerAiStep();
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
@@ -99,7 +96,6 @@ public class BeeController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new BeeNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -161,7 +157,6 @@ public class BeeController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -172,7 +167,6 @@ public class BeeController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -196,7 +190,6 @@ public class BeeController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/BlazeController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/BlazeController.java
index dc3a4bd8e..1fb629123 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/BlazeController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/BlazeController.java
@@ -71,7 +71,6 @@ public class BlazeController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -80,7 +79,6 @@ public class BlazeController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -93,7 +91,6 @@ public class BlazeController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new BlazeNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -155,7 +152,6 @@ public class BlazeController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -166,7 +162,6 @@ public class BlazeController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -190,7 +185,6 @@ public class BlazeController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/CamelController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/CamelController.java
index 161de18cb..08494566c 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/CamelController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/CamelController.java
@@ -79,7 +79,6 @@ public class CamelController extends MobEntityController {
                         .setDomestication(((org.bukkit.entity.Camel) getBukkitEntity()).getMaxDomestication());
                 baseMovementSpeed = this.getAttribute(Attributes.MOVEMENT_SPEED).getValue();
             }
-
         }
 
         @Override
@@ -101,7 +100,6 @@ public class CamelController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -109,7 +107,6 @@ public class CamelController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -124,20 +121,16 @@ public class CamelController extends MobEntityController {
                 } else {
                     riding = false;
                 }
-
                 if (riding) {
                     if (npc.getNavigator().isNavigating()) {
                         org.bukkit.entity.Entity basePassenger = passengers.get(0).getBukkitEntity();
                         NMS.look(basePassenger, getYRot(), getXRot());
                     }
-
                     setFlag(4, true); // datawatcher method
                 }
-
                 NMS.setStepHeight(getBukkitEntity(), 1);
                 npc.update();
             }
-
         }
 
         @Override
@@ -150,7 +143,6 @@ public class CamelController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new CamelNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -232,7 +224,6 @@ public class CamelController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -242,7 +233,6 @@ public class CamelController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -253,7 +243,6 @@ public class CamelController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -275,7 +264,6 @@ public class CamelController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -287,7 +275,6 @@ public class CamelController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/CatController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/CatController.java
index e89718449..054f509e7 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/CatController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/CatController.java
@@ -81,7 +81,6 @@ public class CatController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -89,7 +88,6 @@ public class CatController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -99,7 +97,6 @@ public class CatController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -112,7 +109,6 @@ public class CatController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new CatNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -182,7 +178,6 @@ public class CatController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -192,7 +187,6 @@ public class CatController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -203,7 +197,6 @@ public class CatController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -225,7 +218,6 @@ public class CatController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -237,7 +229,6 @@ public class CatController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/CaveSpiderController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/CaveSpiderController.java
index 874f3b4af..ac8ed15a4 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/CaveSpiderController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/CaveSpiderController.java
@@ -80,7 +80,6 @@ public class CaveSpiderController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -88,7 +87,6 @@ public class CaveSpiderController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -98,7 +96,6 @@ public class CaveSpiderController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -111,7 +108,6 @@ public class CaveSpiderController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new CaveSpiderNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -181,7 +177,6 @@ public class CaveSpiderController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -192,7 +187,6 @@ public class CaveSpiderController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -202,7 +196,6 @@ public class CaveSpiderController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -224,7 +217,6 @@ public class CaveSpiderController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -236,7 +228,6 @@ public class CaveSpiderController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ChickenController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ChickenController.java
index fbfb0f919..ecc55e5b2 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ChickenController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ChickenController.java
@@ -67,7 +67,6 @@ public class ChickenController extends MobEntityController {
             if (npc != null) {
                 this.eggTime = 100;
             }
-
             super.aiStep();
         }
 
@@ -90,7 +89,6 @@ public class ChickenController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -98,7 +96,6 @@ public class ChickenController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -108,7 +105,6 @@ public class ChickenController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -121,7 +117,6 @@ public class ChickenController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ChickenNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -191,7 +186,6 @@ public class ChickenController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -201,7 +195,6 @@ public class ChickenController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -212,7 +205,6 @@ public class ChickenController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -234,7 +226,6 @@ public class ChickenController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -246,7 +237,6 @@ public class ChickenController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/CodController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/CodController.java
index 544a55de9..a1a19f6c9 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/CodController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/CodController.java
@@ -72,7 +72,6 @@ public class CodController extends MobEntityController {
                 this.oldMoveController = this.moveControl;
                 this.moveControl = new MoveControl(this);
             }
-
         }
 
         @Override
@@ -81,12 +80,10 @@ public class CodController extends MobEntityController {
             if (npc != null) {
                 this.verticalCollision = false;
             }
-
             super.aiStep();
             if (npc != null) {
                 this.verticalCollision = lastInWater;
             }
-
         }
 
         @Override
@@ -108,7 +105,6 @@ public class CodController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -116,7 +112,6 @@ public class CodController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -125,23 +120,18 @@ public class CodController extends MobEntityController {
                 if (!npc.useMinecraftAI()) {
                     NMSImpl.setNotInSchool(this);
                 }
-
                 NMSImpl.updateMinecraftAIState(npc, this);
                 if (npc.useMinecraftAI() && this.moveControl != this.oldMoveController) {
                     this.moveControl = this.oldMoveController;
                 }
-
                 if (!npc.useMinecraftAI() && this.moveControl == this.oldMoveController) {
                     this.moveControl = new EntityMoveControl(this);
                 }
-
             }
-
             super.customServerAiStep();
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -154,7 +144,6 @@ public class CodController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new CodNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -234,7 +223,6 @@ public class CodController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -245,7 +233,6 @@ public class CodController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -266,11 +253,9 @@ public class CodController extends MobEntityController {
                 if (!NMSImpl.moveFish(npc, this, vec3d)) {
                     super.travel(vec3d);
                 }
-
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -282,7 +267,6 @@ public class CodController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/CowController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/CowController.java
index ed3326eca..fc1ca7a5a 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/CowController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/CowController.java
@@ -86,7 +86,6 @@ public class CowController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -94,7 +93,6 @@ public class CowController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -104,7 +102,6 @@ public class CowController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -117,7 +114,6 @@ public class CowController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new CowNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -197,7 +193,6 @@ public class CowController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -207,7 +202,6 @@ public class CowController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -218,7 +212,6 @@ public class CowController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -240,7 +233,6 @@ public class CowController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -252,7 +244,6 @@ public class CowController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/CreeperController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/CreeperController.java
index f0502f033..886359cea 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/CreeperController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/CreeperController.java
@@ -83,7 +83,6 @@ public class CreeperController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -91,7 +90,6 @@ public class CreeperController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -101,7 +99,6 @@ public class CreeperController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -114,7 +111,6 @@ public class CreeperController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new CreeperNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -153,7 +149,6 @@ public class CreeperController extends MobEntityController {
             if (npc == null || !npc.isProtected()) {
                 super.ignite();
             }
-
         }
 
         @Override
@@ -192,7 +187,6 @@ public class CreeperController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -203,7 +197,6 @@ public class CreeperController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -213,7 +206,6 @@ public class CreeperController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -237,7 +229,6 @@ public class CreeperController extends MobEntityController {
             if (npc == null || allowPowered) {
                 super.thunderHit(worldserver, entitylightning);
             }
-
         }
 
         @Override
@@ -247,7 +238,6 @@ public class CreeperController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -259,7 +249,6 @@ public class CreeperController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/DolphinController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/DolphinController.java
index cb5e671f8..5f0a2f176 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/DolphinController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/DolphinController.java
@@ -71,7 +71,6 @@ public class DolphinController extends MobEntityController {
                 this.getAttribute(Attributes.MOVEMENT_SPEED)
                         .setBaseValue(this.getAttribute(Attributes.MOVEMENT_SPEED).getBaseValue() / 10);
             }
-
         }
 
         @Override
@@ -93,7 +92,6 @@ public class DolphinController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -101,7 +99,6 @@ public class DolphinController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -114,7 +111,6 @@ public class DolphinController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new DolphinNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -189,7 +185,6 @@ public class DolphinController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -200,7 +195,6 @@ public class DolphinController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -220,7 +214,6 @@ public class DolphinController extends MobEntityController {
             if (npc != null && npc.isProtected()) {
                 inProtectedTick = true;
             }
-
             super.tick();
             inProtectedTick = false;
             if (npc != null) {
@@ -228,14 +221,11 @@ public class DolphinController extends MobEntityController {
                 if (npc.useMinecraftAI() && this.moveControl != this.oldMoveController) {
                     this.moveControl = this.oldMoveController;
                 }
-
                 if (!npc.useMinecraftAI() && this.moveControl == this.oldMoveController) {
                     this.moveControl = new MoveControl(this);
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
@@ -244,11 +234,9 @@ public class DolphinController extends MobEntityController {
                 if (!NMSImpl.moveFish(npc, this, vec3d)) {
                     super.travel(vec3d);
                 }
-
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -260,7 +248,6 @@ public class DolphinController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/DrownedController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/DrownedController.java
index 371ce4a03..5fac992e8 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/DrownedController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/DrownedController.java
@@ -80,7 +80,6 @@ public class DrownedController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -88,7 +87,6 @@ public class DrownedController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -98,7 +96,6 @@ public class DrownedController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -111,7 +108,6 @@ public class DrownedController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new DrownedNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -181,7 +177,6 @@ public class DrownedController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -192,7 +187,6 @@ public class DrownedController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -214,7 +208,6 @@ public class DrownedController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -226,7 +219,6 @@ public class DrownedController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/EnderDragonController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/EnderDragonController.java
index dd27d919f..21c2b8bf6 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/EnderDragonController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/EnderDragonController.java
@@ -72,25 +72,20 @@ public class EnderDragonController extends MobEntityController {
                 npc.update();
 
             }
-
             if (npc != null && !npc.useMinecraftAI()) {
                 if (isDeadOrDying()) {
                     setHealth(0F);
                     return;
                 }
-
                 if (this.posPointer < 0) {
                     for (int i = 0; i < this.positions.length; ++i) {
                         this.positions[i][0] = this.getYRot();
                         this.positions[i][1] = this.getY();
                     }
-
                 }
-
                 if (++this.posPointer == this.positions.length) {
                     this.posPointer = 0;
                 }
-
                 this.positions[this.posPointer][0] = this.getYRot();
                 this.positions[this.posPointer][1] = this.getY();
 
@@ -105,22 +100,18 @@ public class EnderDragonController extends MobEntityController {
                     subEntities[j].yo = subEntities[j].yOld = vec3.y;
                     subEntities[j].zo = subEntities[j].zOld = vec3.z;
                 }
-
                 if (getFirstPassenger() != null) {
                     setYRot(getFirstPassenger().getBukkitYaw() - 180);
                 }
-
                 Vec3 mot = getDeltaMovement();
                 if (mot.x != 0 || mot.y != 0 || mot.z != 0) {
                     mot = mot.multiply(0.98, 0.91, 0.98);
                     if (getFirstPassenger() == null) {
                         setYRot(Util.getDragonYaw(getBukkitEntity(), mot.x, mot.z));
                     }
-
                     setPos(getX() + mot.x, getY() + mot.y, getZ() + mot.z);
                     setDeltaMovement(mot);
                 }
-
                 if (npc.hasTrait(EnderDragonTrait.class) && npc.getOrAddTrait(EnderDragonTrait.class).isDestroyWalls()
                         && NMSImpl.ENDERDRAGON_CHECK_WALLS != null) {
                     for (int i = 0; i < 3; i++) {
@@ -130,11 +121,8 @@ public class EnderDragonController extends MobEntityController {
                         } catch (Throwable e) {
                             e.printStackTrace();
                         }
-
                     }
-
                 }
-
                 if (npc.data().get(NPC.Metadata.COLLIDABLE, false)) {
                     try {
                         KNOCKBACK.invoke(this,
@@ -152,13 +140,10 @@ public class EnderDragonController extends MobEntityController {
                     } catch (Throwable t) {
                         t.printStackTrace();
                     }
-
                 }
-
             } else {
                 super.aiStep();
             }
-
         }
 
         @Override
@@ -173,7 +158,6 @@ public class EnderDragonController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -186,7 +170,6 @@ public class EnderDragonController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new EnderDragonNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -248,7 +231,6 @@ public class EnderDragonController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -259,7 +241,6 @@ public class EnderDragonController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -272,7 +253,6 @@ public class EnderDragonController extends MobEntityController {
             if (getPhaseManager().getCurrentPhase().getPhase() == EnderDragonPhase.HOVERING) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
 
@@ -297,7 +277,6 @@ public class EnderDragonController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
 
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/EndermanController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/EndermanController.java
index 98f261f8a..88f3fde3a 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/EndermanController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/EndermanController.java
@@ -83,7 +83,6 @@ public class EndermanController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -91,7 +90,6 @@ public class EndermanController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -101,7 +99,6 @@ public class EndermanController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -114,7 +111,6 @@ public class EndermanController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new EndermanNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -184,7 +180,6 @@ public class EndermanController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -195,7 +190,6 @@ public class EndermanController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -213,7 +207,6 @@ public class EndermanController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -235,7 +228,6 @@ public class EndermanController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -247,7 +239,6 @@ public class EndermanController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/EndermiteController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/EndermiteController.java
index 5d568828b..fabe0daa8 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/EndermiteController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/EndermiteController.java
@@ -80,7 +80,6 @@ public class EndermiteController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -88,7 +87,6 @@ public class EndermiteController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -98,7 +96,6 @@ public class EndermiteController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -111,7 +108,6 @@ public class EndermiteController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new EndermiteNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -181,7 +177,6 @@ public class EndermiteController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -192,7 +187,6 @@ public class EndermiteController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -202,7 +196,6 @@ public class EndermiteController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -224,7 +217,6 @@ public class EndermiteController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -236,7 +228,6 @@ public class EndermiteController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/EntityHumanNPC.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/EntityHumanNPC.java
index 16b27c4e3..52ae45dcb 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/EntityHumanNPC.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/EntityHumanNPC.java
@@ -75,12 +75,10 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
             } catch (Throwable e) {
                 e.printStackTrace();
             }
-
             initialise(minecraftServer);
         } else {
             skinTracker = null;
         }
-
     }
 
     @Override
@@ -95,7 +93,6 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
         if (npc == null || !npc.isFlyable()) {
             super.checkFallDamage(d0, flag, iblockdata, blockposition);
         }
-
     }
 
     @Override
@@ -117,7 +114,6 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
             super.doTick();
             return;
         }
-
         super.baseTick();
         boolean navigating = npc.getNavigator().isNavigating() || ai.getMoveControl().hasWanted();
         if (!navigating && getBukkitEntity() != null
@@ -126,27 +122,22 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
                 && (!npc.isProtected() || SpigotUtil.checkYSafe(getY(), getBukkitEntity().getWorld()))) {
             moveWithFallDamage(Vec3.ZERO);
         }
-
         Vec3 mot = getDeltaMovement();
         if (Math.abs(mot.x) < EPSILON && Math.abs(mot.y) < EPSILON && Math.abs(mot.z) < EPSILON) {
             setDeltaMovement(Vec3.ZERO);
         }
-
         if (navigating) {
             if (!ai.getNavigation().isDone()) {
                 ai.getNavigation().tick();
             }
-
             moveOnCurrentHeading();
         }
-
         tickAI();
         detectEquipmentUpdates();
         noPhysics = isSpectator();
         if (isSpectator()) {
             this.onGround = false;
         }
-
         pushEntities();
 
         if (npc.data().get(NPC.Metadata.PICKUP_ITEMS, false)) {
@@ -156,13 +147,10 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
             } else {
                 axisalignedbb = this.getBoundingBox().inflate(1.0, 0.5, 1.0);
             }
-
             for (Entity entity : this.level.getEntities(this, axisalignedbb)) {
                 entity.playerTouch(this);
             }
-
         }
-
     }
 
     @Override
@@ -176,7 +164,6 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
             NMSImpl.setBukkitEntity(this, new PlayerNPC(this));
             setBukkitEntity = true;
         }
-
         return super.getBukkitEntity();
     }
 
@@ -206,7 +193,6 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
         if (skinName == null) {
             skinName = npc.getName();
         }
-
         return skinName.toLowerCase();
     }
 
@@ -238,7 +224,6 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
             Bukkit.getScheduler().runTask(CitizensAPI.getPlugin(),
                     (Runnable) () -> EntityHumanNPC.this.hurtMarked = true);
         }
-
         return damaged;
     }
 
@@ -249,7 +234,6 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
             conn.setListener(connection);
         } catch (IOException e) {
         }
-
         this.invulnerableTime = 0;
         NMS.setStepHeight(getBukkitEntity(), 1); // the default (0) breaks step climbing
         setSkinFlags((byte) 0xFF);
@@ -283,11 +267,9 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
                 jumpFromGround();
                 jumpTicks = 10;
             }
-
         } else {
             jumpTicks = 0;
         }
-
         xxa *= 0.98F;
         zza *= 0.98F;
         moveWithFallDamage(new Vec3(this.xxa, this.yya, this.zza));
@@ -295,7 +277,6 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
         if (jumpTicks > 0) {
             jumpTicks--;
         }
-
     }
 
     private void moveWithFallDamage(Vec3 vec) {
@@ -304,7 +285,6 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
         if (!npc.isProtected()) {
             doCheckFallDamage(getY() - y, onGround);
         }
-
     }
 
     @Override
@@ -321,7 +301,6 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
         if (vector != null) {
             super.push(vector.getX(), vector.getY(), vector.getZ());
         }
-
     }
 
     @Override
@@ -332,7 +311,6 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
         if (npc != null) {
             Util.callCollisionEvent(npc, entity.getBukkitEntity());
         }
-
     }
 
     @Override
@@ -384,7 +362,6 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
         } else {
             NMSImpl.flyingMoveLogic(this, vec3d);
         }
-
     }
 
     @Override
@@ -394,7 +371,6 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
         if (!npc.isPushableByFluids()) {
             setDeltaMovement(old);
         }
-
         return res;
     }
 
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/EvokerController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/EvokerController.java
index 4c5f07db2..7e1d809b2 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/EvokerController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/EvokerController.java
@@ -74,7 +74,6 @@ public class EvokerController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -82,7 +81,6 @@ public class EvokerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -92,7 +90,6 @@ public class EvokerController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -105,7 +102,6 @@ public class EvokerController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new EvokerNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -175,7 +171,6 @@ public class EvokerController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -186,7 +181,6 @@ public class EvokerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -208,7 +202,6 @@ public class EvokerController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -220,7 +213,6 @@ public class EvokerController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/FoxController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/FoxController.java
index 59ccfcf64..27c129c7f 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/FoxController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/FoxController.java
@@ -75,7 +75,6 @@ public class FoxController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -83,7 +82,6 @@ public class FoxController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -93,7 +91,6 @@ public class FoxController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -106,7 +103,6 @@ public class FoxController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new FoxNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -176,7 +172,6 @@ public class FoxController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -186,7 +181,6 @@ public class FoxController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -197,7 +191,6 @@ public class FoxController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -219,7 +212,6 @@ public class FoxController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -231,7 +223,6 @@ public class FoxController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/FrogController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/FrogController.java
index 6fbc91b44..d7fbb3cb0 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/FrogController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/FrogController.java
@@ -57,7 +57,6 @@ public class FrogController extends MobEntityController {
             if (npc != null) {
                 croakAnimationState.start(1);
             }
-
         }
 
         @Override
@@ -79,7 +78,6 @@ public class FrogController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -87,7 +85,6 @@ public class FrogController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -97,7 +94,6 @@ public class FrogController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -110,7 +106,6 @@ public class FrogController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new FrogNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -180,7 +175,6 @@ public class FrogController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -190,7 +184,6 @@ public class FrogController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -201,7 +194,6 @@ public class FrogController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -223,7 +215,6 @@ public class FrogController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -235,7 +226,6 @@ public class FrogController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/GhastController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/GhastController.java
index ab75e77ae..2481a3498 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/GhastController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/GhastController.java
@@ -65,7 +65,6 @@ public class GhastController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -74,7 +73,6 @@ public class GhastController extends MobEntityController {
                 npc.update();
                 NMSImpl.updateMinecraftAIState(npc, this);
             }
-
             super.customServerAiStep();
         }
 
@@ -88,7 +86,6 @@ public class GhastController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new GhastNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -155,7 +152,6 @@ public class GhastController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -166,7 +162,6 @@ public class GhastController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -190,7 +185,6 @@ public class GhastController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/GiantController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/GiantController.java
index c1d1586fb..8fc34f06b 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/GiantController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/GiantController.java
@@ -74,7 +74,6 @@ public class GiantController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -82,7 +81,6 @@ public class GiantController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -92,7 +90,6 @@ public class GiantController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -105,7 +102,6 @@ public class GiantController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new GiantNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -175,7 +171,6 @@ public class GiantController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -186,7 +181,6 @@ public class GiantController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -196,7 +190,6 @@ public class GiantController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -218,7 +211,6 @@ public class GiantController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -230,7 +222,6 @@ public class GiantController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/GlowSquidController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/GlowSquidController.java
index 196b31ff6..b08e0def6 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/GlowSquidController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/GlowSquidController.java
@@ -74,7 +74,6 @@ public class GlowSquidController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -82,7 +81,6 @@ public class GlowSquidController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -92,7 +90,6 @@ public class GlowSquidController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -105,7 +102,6 @@ public class GlowSquidController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new GlowSquidNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -175,7 +171,6 @@ public class GlowSquidController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -186,7 +181,6 @@ public class GlowSquidController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -196,7 +190,6 @@ public class GlowSquidController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -218,7 +211,6 @@ public class GlowSquidController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -230,7 +222,6 @@ public class GlowSquidController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/GoatController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/GoatController.java
index 10ff9d9e9..45463c92a 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/GoatController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/GoatController.java
@@ -75,7 +75,6 @@ public class GoatController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -83,7 +82,6 @@ public class GoatController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -93,7 +91,6 @@ public class GoatController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -106,7 +103,6 @@ public class GoatController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new GoatNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -176,7 +172,6 @@ public class GoatController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -186,7 +181,6 @@ public class GoatController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -197,7 +191,6 @@ public class GoatController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -219,7 +212,6 @@ public class GoatController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -231,7 +223,6 @@ public class GoatController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/GuardianController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/GuardianController.java
index 3c7b204b1..1a153d7d5 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/GuardianController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/GuardianController.java
@@ -66,10 +66,8 @@ public class GuardianController extends MobEntityController {
                 } else {
                     super.aiStep();
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
@@ -91,7 +89,6 @@ public class GuardianController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -99,7 +96,6 @@ public class GuardianController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -112,7 +108,6 @@ public class GuardianController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new GuardianNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -182,7 +177,6 @@ public class GuardianController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -193,7 +187,6 @@ public class GuardianController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -203,7 +196,6 @@ public class GuardianController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -225,7 +217,6 @@ public class GuardianController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -237,7 +228,6 @@ public class GuardianController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/GuardianElderController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/GuardianElderController.java
index 48acf194c..bf317413c 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/GuardianElderController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/GuardianElderController.java
@@ -66,10 +66,8 @@ public class GuardianElderController extends MobEntityController {
                 } else {
                     super.aiStep();
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
@@ -91,7 +89,6 @@ public class GuardianElderController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -99,7 +96,6 @@ public class GuardianElderController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -112,7 +108,6 @@ public class GuardianElderController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new GuardianElderNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -182,7 +177,6 @@ public class GuardianElderController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -193,7 +187,6 @@ public class GuardianElderController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -203,7 +196,6 @@ public class GuardianElderController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -225,7 +217,6 @@ public class GuardianElderController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -237,7 +228,6 @@ public class GuardianElderController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HoglinController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HoglinController.java
index 9aed0a3a5..a054158d8 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HoglinController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HoglinController.java
@@ -56,7 +56,6 @@ public class HoglinController extends MobEntityController {
             if (npc != null) {
                 NMSImpl.clearGoals(npc, goalSelector, targetSelector);
             }
-
         }
 
         @Override
@@ -78,7 +77,6 @@ public class HoglinController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -86,7 +84,6 @@ public class HoglinController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -95,12 +92,10 @@ public class HoglinController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 setImmuneToZombification(true);
             }
-
             super.customServerAiStep();
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -113,7 +108,6 @@ public class HoglinController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new HoglinNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -183,7 +177,6 @@ public class HoglinController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -194,7 +187,6 @@ public class HoglinController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -216,7 +208,6 @@ public class HoglinController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -228,7 +219,6 @@ public class HoglinController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HorseController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HorseController.java
index 71cd34b77..04e4581e5 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HorseController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HorseController.java
@@ -73,7 +73,6 @@ public class HorseController extends MobEntityController {
                 horse.setDomestication(horse.getMaxDomestication());
                 baseMovementSpeed = this.getAttribute(Attributes.MOVEMENT_SPEED).getValue();
             }
-
         }
 
         @Override
@@ -95,7 +94,6 @@ public class HorseController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -103,7 +101,6 @@ public class HorseController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -119,16 +116,13 @@ public class HorseController extends MobEntityController {
             } else {
                 riding = false;
             }
-
             if (riding) {
                 if (npc.getNavigator().isNavigating()) {
                     org.bukkit.entity.Entity basePassenger = passengers.get(0).getBukkitEntity();
                     NMS.look(basePassenger, getYRot(), getXRot());
                 }
-
                 setFlag(4, true); // datawatcher method
             }
-
             NMS.setStepHeight(getBukkitEntity(), 1);
             npc.update();
         }
@@ -143,7 +137,6 @@ public class HorseController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new HorseNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -225,7 +218,6 @@ public class HorseController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -235,7 +227,6 @@ public class HorseController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -246,7 +237,6 @@ public class HorseController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -268,7 +258,6 @@ public class HorseController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -280,7 +269,6 @@ public class HorseController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HorseDonkeyController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HorseDonkeyController.java
index bb4a3019b..f412f38b9 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HorseDonkeyController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HorseDonkeyController.java
@@ -73,7 +73,6 @@ public class HorseDonkeyController extends MobEntityController {
                         .setDomestication(((org.bukkit.entity.Donkey) getBukkitEntity()).getMaxDomestication());
                 baseMovementSpeed = this.getAttribute(Attributes.MOVEMENT_SPEED).getValue();
             }
-
         }
 
         @Override
@@ -95,7 +94,6 @@ public class HorseDonkeyController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -103,7 +101,6 @@ public class HorseDonkeyController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -118,20 +115,16 @@ public class HorseDonkeyController extends MobEntityController {
                 } else {
                     riding = false;
                 }
-
                 if (riding) {
                     if (npc.getNavigator().isNavigating()) {
                         org.bukkit.entity.Entity basePassenger = passengers.get(0).getBukkitEntity();
                         NMS.look(basePassenger, getYRot(), getXRot());
                     }
-
                     setFlag(4, true); // datawatcher method
                 }
-
                 NMS.setStepHeight(getBukkitEntity(), 1);
                 npc.update();
             }
-
         }
 
         @Override
@@ -144,7 +137,6 @@ public class HorseDonkeyController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new HorseDonkeyNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -226,7 +218,6 @@ public class HorseDonkeyController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -236,7 +227,6 @@ public class HorseDonkeyController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -247,7 +237,6 @@ public class HorseDonkeyController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -269,7 +258,6 @@ public class HorseDonkeyController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -281,7 +269,6 @@ public class HorseDonkeyController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HorseMuleController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HorseMuleController.java
index 1230f3e47..f684f1449 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HorseMuleController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HorseMuleController.java
@@ -73,7 +73,6 @@ public class HorseMuleController extends MobEntityController {
                         .setDomestication(((org.bukkit.entity.Mule) getBukkitEntity()).getMaxDomestication());
                 baseMovementSpeed = this.getAttribute(Attributes.MOVEMENT_SPEED).getValue();
             }
-
         }
 
         @Override
@@ -95,7 +94,6 @@ public class HorseMuleController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -103,7 +101,6 @@ public class HorseMuleController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -118,20 +115,16 @@ public class HorseMuleController extends MobEntityController {
                 } else {
                     riding = false;
                 }
-
                 if (riding) {
                     if (npc.getNavigator().isNavigating()) {
                         org.bukkit.entity.Entity basePassenger = passengers.get(0).getBukkitEntity();
                         NMS.look(basePassenger, getYRot(), getXRot());
                     }
-
                     setFlag(4, true); // datawatcher method
                 }
-
                 NMS.setStepHeight(getBukkitEntity(), 1);
                 npc.update();
             }
-
         }
 
         @Override
@@ -144,7 +137,6 @@ public class HorseMuleController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new HorseMuleNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -226,7 +218,6 @@ public class HorseMuleController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -236,7 +227,6 @@ public class HorseMuleController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -247,7 +237,6 @@ public class HorseMuleController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -269,7 +258,6 @@ public class HorseMuleController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -281,7 +269,6 @@ public class HorseMuleController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HorseSkeletonController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HorseSkeletonController.java
index 345924d71..5e5ed21f0 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HorseSkeletonController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HorseSkeletonController.java
@@ -73,7 +73,6 @@ public class HorseSkeletonController extends MobEntityController {
                         .setDomestication(((org.bukkit.entity.SkeletonHorse) getBukkitEntity()).getMaxDomestication());
                 baseMovementSpeed = this.getAttribute(Attributes.MOVEMENT_SPEED).getValue();
             }
-
         }
 
         @Override
@@ -95,7 +94,6 @@ public class HorseSkeletonController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -103,7 +101,6 @@ public class HorseSkeletonController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -118,20 +115,16 @@ public class HorseSkeletonController extends MobEntityController {
                 } else {
                     riding = false;
                 }
-
                 if (riding) {
                     if (npc.getNavigator().isNavigating()) {
                         org.bukkit.entity.Entity basePassenger = passengers.get(0).getBukkitEntity();
                         NMS.look(basePassenger, getYRot(), getXRot());
                     }
-
                     setFlag(4, true); // datawatcher method
                 }
-
                 NMS.setStepHeight(getBukkitEntity(), 1);
                 npc.update();
             }
-
         }
 
         @Override
@@ -144,7 +137,6 @@ public class HorseSkeletonController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new HorseSkeletonNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -226,7 +218,6 @@ public class HorseSkeletonController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -236,7 +227,6 @@ public class HorseSkeletonController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -247,7 +237,6 @@ public class HorseSkeletonController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -269,7 +258,6 @@ public class HorseSkeletonController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -281,7 +269,6 @@ public class HorseSkeletonController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HorseZombieController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HorseZombieController.java
index 725ca51ea..17ae326a3 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HorseZombieController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HorseZombieController.java
@@ -73,7 +73,6 @@ public class HorseZombieController extends MobEntityController {
                         .setDomestication(((org.bukkit.entity.ZombieHorse) getBukkitEntity()).getMaxDomestication());
                 baseMovementSpeed = this.getAttribute(Attributes.MOVEMENT_SPEED).getValue();
             }
-
         }
 
         @Override
@@ -95,7 +94,6 @@ public class HorseZombieController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -103,7 +101,6 @@ public class HorseZombieController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -118,20 +115,16 @@ public class HorseZombieController extends MobEntityController {
                 } else {
                     riding = false;
                 }
-
                 if (riding) {
                     if (npc.getNavigator().isNavigating()) {
                         org.bukkit.entity.Entity basePassenger = passengers.get(0).getBukkitEntity();
                         NMS.look(basePassenger, getYRot(), getXRot());
                     }
-
                     setFlag(4, true); // datawatcher method
                 }
-
                 NMS.setStepHeight(getBukkitEntity(), 1);
                 npc.update();
             }
-
         }
 
         @Override
@@ -144,7 +137,6 @@ public class HorseZombieController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new HorseZombieNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -226,7 +218,6 @@ public class HorseZombieController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -236,7 +227,6 @@ public class HorseZombieController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -247,7 +237,6 @@ public class HorseZombieController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -269,7 +258,6 @@ public class HorseZombieController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -281,7 +269,6 @@ public class HorseZombieController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HumanController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HumanController.java
index 894d10f88..ecd8a15fc 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HumanController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/HumanController.java
@@ -35,18 +35,15 @@ public class HumanController extends AbstractEntityController {
         if (npc.requiresNameHologram()) {
             name = teamName;
         }
-
         if (Setting.USE_SCOREBOARD_TEAMS.asBoolean()) {
             npc.getOrAddTrait(ScoreboardTrait.class).createTeam(name);
         }
-
         final GameProfile profile = new GameProfile(uuid, name);
         final EntityHumanNPC handle = new EntityHumanNPC(MinecraftServer.getServer(), nmsWorld, profile, npc);
         Skin skin = handle.getSkinTracker().getSkin();
         if (skin != null) {
             skin.apply(handle);
         }
-
         Bukkit.getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(), () -> {
             if (getBukkitEntity() == null || !getBukkitEntity().isValid()
                     || getBukkitEntity() != handle.getBukkitEntity())
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/IllusionerController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/IllusionerController.java
index 7633200a0..3c2ca0e77 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/IllusionerController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/IllusionerController.java
@@ -74,7 +74,6 @@ public class IllusionerController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -82,7 +81,6 @@ public class IllusionerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -92,7 +90,6 @@ public class IllusionerController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -105,7 +102,6 @@ public class IllusionerController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new IllusionerNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -175,7 +171,6 @@ public class IllusionerController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -186,7 +181,6 @@ public class IllusionerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -208,7 +202,6 @@ public class IllusionerController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -220,7 +213,6 @@ public class IllusionerController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/IronGolemController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/IronGolemController.java
index 1f39a1fc6..6817cf1a2 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/IronGolemController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/IronGolemController.java
@@ -74,7 +74,6 @@ public class IronGolemController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -82,7 +81,6 @@ public class IronGolemController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -92,7 +90,6 @@ public class IronGolemController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -105,7 +102,6 @@ public class IronGolemController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new IronGolemNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -175,7 +171,6 @@ public class IronGolemController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -186,7 +181,6 @@ public class IronGolemController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -196,7 +190,6 @@ public class IronGolemController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -218,7 +211,6 @@ public class IronGolemController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -230,7 +222,6 @@ public class IronGolemController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/LlamaController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/LlamaController.java
index 6a4d6da3e..c7e8f45cb 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/LlamaController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/LlamaController.java
@@ -73,7 +73,6 @@ public class LlamaController extends MobEntityController {
                         .setDomestication(((org.bukkit.entity.Llama) getBukkitEntity()).getMaxDomestication());
                 baseMovementSpeed = this.getAttribute(Attributes.MOVEMENT_SPEED).getValue();
             }
-
         }
 
         @Override
@@ -95,7 +94,6 @@ public class LlamaController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -103,7 +101,6 @@ public class LlamaController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -118,20 +115,16 @@ public class LlamaController extends MobEntityController {
                 } else {
                     riding = false;
                 }
-
                 if (riding) {
                     if (npc.getNavigator().isNavigating()) {
                         org.bukkit.entity.Entity basePassenger = passengers.get(0).getBukkitEntity();
                         NMS.look(basePassenger, getYRot(), getXRot());
                     }
-
                     setFlag(4, true); // datawatcher method
                 }
-
                 NMS.setStepHeight(getBukkitEntity(), 1);
                 npc.update();
             }
-
         }
 
         @Override
@@ -144,7 +137,6 @@ public class LlamaController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new LlamaNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -226,7 +218,6 @@ public class LlamaController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -236,7 +227,6 @@ public class LlamaController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -247,7 +237,6 @@ public class LlamaController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -269,7 +258,6 @@ public class LlamaController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -281,7 +269,6 @@ public class LlamaController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/MagmaCubeController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/MagmaCubeController.java
index 99d5484be..f369ec366 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/MagmaCubeController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/MagmaCubeController.java
@@ -63,7 +63,6 @@ public class MagmaCubeController extends MobEntityController {
                 this.oldMoveController = this.moveControl;
                 this.moveControl = new EntityMoveControl(this);
             }
-
         }
 
         @Override
@@ -85,7 +84,6 @@ public class MagmaCubeController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -93,7 +91,6 @@ public class MagmaCubeController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -106,7 +103,6 @@ public class MagmaCubeController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new MagmaCubeNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -175,7 +171,6 @@ public class MagmaCubeController extends MobEntityController {
             if (npc == null) {
                 super.playerTouch(human);
             }
-
         }
 
         @Override
@@ -184,7 +179,6 @@ public class MagmaCubeController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -195,7 +189,6 @@ public class MagmaCubeController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -205,7 +198,6 @@ public class MagmaCubeController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -228,14 +220,11 @@ public class MagmaCubeController extends MobEntityController {
                 if (npc.useMinecraftAI() && this.moveControl != this.oldMoveController) {
                     this.moveControl = this.oldMoveController;
                 }
-
                 if (!npc.useMinecraftAI() && this.moveControl == this.oldMoveController) {
                     this.moveControl = new EntityMoveControl(this);
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
@@ -245,7 +234,6 @@ public class MagmaCubeController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -257,7 +245,6 @@ public class MagmaCubeController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/MobEntityController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/MobEntityController.java
index 77dcc615b..2cc93d43c 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/MobEntityController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/MobEntityController.java
@@ -39,9 +39,7 @@ public abstract class MobEntityController extends AbstractEntityController {
             if (mob.getLookControl().getClass() == LookControl.class) {
                 NMSImpl.setLookControl(mob, new PitchableLookControl(mob));
             }
-
         }
-
         entity.absMoveTo(at.getX(), at.getY(), at.getZ(), at.getYaw(), at.getPitch());
         if (npc != null) {
             // entity.onGround isn't updated right away - we approximate here so
@@ -50,14 +48,11 @@ public abstract class MobEntityController extends AbstractEntityController {
             if (beneath.isSolid()) {
                 entity.setOnGround(true);
             }
-
             entity.setUUID(npc.getUniqueId());
             if (Setting.USE_SCOREBOARD_TEAMS.asBoolean()) {
                 npc.getOrAddTrait(ScoreboardTrait.class).createTeam(npc.getUniqueId().toString());
             }
-
         }
-
         return entity.getBukkitEntity();
     }
 
@@ -68,7 +63,6 @@ public abstract class MobEntityController extends AbstractEntityController {
             ex.printStackTrace();
             return null;
         }
-
     }
 
     private static Constructor<?> getConstructor(Class<?> clazz) {
@@ -81,7 +75,6 @@ public abstract class MobEntityController extends AbstractEntityController {
         } catch (Exception ex) {
             throw new IllegalStateException("unable to find an entity constructor");
         }
-
     }
 
     private static final Map<Class<?>, Constructor<?>> CONSTRUCTOR_CACHE = new WeakHashMap<>();
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/MushroomCowController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/MushroomCowController.java
index 27d05abac..dcaec9ef2 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/MushroomCowController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/MushroomCowController.java
@@ -78,7 +78,6 @@ public class MushroomCowController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -86,7 +85,6 @@ public class MushroomCowController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -96,7 +94,6 @@ public class MushroomCowController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -109,7 +106,6 @@ public class MushroomCowController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new MushroomCowNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -186,7 +182,6 @@ public class MushroomCowController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -196,7 +191,6 @@ public class MushroomCowController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -207,7 +201,6 @@ public class MushroomCowController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -229,7 +222,6 @@ public class MushroomCowController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -241,7 +233,6 @@ public class MushroomCowController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/OcelotController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/OcelotController.java
index 0e6b1e1a0..5eb1ac113 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/OcelotController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/OcelotController.java
@@ -76,7 +76,6 @@ public class OcelotController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -84,7 +83,6 @@ public class OcelotController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -95,12 +93,10 @@ public class OcelotController extends MobEntityController {
             if (restorePose) {
                 this.setPose(old);
             }
-
             if (npc != null) {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -113,7 +109,6 @@ public class OcelotController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new OcelotNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -183,7 +178,6 @@ public class OcelotController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -193,7 +187,6 @@ public class OcelotController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -204,7 +197,6 @@ public class OcelotController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -226,7 +218,6 @@ public class OcelotController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -238,7 +229,6 @@ public class OcelotController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PandaController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PandaController.java
index bf431e835..ee25b7a8f 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PandaController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PandaController.java
@@ -75,7 +75,6 @@ public class PandaController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -83,7 +82,6 @@ public class PandaController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -93,7 +91,6 @@ public class PandaController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -106,7 +103,6 @@ public class PandaController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new PandaNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -176,7 +172,6 @@ public class PandaController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -186,7 +181,6 @@ public class PandaController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -197,7 +191,6 @@ public class PandaController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -219,7 +212,6 @@ public class PandaController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -231,7 +223,6 @@ public class PandaController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ParrotController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ParrotController.java
index dc4cdc5bd..9e35e32de 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ParrotController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ParrotController.java
@@ -68,7 +68,6 @@ public class ParrotController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -80,10 +79,8 @@ public class ParrotController extends MobEntityController {
                 if (npc.useMinecraftAI()) {
                     super.customServerAiStep();
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
@@ -96,7 +93,6 @@ public class ParrotController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ParrotNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -166,7 +162,6 @@ public class ParrotController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -177,7 +172,6 @@ public class ParrotController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -201,7 +195,6 @@ public class ParrotController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PhantomController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PhantomController.java
index 3d92a46b3..7e64dcb2b 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PhantomController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PhantomController.java
@@ -68,7 +68,6 @@ public class PhantomController extends MobEntityController {
                 this.lookControl = new LookControl(this);
                 // TODO: phantom pitch reversed
             }
-
         }
 
         @Override
@@ -80,19 +79,15 @@ public class PhantomController extends MobEntityController {
                     this.moveControl = this.oldMoveController;
                     this.lookControl = this.oldLookController;
                 }
-
                 if (!npc.useMinecraftAI() && this.moveControl == this.oldMoveController) {
                     this.moveControl = new EntityMoveControl(this);
                     this.lookControl = new LookControl(this);
                 }
-
                 if (npc.isProtected()) {
                     setSecondsOnFire(0);
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
@@ -114,7 +109,6 @@ public class PhantomController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -122,7 +116,6 @@ public class PhantomController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -135,7 +128,6 @@ public class PhantomController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new PhantomNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -212,7 +204,6 @@ public class PhantomController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -222,7 +213,6 @@ public class PhantomController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -233,7 +223,6 @@ public class PhantomController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -260,7 +249,6 @@ public class PhantomController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -272,7 +260,6 @@ public class PhantomController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PigController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PigController.java
index be8338874..66e739768 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PigController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PigController.java
@@ -76,7 +76,6 @@ public class PigController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -84,7 +83,6 @@ public class PigController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -94,7 +92,6 @@ public class PigController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -107,7 +104,6 @@ public class PigController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new PigNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -183,7 +179,6 @@ public class PigController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -193,7 +188,6 @@ public class PigController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -204,7 +198,6 @@ public class PigController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -224,7 +217,6 @@ public class PigController extends MobEntityController {
             if (npc == null) {
                 super.thunderHit(worldserver, entitylightning);
             }
-
         }
 
         @Override
@@ -234,7 +226,6 @@ public class PigController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -246,7 +237,6 @@ public class PigController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PigZombieController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PigZombieController.java
index 0ced66d85..8391bdc9d 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PigZombieController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PigZombieController.java
@@ -74,7 +74,6 @@ public class PigZombieController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -82,7 +81,6 @@ public class PigZombieController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -92,7 +90,6 @@ public class PigZombieController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -105,7 +102,6 @@ public class PigZombieController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new PigZombieNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -175,7 +171,6 @@ public class PigZombieController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -186,7 +181,6 @@ public class PigZombieController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -208,7 +202,6 @@ public class PigZombieController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -220,7 +213,6 @@ public class PigZombieController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PiglinBruteController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PiglinBruteController.java
index 1141025f4..a4a03c8f9 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PiglinBruteController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PiglinBruteController.java
@@ -74,7 +74,6 @@ public class PiglinBruteController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -82,7 +81,6 @@ public class PiglinBruteController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -91,12 +89,10 @@ public class PiglinBruteController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 setImmuneToZombification(true);
             }
-
             super.customServerAiStep();
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -109,7 +105,6 @@ public class PiglinBruteController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new PiglinBruteNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -179,7 +174,6 @@ public class PiglinBruteController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -190,7 +184,6 @@ public class PiglinBruteController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -212,7 +205,6 @@ public class PiglinBruteController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -224,7 +216,6 @@ public class PiglinBruteController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PiglinController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PiglinController.java
index 2bdbd2d3e..d355965dd 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PiglinController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PiglinController.java
@@ -74,7 +74,6 @@ public class PiglinController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -82,7 +81,6 @@ public class PiglinController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -91,12 +89,10 @@ public class PiglinController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 setImmuneToZombification(true);
             }
-
             super.customServerAiStep();
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -109,7 +105,6 @@ public class PiglinController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new PiglinNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -179,7 +174,6 @@ public class PiglinController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -190,7 +184,6 @@ public class PiglinController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -212,7 +205,6 @@ public class PiglinController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -224,7 +216,6 @@ public class PiglinController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PillagerController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PillagerController.java
index 9a3395499..e0122abc1 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PillagerController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PillagerController.java
@@ -75,7 +75,6 @@ public class PillagerController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -83,7 +82,6 @@ public class PillagerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -93,7 +91,6 @@ public class PillagerController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -106,7 +103,6 @@ public class PillagerController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new PillagerNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -176,7 +172,6 @@ public class PillagerController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -186,7 +181,6 @@ public class PillagerController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -197,7 +191,6 @@ public class PillagerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -219,7 +212,6 @@ public class PillagerController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -231,7 +223,6 @@ public class PillagerController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PolarBearController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PolarBearController.java
index e36edcff5..9bc0ec8f5 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PolarBearController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PolarBearController.java
@@ -66,7 +66,6 @@ public class PolarBearController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -76,7 +75,6 @@ public class PolarBearController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -89,7 +87,6 @@ public class PolarBearController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new PolarBearNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -151,7 +148,6 @@ public class PolarBearController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -161,7 +157,6 @@ public class PolarBearController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -172,7 +167,6 @@ public class PolarBearController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -196,7 +190,6 @@ public class PolarBearController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PufferFishController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PufferFishController.java
index 1e948a5e0..92cf8674d 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PufferFishController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/PufferFishController.java
@@ -69,7 +69,6 @@ public class PufferFishController extends MobEntityController {
                 this.oldMoveController = this.moveControl;
                 this.moveControl = new MoveControl(this);
             }
-
         }
 
         @Override
@@ -80,13 +79,11 @@ public class PufferFishController extends MobEntityController {
                 this.verticalCollision = false;
                 setPuffState(0);
             }
-
             super.aiStep();
             if (npc != null) {
                 this.verticalCollision = lastInWater;
                 setPuffState(lastPuffState);
             }
-
         }
 
         @Override
@@ -108,7 +105,6 @@ public class PufferFishController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -116,7 +112,6 @@ public class PufferFishController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -127,14 +122,11 @@ public class PufferFishController extends MobEntityController {
                 if (npc.useMinecraftAI() && this.moveControl != this.oldMoveController) {
                     this.moveControl = this.oldMoveController;
                 }
-
                 if (!npc.useMinecraftAI() && this.moveControl == this.oldMoveController) {
                     this.moveControl = new EntityMoveControl(this);
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
@@ -147,7 +139,6 @@ public class PufferFishController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new PufferFishNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -234,7 +225,6 @@ public class PufferFishController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -245,7 +235,6 @@ public class PufferFishController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -265,13 +254,11 @@ public class PufferFishController extends MobEntityController {
             if (npc != null) {
                 NMSImpl.resetPuffTicks(this);
             }
-
             super.tick();
             PufferFishTrait trait = null;
             if (npc != null && (trait = npc.getTraitNullable(PufferFishTrait.class)) != null) {
                 setPuffState(trait.getPuffState());
             }
-
         }
 
         @Override
@@ -280,11 +267,9 @@ public class PufferFishController extends MobEntityController {
                 if (!NMSImpl.moveFish(npc, this, vec3d)) {
                     super.travel(vec3d);
                 }
-
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -296,7 +281,6 @@ public class PufferFishController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
 
@@ -309,7 +293,6 @@ public class PufferFishController extends MobEntityController {
                 default:
                     return 1.0F;
             }
-
         }
     }
 
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/RabbitController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/RabbitController.java
index 44c333397..7102daa2d 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/RabbitController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/RabbitController.java
@@ -76,7 +76,6 @@ public class RabbitController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -84,7 +83,6 @@ public class RabbitController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -95,10 +93,8 @@ public class RabbitController extends MobEntityController {
                 if (npc.getNavigator().isNavigating()) {
                     NMS.setShouldJump(getBukkitEntity());
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
@@ -111,7 +107,6 @@ public class RabbitController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new RabbitNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -186,7 +181,6 @@ public class RabbitController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -196,7 +190,6 @@ public class RabbitController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -207,7 +200,6 @@ public class RabbitController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -223,7 +215,6 @@ public class RabbitController extends MobEntityController {
                 this.entityData.set(NMSImpl.getRabbitTypeField(), variant.id());
                 return;
             }
-
             super.setVariant(variant);
         }
 
@@ -241,7 +232,6 @@ public class RabbitController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -253,7 +243,6 @@ public class RabbitController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/RavagerController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/RavagerController.java
index 0ef67b71c..3a54e4ed3 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/RavagerController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/RavagerController.java
@@ -75,7 +75,6 @@ public class RavagerController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -83,7 +82,6 @@ public class RavagerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -93,7 +91,6 @@ public class RavagerController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -106,7 +103,6 @@ public class RavagerController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new RavagerNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -181,7 +177,6 @@ public class RavagerController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -191,7 +186,6 @@ public class RavagerController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -202,7 +196,6 @@ public class RavagerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -224,7 +217,6 @@ public class RavagerController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -236,7 +228,6 @@ public class RavagerController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SalmonController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SalmonController.java
index 2fad163e0..5a61c8489 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SalmonController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SalmonController.java
@@ -66,7 +66,6 @@ public class SalmonController extends MobEntityController {
                 this.oldMoveController = this.moveControl;
                 this.moveControl = new MoveControl(this);
             }
-
         }
 
         @Override
@@ -75,12 +74,10 @@ public class SalmonController extends MobEntityController {
             if (npc != null) {
                 this.verticalCollision = false;
             }
-
             super.aiStep();
             if (npc != null) {
                 this.verticalCollision = lastInWater;
             }
-
         }
 
         @Override
@@ -102,7 +99,6 @@ public class SalmonController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -110,7 +106,6 @@ public class SalmonController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -121,18 +116,14 @@ public class SalmonController extends MobEntityController {
                 if (npc.useMinecraftAI() && this.moveControl != this.oldMoveController) {
                     this.moveControl = this.oldMoveController;
                 }
-
                 if (!npc.useMinecraftAI() && this.moveControl == this.oldMoveController) {
                     this.moveControl = new EntityMoveControl(this);
                 }
-
             }
-
             super.customServerAiStep();
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -145,7 +136,6 @@ public class SalmonController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SalmonNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -225,7 +215,6 @@ public class SalmonController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -236,7 +225,6 @@ public class SalmonController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -257,11 +245,9 @@ public class SalmonController extends MobEntityController {
                 if (!NMSImpl.moveFish(npc, this, vec3d)) {
                     super.travel(vec3d);
                 }
-
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -273,7 +259,6 @@ public class SalmonController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SheepController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SheepController.java
index 4bc80955a..3aad46b97 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SheepController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SheepController.java
@@ -75,7 +75,6 @@ public class SheepController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -83,7 +82,6 @@ public class SheepController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -93,7 +91,6 @@ public class SheepController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -106,7 +103,6 @@ public class SheepController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SheepNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -176,7 +172,6 @@ public class SheepController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -186,7 +181,6 @@ public class SheepController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -197,7 +191,6 @@ public class SheepController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -219,7 +212,6 @@ public class SheepController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -231,7 +223,6 @@ public class SheepController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ShulkerController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ShulkerController.java
index eeee7a326..f85bf2668 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ShulkerController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ShulkerController.java
@@ -61,7 +61,6 @@ public class ShulkerController extends MobEntityController {
             if (npc == null || npc.useMinecraftAI()) {
                 super.aiStep();
             }
-
         }
 
         @Override
@@ -83,7 +82,6 @@ public class ShulkerController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -91,7 +89,6 @@ public class ShulkerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -109,7 +106,6 @@ public class ShulkerController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ShulkerNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -179,7 +175,6 @@ public class ShulkerController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -190,7 +185,6 @@ public class ShulkerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -200,7 +194,6 @@ public class ShulkerController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -222,12 +215,10 @@ public class ShulkerController extends MobEntityController {
                 if (npc.useMinecraftAI()) {
                     super.tick();
                 }
-
                 npc.update();
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -237,7 +228,6 @@ public class ShulkerController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -249,7 +239,6 @@ public class ShulkerController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SilverfishController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SilverfishController.java
index 9fab1ecfc..ab937e6dd 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SilverfishController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SilverfishController.java
@@ -74,7 +74,6 @@ public class SilverfishController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -82,7 +81,6 @@ public class SilverfishController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -92,7 +90,6 @@ public class SilverfishController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -105,7 +102,6 @@ public class SilverfishController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SilverfishNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -175,7 +171,6 @@ public class SilverfishController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -186,7 +181,6 @@ public class SilverfishController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -196,7 +190,6 @@ public class SilverfishController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -218,7 +211,6 @@ public class SilverfishController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -230,7 +222,6 @@ public class SilverfishController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SkeletonController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SkeletonController.java
index 9930ffe25..69ffb41d0 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SkeletonController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SkeletonController.java
@@ -74,7 +74,6 @@ public class SkeletonController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -82,7 +81,6 @@ public class SkeletonController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -92,7 +90,6 @@ public class SkeletonController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -105,7 +102,6 @@ public class SkeletonController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SkeletonNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -175,7 +171,6 @@ public class SkeletonController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -186,7 +181,6 @@ public class SkeletonController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -196,7 +190,6 @@ public class SkeletonController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -218,7 +211,6 @@ public class SkeletonController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -230,7 +222,6 @@ public class SkeletonController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SkeletonStrayController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SkeletonStrayController.java
index b6d853ee3..a6f9f0303 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SkeletonStrayController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SkeletonStrayController.java
@@ -74,7 +74,6 @@ public class SkeletonStrayController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -82,7 +81,6 @@ public class SkeletonStrayController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -92,7 +90,6 @@ public class SkeletonStrayController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -105,7 +102,6 @@ public class SkeletonStrayController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new StrayNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -175,7 +171,6 @@ public class SkeletonStrayController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -186,7 +181,6 @@ public class SkeletonStrayController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -196,7 +190,6 @@ public class SkeletonStrayController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -218,7 +211,6 @@ public class SkeletonStrayController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -230,7 +222,6 @@ public class SkeletonStrayController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SkeletonWitherController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SkeletonWitherController.java
index 69c9e871a..d14f2cda3 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SkeletonWitherController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SkeletonWitherController.java
@@ -74,7 +74,6 @@ public class SkeletonWitherController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -82,7 +81,6 @@ public class SkeletonWitherController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -92,7 +90,6 @@ public class SkeletonWitherController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -105,7 +102,6 @@ public class SkeletonWitherController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SkeletonWitherNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -175,7 +171,6 @@ public class SkeletonWitherController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -186,7 +181,6 @@ public class SkeletonWitherController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -196,7 +190,6 @@ public class SkeletonWitherController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -218,7 +211,6 @@ public class SkeletonWitherController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -230,7 +222,6 @@ public class SkeletonWitherController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SlimeController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SlimeController.java
index 745d26027..a53706ed4 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SlimeController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SlimeController.java
@@ -63,7 +63,6 @@ public class SlimeController extends MobEntityController {
                 this.oldMoveController = this.moveControl;
                 this.moveControl = new EntityMoveControl(this);
             }
-
         }
 
         @Override
@@ -85,7 +84,6 @@ public class SlimeController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -93,7 +91,6 @@ public class SlimeController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -106,7 +103,6 @@ public class SlimeController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SlimeNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -175,7 +171,6 @@ public class SlimeController extends MobEntityController {
             if (npc == null) {
                 super.playerTouch(human);
             }
-
         }
 
         @Override
@@ -184,7 +179,6 @@ public class SlimeController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -195,7 +189,6 @@ public class SlimeController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -205,7 +198,6 @@ public class SlimeController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -228,14 +220,11 @@ public class SlimeController extends MobEntityController {
                 if (npc.useMinecraftAI() && this.moveControl != this.oldMoveController) {
                     this.moveControl = this.oldMoveController;
                 }
-
                 if (!npc.useMinecraftAI() && this.moveControl == this.oldMoveController) {
                     this.moveControl = new EntityMoveControl(this);
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
@@ -245,7 +234,6 @@ public class SlimeController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -257,7 +245,6 @@ public class SlimeController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SnifferController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SnifferController.java
index 80623e66f..2fd7086c5 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SnifferController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SnifferController.java
@@ -80,7 +80,6 @@ public class SnifferController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -88,7 +87,6 @@ public class SnifferController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -98,7 +96,6 @@ public class SnifferController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -111,7 +108,6 @@ public class SnifferController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SnifferNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -191,7 +187,6 @@ public class SnifferController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -201,7 +196,6 @@ public class SnifferController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -212,7 +206,6 @@ public class SnifferController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -234,7 +227,6 @@ public class SnifferController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -246,7 +238,6 @@ public class SnifferController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SnowmanController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SnowmanController.java
index 33b4cab52..c5a1623a3 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SnowmanController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SnowmanController.java
@@ -74,7 +74,6 @@ public class SnowmanController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -82,7 +81,6 @@ public class SnowmanController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -92,7 +90,6 @@ public class SnowmanController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -105,7 +102,6 @@ public class SnowmanController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SnowmanNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -175,7 +171,6 @@ public class SnowmanController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -186,7 +181,6 @@ public class SnowmanController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -196,7 +190,6 @@ public class SnowmanController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -218,7 +211,6 @@ public class SnowmanController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -230,7 +222,6 @@ public class SnowmanController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SpiderController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SpiderController.java
index f993f0656..f41c89abd 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SpiderController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SpiderController.java
@@ -74,7 +74,6 @@ public class SpiderController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -82,7 +81,6 @@ public class SpiderController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -92,7 +90,6 @@ public class SpiderController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -105,7 +102,6 @@ public class SpiderController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SpiderNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -175,7 +171,6 @@ public class SpiderController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -186,7 +181,6 @@ public class SpiderController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -196,7 +190,6 @@ public class SpiderController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -218,7 +211,6 @@ public class SpiderController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -230,7 +222,6 @@ public class SpiderController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SquidController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SquidController.java
index 5675f4c29..5f503047b 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SquidController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/SquidController.java
@@ -74,7 +74,6 @@ public class SquidController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -82,7 +81,6 @@ public class SquidController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -92,7 +90,6 @@ public class SquidController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -105,7 +102,6 @@ public class SquidController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SquidNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -175,7 +171,6 @@ public class SquidController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -186,7 +181,6 @@ public class SquidController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -196,7 +190,6 @@ public class SquidController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -218,7 +211,6 @@ public class SquidController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -230,7 +222,6 @@ public class SquidController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/StriderController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/StriderController.java
index 872ff2a2d..380b4cdaf 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/StriderController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/StriderController.java
@@ -74,7 +74,6 @@ public class StriderController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -82,7 +81,6 @@ public class StriderController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -92,7 +90,6 @@ public class StriderController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -105,7 +102,6 @@ public class StriderController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new StriderNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -175,7 +171,6 @@ public class StriderController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -186,7 +181,6 @@ public class StriderController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -208,7 +202,6 @@ public class StriderController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -220,7 +213,6 @@ public class StriderController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/TadpoleController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/TadpoleController.java
index 992e778bc..8a1fecc81 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/TadpoleController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/TadpoleController.java
@@ -67,7 +67,6 @@ public class TadpoleController extends MobEntityController {
                 this.oldMoveController = this.moveControl;
                 this.moveControl = new MoveControl(this);
             }
-
         }
 
         @Override
@@ -76,12 +75,10 @@ public class TadpoleController extends MobEntityController {
             if (npc != null) {
                 this.verticalCollision = false;
             }
-
             super.aiStep();
             if (npc != null) {
                 this.verticalCollision = lastInWater;
             }
-
         }
 
         @Override
@@ -103,7 +100,6 @@ public class TadpoleController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -111,7 +107,6 @@ public class TadpoleController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -121,18 +116,14 @@ public class TadpoleController extends MobEntityController {
                 if (npc.useMinecraftAI() && this.moveControl != this.oldMoveController) {
                     this.moveControl = this.oldMoveController;
                 }
-
                 if (!npc.useMinecraftAI() && this.moveControl == this.oldMoveController) {
                     this.moveControl = new EntityMoveControl(this);
                 }
-
             }
-
             super.customServerAiStep();
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -145,7 +136,6 @@ public class TadpoleController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new TadpoleNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -225,7 +215,6 @@ public class TadpoleController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -236,7 +225,6 @@ public class TadpoleController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -257,11 +245,9 @@ public class TadpoleController extends MobEntityController {
                 if (!NMSImpl.moveFish(npc, this, vec3d)) {
                     super.travel(vec3d);
                 }
-
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -273,7 +259,6 @@ public class TadpoleController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/TraderLlamaController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/TraderLlamaController.java
index 4fa262410..727185cf6 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/TraderLlamaController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/TraderLlamaController.java
@@ -66,7 +66,6 @@ public class TraderLlamaController extends MobEntityController {
                 ((org.bukkit.entity.TraderLlama) getBukkitEntity())
                         .setDomestication(((org.bukkit.entity.TraderLlama) getBukkitEntity()).getMaxDomestication());
             }
-
         }
 
         @Override
@@ -88,7 +87,6 @@ public class TraderLlamaController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -96,7 +94,6 @@ public class TraderLlamaController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -108,12 +105,10 @@ public class TraderLlamaController extends MobEntityController {
                 if (npc.useMinecraftAI()) {
                     super.customServerAiStep();
                 }
-
                 setDespawnDelay(10);
                 NMS.setStepHeight(getBukkitEntity(), 1);
                 npc.update();
             }
-
         }
 
         @Override
@@ -126,7 +121,6 @@ public class TraderLlamaController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new TraderLlamaNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -196,7 +190,6 @@ public class TraderLlamaController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -206,7 +199,6 @@ public class TraderLlamaController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -217,7 +209,6 @@ public class TraderLlamaController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -239,7 +230,6 @@ public class TraderLlamaController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -251,7 +241,6 @@ public class TraderLlamaController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/TropicalFishController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/TropicalFishController.java
index 080d39b43..528a1013f 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/TropicalFishController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/TropicalFishController.java
@@ -66,7 +66,6 @@ public class TropicalFishController extends MobEntityController {
                 this.oldMoveController = this.moveControl;
                 this.moveControl = new MoveControl(this);
             }
-
         }
 
         @Override
@@ -75,12 +74,10 @@ public class TropicalFishController extends MobEntityController {
             if (npc != null) {
                 this.verticalCollision = false;
             }
-
             super.aiStep();
             if (npc != null) {
                 this.verticalCollision = lastInWater;
             }
-
         }
 
         @Override
@@ -102,7 +99,6 @@ public class TropicalFishController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -110,7 +106,6 @@ public class TropicalFishController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -119,23 +114,18 @@ public class TropicalFishController extends MobEntityController {
                 if (!npc.useMinecraftAI()) {
                     NMSImpl.setNotInSchool(this);
                 }
-
                 NMSImpl.updateMinecraftAIState(npc, this);
                 if (npc.useMinecraftAI() && this.moveControl != this.oldMoveController) {
                     this.moveControl = this.oldMoveController;
                 }
-
                 if (!npc.useMinecraftAI() && this.moveControl == this.oldMoveController) {
                     this.moveControl = new EntityMoveControl(this);
                 }
-
             }
-
             super.customServerAiStep();
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -148,7 +138,6 @@ public class TropicalFishController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new TropicalFishNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -228,7 +217,6 @@ public class TropicalFishController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -239,7 +227,6 @@ public class TropicalFishController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -260,11 +247,9 @@ public class TropicalFishController extends MobEntityController {
                 if (!NMSImpl.moveFish(npc, this, vec3d)) {
                     super.travel(vec3d);
                 }
-
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -276,7 +261,6 @@ public class TropicalFishController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/TurtleController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/TurtleController.java
index 19ee41681..006e75ef2 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/TurtleController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/TurtleController.java
@@ -67,7 +67,6 @@ public class TurtleController extends MobEntityController {
                 this.moveControl = new MoveControl(this);
                 this.jumpControl = new EmptyControllerJump(this);
             }
-
         }
 
         @Override
@@ -89,7 +88,6 @@ public class TurtleController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -97,7 +95,6 @@ public class TurtleController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -109,15 +106,12 @@ public class TurtleController extends MobEntityController {
                     this.moveControl = this.oldMoveController;
                     this.jumpControl = this.oldJumpController;
                 }
-
                 if (!npc.useMinecraftAI() && this.moveControl == this.oldMoveController) {
                     this.moveControl = new EntityMoveControl(this);
                     this.jumpControl = new EmptyControllerJump(this);
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
@@ -130,7 +124,6 @@ public class TurtleController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new TurtleNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -200,7 +193,6 @@ public class TurtleController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -211,7 +203,6 @@ public class TurtleController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -232,11 +223,9 @@ public class TurtleController extends MobEntityController {
                 if (!NMSImpl.moveFish(npc, this, vec3d)) {
                     super.travel(vec3d);
                 }
-
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -248,7 +237,6 @@ public class TurtleController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
 
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/VexController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/VexController.java
index b04d27d21..36d07af4e 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/VexController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/VexController.java
@@ -54,7 +54,6 @@ public class VexController extends MobEntityController {
             if (npc != null) {
                 setNoGravity(true);
             }
-
         }
 
         @Override
@@ -69,7 +68,6 @@ public class VexController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -79,7 +77,6 @@ public class VexController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -92,7 +89,6 @@ public class VexController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new VexNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -154,7 +150,6 @@ public class VexController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -165,7 +160,6 @@ public class VexController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -189,7 +183,6 @@ public class VexController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/VillagerController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/VillagerController.java
index 1f2b21f38..365e5abef 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/VillagerController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/VillagerController.java
@@ -65,7 +65,6 @@ public class VillagerController extends MobEntityController {
             if (npc != null) {
                 getAttribute(Attributes.MOVEMENT_SPEED).setBaseValue(0.3);
             }
-
         }
 
         @Override
@@ -87,7 +86,6 @@ public class VillagerController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -95,7 +93,6 @@ public class VillagerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -103,16 +100,13 @@ public class VillagerController extends MobEntityController {
             if (npc != null) {
                 NMSImpl.updateMinecraftAIState(npc, this);
             }
-
             super.customServerAiStep();
             if (npc != null) {
                 npc.update();
                 if (npc.data().get(NPC.Metadata.RESET_PITCH_ON_TICK, true)) {
                     NMS.setPitch(getBukkitEntity(), 0);
                 }
-
             }
-
         }
 
         @Override
@@ -125,7 +119,6 @@ public class VillagerController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new VillagerNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -176,7 +169,6 @@ public class VillagerController extends MobEntityController {
                 blockingATrade = false;
                 return true;
             }
-
             return super.isTrading();
         }
 
@@ -199,9 +191,7 @@ public class VillagerController extends MobEntityController {
                 if (list != null) {
                     list.clear();
                 }
-
             }
-
             return super.mobInteract(entityhuman, enumhand);
         }
 
@@ -219,7 +209,6 @@ public class VillagerController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -229,7 +218,6 @@ public class VillagerController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -240,7 +228,6 @@ public class VillagerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -260,7 +247,6 @@ public class VillagerController extends MobEntityController {
             if (npc == null) {
                 super.thunderHit(worldserver, entitylightning);
             }
-
         }
 
         @Override
@@ -270,7 +256,6 @@ public class VillagerController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -282,7 +267,6 @@ public class VillagerController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/VindicatorController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/VindicatorController.java
index 0e2505a3d..1bbc6b40f 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/VindicatorController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/VindicatorController.java
@@ -75,7 +75,6 @@ public class VindicatorController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -83,7 +82,6 @@ public class VindicatorController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -93,7 +91,6 @@ public class VindicatorController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -106,7 +103,6 @@ public class VindicatorController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new VindicatorNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -176,7 +172,6 @@ public class VindicatorController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -186,7 +181,6 @@ public class VindicatorController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -197,7 +191,6 @@ public class VindicatorController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -219,7 +212,6 @@ public class VindicatorController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -231,7 +223,6 @@ public class VindicatorController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/WanderingTraderController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/WanderingTraderController.java
index e45d0102c..74951c4f9 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/WanderingTraderController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/WanderingTraderController.java
@@ -84,7 +84,6 @@ public class WanderingTraderController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -92,7 +91,6 @@ public class WanderingTraderController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -100,13 +98,11 @@ public class WanderingTraderController extends MobEntityController {
             if (npc != null) {
                 NMSImpl.updateMinecraftAIState(npc, this);
             }
-
             super.customServerAiStep();
             if (npc != null) {
                 setDespawnDelay(10);
                 npc.update();
             }
-
         }
 
         @Override
@@ -119,7 +115,6 @@ public class WanderingTraderController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new WanderingTraderNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -174,7 +169,6 @@ public class WanderingTraderController extends MobEntityController {
                 blockingATrade = false;
                 return true;
             }
-
             return super.isTrading();
         }
 
@@ -197,9 +191,7 @@ public class WanderingTraderController extends MobEntityController {
                 if (list != null) {
                     list.clear();
                 }
-
             }
-
             return super.mobInteract(entityhuman, enumhand);
         }
 
@@ -217,7 +209,6 @@ public class WanderingTraderController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -227,7 +218,6 @@ public class WanderingTraderController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -238,7 +228,6 @@ public class WanderingTraderController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -262,7 +251,6 @@ public class WanderingTraderController extends MobEntityController {
             if (npc == null) {
                 super.thunderHit(worldserver, entitylightning);
             }
-
         }
 
         @Override
@@ -272,7 +260,6 @@ public class WanderingTraderController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -284,7 +271,6 @@ public class WanderingTraderController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/WardenController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/WardenController.java
index c04917315..dae5d1a82 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/WardenController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/WardenController.java
@@ -77,7 +77,6 @@ public class WardenController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -85,7 +84,6 @@ public class WardenController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -94,13 +92,11 @@ public class WardenController extends MobEntityController {
                 super.customServerAiStep();
                 return;
             }
-
             NMSImpl.updateMinecraftAIState(npc, this);
             npc.update();
             if (npc.useMinecraftAI()) {
                 super.customServerAiStep();
             }
-
         }
 
         @Override
@@ -113,7 +109,6 @@ public class WardenController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new WardenNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -183,7 +178,6 @@ public class WardenController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -194,7 +188,6 @@ public class WardenController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -216,7 +209,6 @@ public class WardenController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -228,7 +220,6 @@ public class WardenController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/WitchController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/WitchController.java
index 24f7e0b47..c6e6ec0ad 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/WitchController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/WitchController.java
@@ -74,7 +74,6 @@ public class WitchController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -82,7 +81,6 @@ public class WitchController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -92,7 +90,6 @@ public class WitchController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -105,7 +102,6 @@ public class WitchController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new WitchNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -175,7 +171,6 @@ public class WitchController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -186,7 +181,6 @@ public class WitchController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -196,7 +190,6 @@ public class WitchController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -218,7 +211,6 @@ public class WitchController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -230,7 +222,6 @@ public class WitchController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/WitherController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/WitherController.java
index 07e2b607a..16df3e1b9 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/WitherController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/WitherController.java
@@ -65,7 +65,6 @@ public class WitherController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -77,10 +76,8 @@ public class WitherController extends MobEntityController {
                 if (npc.useMinecraftAI()) {
                     super.customServerAiStep();
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
@@ -98,7 +95,6 @@ public class WitherController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new WitherNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -166,7 +162,6 @@ public class WitherController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -177,7 +172,6 @@ public class WitherController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -201,7 +195,6 @@ public class WitherController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/WolfController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/WolfController.java
index 8f42d9dd3..b6dd28c71 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/WolfController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/WolfController.java
@@ -77,7 +77,6 @@ public class WolfController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -85,7 +84,6 @@ public class WolfController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -95,7 +93,6 @@ public class WolfController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -108,7 +105,6 @@ public class WolfController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new WolfNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -178,7 +174,6 @@ public class WolfController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -188,7 +183,6 @@ public class WolfController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -199,7 +193,6 @@ public class WolfController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -226,7 +219,6 @@ public class WolfController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -238,7 +230,6 @@ public class WolfController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ZoglinController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ZoglinController.java
index e4097f2e6..f00558eeb 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ZoglinController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ZoglinController.java
@@ -74,7 +74,6 @@ public class ZoglinController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -82,7 +81,6 @@ public class ZoglinController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -90,12 +88,10 @@ public class ZoglinController extends MobEntityController {
             if (npc != null) {
                 NMSImpl.updateMinecraftAIState(npc, this);
             }
-
             super.customServerAiStep();
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -108,7 +104,6 @@ public class ZoglinController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ZoglinNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -178,7 +173,6 @@ public class ZoglinController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -189,7 +183,6 @@ public class ZoglinController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -211,7 +204,6 @@ public class ZoglinController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -223,7 +215,6 @@ public class ZoglinController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ZombieController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ZombieController.java
index 596df065e..171f75c46 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ZombieController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ZombieController.java
@@ -74,7 +74,6 @@ public class ZombieController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -82,7 +81,6 @@ public class ZombieController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -92,7 +90,6 @@ public class ZombieController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -105,7 +102,6 @@ public class ZombieController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ZombieNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -175,7 +171,6 @@ public class ZombieController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -186,7 +181,6 @@ public class ZombieController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -208,7 +202,6 @@ public class ZombieController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -220,7 +213,6 @@ public class ZombieController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ZombieHuskController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ZombieHuskController.java
index 77dca3c5e..72049960b 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ZombieHuskController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ZombieHuskController.java
@@ -74,7 +74,6 @@ public class ZombieHuskController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -82,7 +81,6 @@ public class ZombieHuskController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -92,7 +90,6 @@ public class ZombieHuskController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -105,7 +102,6 @@ public class ZombieHuskController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ZombieHuskNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -175,7 +171,6 @@ public class ZombieHuskController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -186,7 +181,6 @@ public class ZombieHuskController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -208,7 +202,6 @@ public class ZombieHuskController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -220,7 +213,6 @@ public class ZombieHuskController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ZombieVillagerController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ZombieVillagerController.java
index f1b8980cc..e7acb5967 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ZombieVillagerController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ZombieVillagerController.java
@@ -74,7 +74,6 @@ public class ZombieVillagerController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -82,7 +81,6 @@ public class ZombieVillagerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -92,7 +90,6 @@ public class ZombieVillagerController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -105,7 +102,6 @@ public class ZombieVillagerController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ZombieVillagerNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -175,7 +171,6 @@ public class ZombieVillagerController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -186,7 +181,6 @@ public class ZombieVillagerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -208,7 +202,6 @@ public class ZombieVillagerController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -220,7 +213,6 @@ public class ZombieVillagerController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/AreaEffectCloudController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/AreaEffectCloudController.java
index 94b1fd090..c85b108b2 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/AreaEffectCloudController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/AreaEffectCloudController.java
@@ -60,7 +60,6 @@ public class AreaEffectCloudController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new AreaEffectCloudNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -91,7 +90,6 @@ public class AreaEffectCloudController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -102,7 +100,6 @@ public class AreaEffectCloudController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -124,7 +121,6 @@ public class AreaEffectCloudController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -136,7 +132,6 @@ public class AreaEffectCloudController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/BlockDisplayController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/BlockDisplayController.java
index 2183e791c..8cea0af05 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/BlockDisplayController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/BlockDisplayController.java
@@ -42,7 +42,6 @@ public class BlockDisplayController extends MobEntityController {
             ((org.bukkit.entity.BlockDisplay) handle.getBukkitEntity())
                     .setBlock(npc.getItemProvider().get().getType().createBlockData());
         }
-
         return handle.getBukkitEntity();
     }
 
@@ -74,7 +73,6 @@ public class BlockDisplayController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new BlockDisplayNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -105,7 +103,6 @@ public class BlockDisplayController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -116,7 +113,6 @@ public class BlockDisplayController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -137,7 +133,6 @@ public class BlockDisplayController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -149,7 +144,6 @@ public class BlockDisplayController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/BoatController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/BoatController.java
index 692c71ed4..d1324a3c3 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/BoatController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/BoatController.java
@@ -73,7 +73,6 @@ public class BoatController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new BoatNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -93,7 +92,6 @@ public class BoatController extends MobEntityController {
                 this.aC = getBoundingBox().maxY;
                 return entityboat_Status;
             }
-
             if (t())
                 return Status.IN_WATER;
             float f = getGroundFriction();
@@ -101,7 +99,6 @@ public class BoatController extends MobEntityController {
                 this.aD = f;
                 return Status.ON_LAND;
             }
-
             return Status.IN_AIR;
         }
 
@@ -122,7 +119,6 @@ public class BoatController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -133,7 +129,6 @@ public class BoatController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -143,7 +138,6 @@ public class BoatController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -173,13 +167,9 @@ public class BoatController extends MobEntityController {
                             this.aC = Math.max(f, this.aC);
                             m = flag | (axisalignedbb.minY < f ? true : false);
                         }
-
                     }
-
                 }
-
             }
-
             return m;
         }
 
@@ -221,9 +211,7 @@ public class BoatController extends MobEntityController {
                         if (getControllingPassenger() instanceof ServerPlayer) {
                             this.aD /= 2.0F;
                         }
-
                     }
-
                     Vec3 vec3d = getDeltaMovement();
                     setDeltaMovement(vec3d.x * this.ap, vec3d.y + d1, vec3d.z * this.ap);
                     this.ar *= this.ap;
@@ -231,18 +219,14 @@ public class BoatController extends MobEntityController {
                         Vec3 vec3d1 = getDeltaMovement();
                         setDeltaMovement(vec3d1.x, vec3d1.y + d2 * 0.0615D, vec3d1.z);
                     }
-
                 }
-
                 move(MoverType.SELF, getDeltaMovement());
                 if (isVehicle()) {
                     setYRot((float) (getYRot() + this.ar));
                 }
-
             } else {
                 super.tick();
             }
-
         }
 
         private Status u() {
@@ -267,13 +251,9 @@ public class BoatController extends MobEntityController {
                                 return Status.UNDER_FLOWING_WATER;
                             flag = true;
                         }
-
                     }
-
                 }
-
             }
-
             return flag ? Status.UNDER_WATER : null;
         }
 
@@ -286,7 +266,6 @@ public class BoatController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/ChestBoatController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/ChestBoatController.java
index 18df68f88..31e49fada 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/ChestBoatController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/ChestBoatController.java
@@ -74,7 +74,6 @@ public class ChestBoatController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ChestBoatNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -94,7 +93,6 @@ public class ChestBoatController extends MobEntityController {
                 this.aC = getBoundingBox().maxY;
                 return entityboat_Status;
             }
-
             if (t())
                 return Status.IN_WATER;
             float f = getGroundFriction();
@@ -102,7 +100,6 @@ public class ChestBoatController extends MobEntityController {
                 this.aD = f;
                 return Status.ON_LAND;
             }
-
             return Status.IN_AIR;
         }
 
@@ -123,7 +120,6 @@ public class ChestBoatController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -134,7 +130,6 @@ public class ChestBoatController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -144,7 +139,6 @@ public class ChestBoatController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -174,13 +168,9 @@ public class ChestBoatController extends MobEntityController {
                             this.aC = Math.max(f, this.aC);
                             m = flag | (axisalignedbb.minY < f ? true : false);
                         }
-
                     }
-
                 }
-
             }
-
             return m;
         }
 
@@ -222,9 +212,7 @@ public class ChestBoatController extends MobEntityController {
                         if (getControllingPassenger() instanceof ServerPlayer) {
                             this.aD /= 2.0F;
                         }
-
                     }
-
                     Vec3 vec3d = getDeltaMovement();
                     setDeltaMovement(vec3d.x * this.ap, vec3d.y + d1, vec3d.z * this.ap);
                     this.ar *= this.ap;
@@ -232,18 +220,14 @@ public class ChestBoatController extends MobEntityController {
                         Vec3 vec3d1 = getDeltaMovement();
                         setDeltaMovement(vec3d1.x, vec3d1.y + d2 * 0.0615D, vec3d1.z);
                     }
-
                 }
-
                 move(MoverType.SELF, getDeltaMovement());
                 if (isVehicle()) {
                     setYRot((float) (getYRot() + this.ar));
                 }
-
             } else {
                 super.tick();
             }
-
         }
 
         private Status u() {
@@ -268,13 +252,9 @@ public class ChestBoatController extends MobEntityController {
                                 return Status.UNDER_FLOWING_WATER;
                             flag = true;
                         }
-
                     }
-
                 }
-
             }
-
             return flag ? Status.UNDER_WATER : null;
         }
 
@@ -287,7 +267,6 @@ public class ChestBoatController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/DragonFireballController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/DragonFireballController.java
index 7a3352f3e..2162f07ba 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/DragonFireballController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/DragonFireballController.java
@@ -60,7 +60,6 @@ public class DragonFireballController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new DragonFireballNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -91,7 +90,6 @@ public class DragonFireballController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -102,7 +100,6 @@ public class DragonFireballController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -112,7 +109,6 @@ public class DragonFireballController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -134,11 +130,9 @@ public class DragonFireballController extends MobEntityController {
                 if (!npc.isProtected()) {
                     super.tick();
                 }
-
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -150,7 +144,6 @@ public class DragonFireballController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/EggController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/EggController.java
index 262ea2c75..c68cdb4d0 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/EggController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/EggController.java
@@ -74,7 +74,6 @@ public class EggController extends AbstractEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new EggNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -105,7 +104,6 @@ public class EggController extends AbstractEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -116,7 +114,6 @@ public class EggController extends AbstractEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -138,11 +135,9 @@ public class EggController extends AbstractEntityController {
                 if (!npc.isProtected()) {
                     super.tick();
                 }
-
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -154,7 +149,6 @@ public class EggController extends AbstractEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/EnderCrystalController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/EnderCrystalController.java
index bff405769..e91747e38 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/EnderCrystalController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/EnderCrystalController.java
@@ -60,7 +60,6 @@ public class EnderCrystalController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new EnderCrystalNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -91,7 +90,6 @@ public class EnderCrystalController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -102,7 +100,6 @@ public class EnderCrystalController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -124,7 +121,6 @@ public class EnderCrystalController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -136,7 +132,6 @@ public class EnderCrystalController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/EnderPearlController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/EnderPearlController.java
index 519b737d1..b9501a8f2 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/EnderPearlController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/EnderPearlController.java
@@ -61,7 +61,6 @@ public class EnderPearlController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new EnderPearlNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -92,7 +91,6 @@ public class EnderPearlController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -103,7 +101,6 @@ public class EnderPearlController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -125,11 +122,9 @@ public class EnderPearlController extends MobEntityController {
                 if (!npc.isProtected()) {
                     super.tick();
                 }
-
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -141,7 +136,6 @@ public class EnderPearlController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/EnderSignalController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/EnderSignalController.java
index 70e71b0c9..3b9a03c68 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/EnderSignalController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/EnderSignalController.java
@@ -61,7 +61,6 @@ public class EnderSignalController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new EnderSignalNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -92,7 +91,6 @@ public class EnderSignalController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -103,7 +101,6 @@ public class EnderSignalController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -125,7 +122,6 @@ public class EnderSignalController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -137,7 +133,6 @@ public class EnderSignalController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/EvokerFangsController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/EvokerFangsController.java
index 7ef3954c9..be4d35676 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/EvokerFangsController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/EvokerFangsController.java
@@ -58,7 +58,6 @@ public class EvokerFangsController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new EvokerFangsNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -99,7 +98,6 @@ public class EvokerFangsController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -110,7 +108,6 @@ public class EvokerFangsController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -131,7 +128,6 @@ public class EvokerFangsController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -143,7 +139,6 @@ public class EvokerFangsController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/ExperienceOrbController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/ExperienceOrbController.java
index 58333682c..ffadb9b56 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/ExperienceOrbController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/ExperienceOrbController.java
@@ -54,7 +54,6 @@ public class ExperienceOrbController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ExperienceOrbNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -85,7 +84,6 @@ public class ExperienceOrbController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -96,7 +94,6 @@ public class ExperienceOrbController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -118,7 +115,6 @@ public class ExperienceOrbController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -130,7 +126,6 @@ public class ExperienceOrbController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/FallingBlockController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/FallingBlockController.java
index ede78917f..482ac0008 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/FallingBlockController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/FallingBlockController.java
@@ -70,7 +70,6 @@ public class FallingBlockController extends AbstractEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new FallingBlockNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -101,7 +100,6 @@ public class FallingBlockController extends AbstractEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -112,7 +110,6 @@ public class FallingBlockController extends AbstractEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -122,7 +119,6 @@ public class FallingBlockController extends AbstractEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -147,11 +143,9 @@ public class FallingBlockController extends AbstractEntityController {
                     setDeltaMovement(mot);
                     move(MoverType.SELF, mot);
                 }
-
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -163,7 +157,6 @@ public class FallingBlockController extends AbstractEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
 
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/FireworkController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/FireworkController.java
index 35b842fdf..62f33a729 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/FireworkController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/FireworkController.java
@@ -55,7 +55,6 @@ public class FireworkController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new FireworkNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -86,7 +85,6 @@ public class FireworkController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -97,7 +95,6 @@ public class FireworkController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -119,7 +116,6 @@ public class FireworkController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -131,7 +127,6 @@ public class FireworkController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/FishingHookController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/FishingHookController.java
index 91081c0a3..cb7843da5 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/FishingHookController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/FishingHookController.java
@@ -86,7 +86,6 @@ public class FishingHookController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new FishingHookNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -117,7 +116,6 @@ public class FishingHookController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -128,7 +126,6 @@ public class FishingHookController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -152,7 +149,6 @@ public class FishingHookController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -164,7 +160,6 @@ public class FishingHookController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/GlowItemFrameController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/GlowItemFrameController.java
index d8a88b80e..a3c456d39 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/GlowItemFrameController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/GlowItemFrameController.java
@@ -66,7 +66,6 @@ public class GlowItemFrameController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new GlowItemFrameNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -97,7 +96,6 @@ public class GlowItemFrameController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -108,7 +106,6 @@ public class GlowItemFrameController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -135,7 +132,6 @@ public class GlowItemFrameController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -147,7 +143,6 @@ public class GlowItemFrameController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/InteractionController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/InteractionController.java
index 24b6fed2a..4e8f5fa58 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/InteractionController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/InteractionController.java
@@ -54,7 +54,6 @@ public class InteractionController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new InteractionNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -85,7 +84,6 @@ public class InteractionController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -96,7 +94,6 @@ public class InteractionController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -118,7 +115,6 @@ public class InteractionController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -130,7 +126,6 @@ public class InteractionController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/ItemController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/ItemController.java
index 57d7c9b16..eb0bddb16 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/ItemController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/ItemController.java
@@ -67,7 +67,6 @@ public class ItemController extends AbstractEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ItemNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -97,7 +96,6 @@ public class ItemController extends AbstractEntityController {
             if (npc == null) {
                 super.playerTouch(entityhuman);
             }
-
         }
 
         @Override
@@ -106,7 +104,6 @@ public class ItemController extends AbstractEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -117,7 +114,6 @@ public class ItemController extends AbstractEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -139,7 +135,6 @@ public class ItemController extends AbstractEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -151,7 +146,6 @@ public class ItemController extends AbstractEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/ItemDisplayController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/ItemDisplayController.java
index 94672533e..f6d6b6f22 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/ItemDisplayController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/ItemDisplayController.java
@@ -42,7 +42,6 @@ public class ItemDisplayController extends MobEntityController {
         if (npc != null) {
             handle.setItemStack(CraftItemStack.asNMSCopy(npc.getItemProvider().get()));
         }
-
         return handle.getBukkitEntity();
     }
 
@@ -68,7 +67,6 @@ public class ItemDisplayController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ItemDisplayNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -99,7 +97,6 @@ public class ItemDisplayController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -110,7 +107,6 @@ public class ItemDisplayController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -131,7 +127,6 @@ public class ItemDisplayController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -143,7 +138,6 @@ public class ItemDisplayController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/ItemFrameController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/ItemFrameController.java
index f18c335b8..7b5568aac 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/ItemFrameController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/ItemFrameController.java
@@ -65,7 +65,6 @@ public class ItemFrameController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ItemFrameNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -96,7 +95,6 @@ public class ItemFrameController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -107,7 +105,6 @@ public class ItemFrameController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -134,7 +131,6 @@ public class ItemFrameController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -146,7 +142,6 @@ public class ItemFrameController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/LargeFireballController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/LargeFireballController.java
index 98e6dfee8..c0f22ffce 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/LargeFireballController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/LargeFireballController.java
@@ -54,7 +54,6 @@ public class LargeFireballController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new LargeFireballNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -85,7 +84,6 @@ public class LargeFireballController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -96,7 +94,6 @@ public class LargeFireballController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -106,7 +103,6 @@ public class LargeFireballController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -128,11 +124,9 @@ public class LargeFireballController extends MobEntityController {
                 if (!npc.isProtected()) {
                     super.tick();
                 }
-
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -144,7 +138,6 @@ public class LargeFireballController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/LeashController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/LeashController.java
index 721bd9578..5833a0487 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/LeashController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/LeashController.java
@@ -55,7 +55,6 @@ public class LeashController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new LeashNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -86,7 +85,6 @@ public class LeashController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -97,7 +95,6 @@ public class LeashController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -124,7 +121,6 @@ public class LeashController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -136,7 +132,6 @@ public class LeashController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/LlamaSpitController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/LlamaSpitController.java
index b50013ba8..7d9dea40d 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/LlamaSpitController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/LlamaSpitController.java
@@ -71,7 +71,6 @@ public class LlamaSpitController extends AbstractEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new LlamaSpitNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -102,7 +101,6 @@ public class LlamaSpitController extends AbstractEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -113,7 +111,6 @@ public class LlamaSpitController extends AbstractEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -135,11 +132,9 @@ public class LlamaSpitController extends AbstractEntityController {
                 if (!npc.isProtected()) {
                     super.tick();
                 }
-
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -151,7 +146,6 @@ public class LlamaSpitController extends AbstractEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/MarkerController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/MarkerController.java
index 62fb7c3cf..d0681ea0d 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/MarkerController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/MarkerController.java
@@ -54,7 +54,6 @@ public class MarkerController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new MarkerNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -85,7 +84,6 @@ public class MarkerController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -96,7 +94,6 @@ public class MarkerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -118,7 +115,6 @@ public class MarkerController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -130,7 +126,6 @@ public class MarkerController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/MinecartChestController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/MinecartChestController.java
index ea33b7fa9..abf0c47c6 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/MinecartChestController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/MinecartChestController.java
@@ -55,7 +55,6 @@ public class MinecartChestController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new MinecartChestNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -86,7 +85,6 @@ public class MinecartChestController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -97,7 +95,6 @@ public class MinecartChestController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -119,7 +116,6 @@ public class MinecartChestController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
 
         @Override
@@ -131,7 +127,6 @@ public class MinecartChestController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/MinecartCommandController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/MinecartCommandController.java
index d7ed367c9..7bd5029df 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/MinecartCommandController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/MinecartCommandController.java
@@ -55,7 +55,6 @@ public class MinecartCommandController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new MinecartCommandNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -86,7 +85,6 @@ public class MinecartCommandController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -97,7 +95,6 @@ public class MinecartCommandController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -119,7 +116,6 @@ public class MinecartCommandController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
 
         @Override
@@ -131,7 +127,6 @@ public class MinecartCommandController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/MinecartFurnaceController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/MinecartFurnaceController.java
index e0cb93b7c..4e6cf9ea9 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/MinecartFurnaceController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/MinecartFurnaceController.java
@@ -55,7 +55,6 @@ public class MinecartFurnaceController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new MinecartFurnaceNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -86,7 +85,6 @@ public class MinecartFurnaceController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -97,7 +95,6 @@ public class MinecartFurnaceController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -119,7 +116,6 @@ public class MinecartFurnaceController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
 
         @Override
@@ -131,7 +127,6 @@ public class MinecartFurnaceController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/MinecartHopperController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/MinecartHopperController.java
index 5af9ac736..50c723eef 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/MinecartHopperController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/MinecartHopperController.java
@@ -72,7 +72,6 @@ public class MinecartHopperController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -83,7 +82,6 @@ public class MinecartHopperController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -105,7 +103,6 @@ public class MinecartHopperController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
 
         @Override
@@ -117,7 +114,6 @@ public class MinecartHopperController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/MinecartRideableController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/MinecartRideableController.java
index df397a6d2..8d0d0fb1f 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/MinecartRideableController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/MinecartRideableController.java
@@ -54,7 +54,6 @@ public class MinecartRideableController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new MinecartRideableNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -85,7 +84,6 @@ public class MinecartRideableController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -96,7 +94,6 @@ public class MinecartRideableController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -118,7 +115,6 @@ public class MinecartRideableController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
 
         @Override
@@ -130,7 +126,6 @@ public class MinecartRideableController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/MinecartSpawnerController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/MinecartSpawnerController.java
index 57598c23c..b10c4570b 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/MinecartSpawnerController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/MinecartSpawnerController.java
@@ -72,7 +72,6 @@ public class MinecartSpawnerController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -83,7 +82,6 @@ public class MinecartSpawnerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -105,7 +103,6 @@ public class MinecartSpawnerController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
 
         @Override
@@ -117,7 +114,6 @@ public class MinecartSpawnerController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/MinecartTNTController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/MinecartTNTController.java
index 94b4a7d7e..9af7bc1af 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/MinecartTNTController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/MinecartTNTController.java
@@ -72,7 +72,6 @@ public class MinecartTNTController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -83,7 +82,6 @@ public class MinecartTNTController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -105,7 +103,6 @@ public class MinecartTNTController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
 
         @Override
@@ -117,7 +114,6 @@ public class MinecartTNTController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/PaintingController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/PaintingController.java
index cc07ebf1b..d701a72c5 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/PaintingController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/PaintingController.java
@@ -54,7 +54,6 @@ public class PaintingController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new PaintingNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -85,7 +84,6 @@ public class PaintingController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -96,7 +94,6 @@ public class PaintingController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -123,7 +120,6 @@ public class PaintingController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -135,7 +131,6 @@ public class PaintingController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/ShulkerBulletController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/ShulkerBulletController.java
index 98ac2d80c..84923b369 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/ShulkerBulletController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/ShulkerBulletController.java
@@ -54,7 +54,6 @@ public class ShulkerBulletController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ShulkerBulletNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -85,7 +84,6 @@ public class ShulkerBulletController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -96,7 +94,6 @@ public class ShulkerBulletController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -118,7 +115,6 @@ public class ShulkerBulletController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -130,7 +126,6 @@ public class ShulkerBulletController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/SmallFireballController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/SmallFireballController.java
index 93d8a9bc1..a05e2fe77 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/SmallFireballController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/SmallFireballController.java
@@ -54,7 +54,6 @@ public class SmallFireballController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SmallFireballNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -85,7 +84,6 @@ public class SmallFireballController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -96,7 +94,6 @@ public class SmallFireballController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -118,11 +115,9 @@ public class SmallFireballController extends MobEntityController {
                 if (!npc.isProtected()) {
                     super.tick();
                 }
-
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -134,7 +129,6 @@ public class SmallFireballController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/SnowballController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/SnowballController.java
index 8e9d0582c..a66da4e71 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/SnowballController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/SnowballController.java
@@ -54,7 +54,6 @@ public class SnowballController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SnowballNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -85,7 +84,6 @@ public class SnowballController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -96,7 +94,6 @@ public class SnowballController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -118,7 +115,6 @@ public class SnowballController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -130,7 +126,6 @@ public class SnowballController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/SpectralArrowController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/SpectralArrowController.java
index 2f3ab8dff..f6e95c0e6 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/SpectralArrowController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/SpectralArrowController.java
@@ -55,7 +55,6 @@ public class SpectralArrowController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SpectralArrowNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -86,7 +85,6 @@ public class SpectralArrowController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -97,7 +95,6 @@ public class SpectralArrowController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -119,7 +116,6 @@ public class SpectralArrowController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -131,7 +127,6 @@ public class SpectralArrowController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/TNTPrimedController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/TNTPrimedController.java
index b94827845..e928614e7 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/TNTPrimedController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/TNTPrimedController.java
@@ -55,7 +55,6 @@ public class TNTPrimedController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new TNTPrimedNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -86,7 +85,6 @@ public class TNTPrimedController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -97,7 +95,6 @@ public class TNTPrimedController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -119,7 +116,6 @@ public class TNTPrimedController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -131,7 +127,6 @@ public class TNTPrimedController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/TextDisplayController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/TextDisplayController.java
index fee9aeb88..681a70a8f 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/TextDisplayController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/TextDisplayController.java
@@ -54,7 +54,6 @@ public class TextDisplayController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new TextDisplayNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -85,7 +84,6 @@ public class TextDisplayController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -96,7 +94,6 @@ public class TextDisplayController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -117,7 +114,6 @@ public class TextDisplayController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -129,7 +125,6 @@ public class TextDisplayController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/ThrownExpBottleController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/ThrownExpBottleController.java
index 4a0ee3cd0..b321ec8c2 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/ThrownExpBottleController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/ThrownExpBottleController.java
@@ -55,7 +55,6 @@ public class ThrownExpBottleController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ThrownExpBottleNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -86,7 +85,6 @@ public class ThrownExpBottleController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -97,7 +95,6 @@ public class ThrownExpBottleController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -119,11 +116,9 @@ public class ThrownExpBottleController extends MobEntityController {
                 if (!npc.isProtected()) {
                     super.tick();
                 }
-
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -135,7 +130,6 @@ public class ThrownExpBottleController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/ThrownPotionController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/ThrownPotionController.java
index 6e9418c57..2a8f95ea0 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/ThrownPotionController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/ThrownPotionController.java
@@ -58,9 +58,7 @@ public class ThrownPotionController extends MobEntityController {
                 } else {
                     NMSImpl.setBukkitEntity(this, new SplashThrownPotionNPC(this));
                 }
-
             }
-
             return super.getBukkitEntity();
         }
 
@@ -91,7 +89,6 @@ public class ThrownPotionController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -102,7 +99,6 @@ public class ThrownPotionController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -124,7 +120,6 @@ public class ThrownPotionController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -136,7 +131,6 @@ public class ThrownPotionController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/ThrownTridentController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/ThrownTridentController.java
index ef8f0386f..c7e3231b0 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/ThrownTridentController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/ThrownTridentController.java
@@ -55,7 +55,6 @@ public class ThrownTridentController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ThrownTridentNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -86,7 +85,6 @@ public class ThrownTridentController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -97,7 +95,6 @@ public class ThrownTridentController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -119,7 +116,6 @@ public class ThrownTridentController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -131,7 +127,6 @@ public class ThrownTridentController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/TippedArrowController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/TippedArrowController.java
index 631aff32f..573e875bb 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/TippedArrowController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/TippedArrowController.java
@@ -54,7 +54,6 @@ public class TippedArrowController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new TippedArrowNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -85,7 +84,6 @@ public class TippedArrowController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -96,7 +94,6 @@ public class TippedArrowController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -118,7 +115,6 @@ public class TippedArrowController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -130,7 +126,6 @@ public class TippedArrowController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/WitherSkullController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/WitherSkullController.java
index 7c92a1c99..88be6ff24 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/WitherSkullController.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/nonliving/WitherSkullController.java
@@ -54,7 +54,6 @@ public class WitherSkullController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new WitherSkullNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -85,7 +84,6 @@ public class WitherSkullController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -96,7 +94,6 @@ public class WitherSkullController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -118,7 +115,6 @@ public class WitherSkullController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -130,7 +126,6 @@ public class WitherSkullController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/CitizensBlockBreaker.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/CitizensBlockBreaker.java
index 43ebecb4f..094e5efbc 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/CitizensBlockBreaker.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/CitizensBlockBreaker.java
@@ -47,7 +47,6 @@ public class CitizensBlockBreaker extends AbstractBlockBreaker {
             ItemStack current = getCurrentItem();
             return current != null ? current.isCorrectToolForDrops(block) : false;
         }
-
     }
 
     @Override
@@ -66,13 +65,10 @@ public class CitizensBlockBreaker extends AbstractBlockBreaker {
                 if (i > 0) {
                     f += i * i + 1;
                 }
-
             }
-
             if (MobEffectUtil.hasDigSpeed(handle)) {
                 f *= 1.0F + (MobEffectUtil.getDigSpeedAmplification(handle) + 1) * 0.2F;
             }
-
             if (handle.hasEffect(MobEffects.DIG_SLOWDOWN)) {
                 float f1 = 1.0F;
                 switch (handle.getEffect(MobEffects.DIG_SLOWDOWN).getAmplifier()) {
@@ -89,20 +85,15 @@ public class CitizensBlockBreaker extends AbstractBlockBreaker {
                     default:
                         f1 = 8.1E-4F;
                 }
-
                 f *= f1;
             }
-
             if (handle.isEyeInFluid(FluidTags.WATER) && !EnchantmentHelper.hasAquaAffinity(handle)) {
                 f /= 5.0F;
             }
-
         }
-
         if (!entity.isOnGround()) {
             f /= 5.0F;
         }
-
         return f;
     }
 }
\ No newline at end of file
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/CitizensEntityTracker.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/CitizensEntityTracker.java
index 182c485c7..2495c982b 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/CitizensEntityTracker.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/CitizensEntityTracker.java
@@ -37,7 +37,6 @@ public class CitizensEntityTracker extends ChunkMap.TrackedEntity {
                         Bukkit.getPluginManager().callEvent(new NPCLinkToPlayerEvent(((NPCHolder) tracker).getNPC(),
                                 conn.getPlayer().getBukkitEntity()));
                     }
-
                     return res;
                 }
 
@@ -49,7 +48,6 @@ public class CitizensEntityTracker extends ChunkMap.TrackedEntity {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     public CitizensEntityTracker(ChunkMap map, TrackedEntity entry) {
@@ -66,7 +64,6 @@ public class CitizensEntityTracker extends ChunkMap.TrackedEntity {
             if (REQUIRES_SYNC == null) {
                 REQUIRES_SYNC = !Bukkit.isPrimaryThread();
             }
-
             boolean cancelled = Util.callPossiblySync(() -> {
                 NPCSeenByPlayerEvent event = new NPCSeenByPlayerEvent(npc, entityplayer.getBukkitEntity());
                 try {
@@ -75,7 +72,6 @@ public class CitizensEntityTracker extends ChunkMap.TrackedEntity {
                     REQUIRES_SYNC = true;
                     throw e;
                 }
-
                 if (event.isCancelled())
                     return true;
                 Integer trackingRange = npc.data().<Integer> get(NPC.Metadata.TRACKING_RANGE);
@@ -87,16 +83,13 @@ public class CitizensEntityTracker extends ChunkMap.TrackedEntity {
                     } catch (Throwable e) {
                         e.printStackTrace();
                     }
-
                 }
-
                 return false;
             }, REQUIRES_SYNC);
 
             if (cancelled)
                 return;
         }
-
         super.updatePlayer(entityplayer);
     }
 
@@ -106,7 +99,6 @@ public class CitizensEntityTracker extends ChunkMap.TrackedEntity {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         return 0;
     }
 
@@ -116,7 +108,6 @@ public class CitizensEntityTracker extends ChunkMap.TrackedEntity {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         return false;
     }
 
@@ -126,7 +117,6 @@ public class CitizensEntityTracker extends ChunkMap.TrackedEntity {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         return null;
     }
 
@@ -136,7 +126,6 @@ public class CitizensEntityTracker extends ChunkMap.TrackedEntity {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         return 0;
     }
 
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/EmptyAdvancementDataPlayer.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/EmptyAdvancementDataPlayer.java
index cf674b0c6..6a61adaa8 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/EmptyAdvancementDataPlayer.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/EmptyAdvancementDataPlayer.java
@@ -67,11 +67,9 @@ public class EmptyAdvancementDataPlayer extends PlayerAdvancements {
             for (MethodHandle handle : SETS) {
                 ((Set<?>) handle.invoke(data)).clear();
             }
-
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     private static final MethodHandle PROGRESS = NMS.getFirstGetter(PlayerAdvancements.class, Map.class);
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/EntityMoveControl.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/EntityMoveControl.java
index 9af054aef..6c696c7d8 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/EntityMoveControl.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/EntityMoveControl.java
@@ -64,18 +64,15 @@ public class EntityMoveControl extends MoveControl {
         if (f3 > f2) {
             f3 = f2;
         }
-
         if (f3 < -f2) {
             f3 = -f2;
         }
-
         float f4 = f + f3;
         if (f4 < 0.0F) {
             f4 += 360.0F;
         } else if (f4 > 360.0F) {
             f4 -= 360.0F;
         }
-
         return f4;
     }
 
@@ -105,7 +102,6 @@ public class EntityMoveControl extends MoveControl {
                 this.entity.setYRot(rotlerp(this.entity.getYRot(), f, 90.0F));
                 NMS.setHeadYaw(entity.getBukkitEntity(), this.entity.getYRot());
             }
-
             float movement = (float) (this.speedMod * this.entity.getAttribute(Attributes.MOVEMENT_SPEED).getValue());
             this.entity.setSpeed(movement);
             this.entity.zza = movement;
@@ -114,17 +110,13 @@ public class EntityMoveControl extends MoveControl {
                 if (((Slime) entity).isAggressive()) {
                     this.jumpTicks /= 3;
                 }
-
                 ((Slime) entity).getJumpControl().jump();
             } else if (dY >= NMS.getStepHeight(entity.getBukkitEntity()) && dXZ < 0.4D) {
                 if (entity instanceof Mob) {
                     ((Mob) entity).getJumpControl().jump();
                 }
-
                 entity.setJumping(true);
             }
-
         }
-
     }
 }
\ No newline at end of file
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/EntityNavigation.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/EntityNavigation.java
index 4fdf6bf15..223b7edcc 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/EntityNavigation.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/EntityNavigation.java
@@ -189,26 +189,21 @@ public class EntityNavigation extends PathNavigation {
             while (var2.getY() > this.level.getMinBuildHeight() && this.level.getBlockState(var2).isAir()) {
                 var2 = var2.below();
             }
-
             if (var2.getY() > this.level.getMinBuildHeight())
                 return supercreatePath(var2.above(), var1);
             while (var2.getY() < this.level.getMaxBuildHeight() && this.level.getBlockState(var2).isAir()) {
                 var2 = var2.above();
             }
-
             var0 = var2;
         }
-
         if (this.level.getBlockState(var0).getMaterial().isSolid()) {
             BlockPos var2 = var0.above();
             while (var2.getY() < this.level.getMaxBuildHeight()
                     && this.level.getBlockState(var2).getMaterial().isSolid()) {
                 var2 = var2.above();
             }
-
             return supercreatePath(var2, var1);
         }
-
         return supercreatePath(var0, var1);
     }
 
@@ -250,7 +245,6 @@ public class EntityNavigation extends PathNavigation {
             this.reachRange = var3;
             this.resetStuckTimeout();
         }
-
         return var8;
     }
 
@@ -273,11 +267,9 @@ public class EntityNavigation extends PathNavigation {
             } else {
                 this.isStuck = false;
             }
-
             this.lastStuckCheck = this.tick;
             this.lastStuckCheckPos = var0;
         }
-
         if (this.path != null && !this.path.isDone()) {
             BlockPos blockPos = this.path.getNextNodePos();
             if (blockPos.equals(this.timeoutCachedNode)) {
@@ -287,14 +279,11 @@ public class EntityNavigation extends PathNavigation {
                 double var2 = var0.distanceTo(Vec3.atBottomCenterOf(this.timeoutCachedNode));
                 this.timeoutLimit = this.mob.getSpeed() > 0.0F ? var2 / this.mob.getSpeed() * 1000.0D : 0.0D;
             }
-
             if (this.timeoutLimit > 0.0D && this.timeoutTimer > this.timeoutLimit * 3.0D) {
                 timeoutPath();
             }
-
             this.lastTimeoutCheck = System.currentTimeMillis();
         }
-
     }
 
     @Override
@@ -310,7 +299,6 @@ public class EntityNavigation extends PathNavigation {
         if (var8 || canCutCorner(this.path.getNextNode().type) && shouldTargetNextNodeInDirection(var0)) {
             this.path.advance();
         }
-
         doStuckDetection(var0);
     }
 
@@ -347,11 +335,9 @@ public class EntityNavigation extends PathNavigation {
                 var1 = this.level.getBlockState(BlockPos.containing(this.mob.getX(), var0, this.mob.getZ()));
                 ++var2;
             } while (var2 <= 16);
-
             return this.mob.getBlockY();
         } else
             return Mth.floor(this.mob.getY() + 0.5);
-
     }
 
     @Override
@@ -414,11 +400,9 @@ public class EntityNavigation extends PathNavigation {
             this.path = null;
             return false;
         }
-
         if (!var0.sameAs(this.path)) {
             this.path = var0;
         }
-
         if (isDone())
             return false;
         trimPath();
@@ -440,11 +424,9 @@ public class EntityNavigation extends PathNavigation {
                 this.timeLastRecompute = this.level.getGameTime();
                 this.hasDelayedRecomputation = false;
             }
-
         } else {
             this.hasDelayedRecomputation = true;
         }
-
     }
 
     @Override
@@ -501,7 +483,6 @@ public class EntityNavigation extends PathNavigation {
                     (var1.z + this.mob.getZ()) / 2.0D);
             return var0.closerToCenterThan(var2, this.path.getNodeCount() - this.path.getNextNodeIndex());
         }
-
     }
 
     private boolean shouldTargetNextNodeInDirection(Vec3 var0) {
@@ -537,11 +518,8 @@ public class EntityNavigation extends PathNavigation {
                 if (var2 != null && var1.y >= var2.y) {
                     this.path.replaceNode(var0 + 1, var1.cloneAndMove(var2.x, var1.y + 1, var2.z));
                 }
-
             }
-
         }
-
     }
 
     @Override
@@ -550,7 +528,6 @@ public class EntityNavigation extends PathNavigation {
         if (this.hasDelayedRecomputation) {
             recomputePath();
         }
-
         if (isDone())
             return;
         if (canUpdatePath()) {
@@ -562,9 +539,7 @@ public class EntityNavigation extends PathNavigation {
                     && Mth.floor(vec31.z) == Mth.floor(vec32.z)) {
                 this.path.advance();
             }
-
         }
-
         if (isDone())
             return;
         Vec3 var0 = this.path.getNextEntityPos(this.mob);
@@ -589,10 +564,7 @@ public class EntityNavigation extends PathNavigation {
                     this.path.truncateNodes(var0);
                     return;
                 }
-
             }
-
         }
-
     }
 }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/EntityNodeEvaluator.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/EntityNodeEvaluator.java
index a802c1310..28f711e05 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/EntityNodeEvaluator.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/EntityNodeEvaluator.java
@@ -53,7 +53,6 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
             if (this.hasCollisions(var1))
                 return false;
         }
-
         return true;
     }
 
@@ -75,16 +74,13 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
         if (var2 == BlockPathTypes.DOOR_WOOD_CLOSED && this.canOpenDoors() && var3) {
             var2 = BlockPathTypes.WALKABLE_DOOR;
         }
-
         if (var2 == BlockPathTypes.DOOR_OPEN && !var3) {
             var2 = BlockPathTypes.BLOCKED;
         }
-
         if (var2 == BlockPathTypes.RAIL && !(var0.getBlockState(var1).getBlock() instanceof BaseRailBlock)
                 && !(var0.getBlockState(var1.below()).getBlock() instanceof BaseRailBlock)) {
             var2 = BlockPathTypes.UNPASSABLE_RAIL;
         }
-
         return var2;
     }
 
@@ -102,12 +98,10 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
             if (var13 >= 0.0F) {
                 var8 = this.getNodeAndUpdateCostToMax(var0, var1, var2, var12, var13);
             }
-
             if (doesBlockHavePartialCollision(var7) && var8 != null && var8.costMalus >= 0.0F
                     && !this.canReachWithoutCollision(var8)) {
                 var8 = null;
             }
-
             if (var12 == BlockPathTypes.WALKABLE || this.isAmphibious() && var12 == BlockPathTypes.WATER) {
                 if ((var8 == null || var8.costMalus < 0.0F) && var3 > 0
                         && (var12 != BlockPathTypes.FENCE || this.canWalkOverFences())
@@ -128,11 +122,8 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
                         if (this.hasCollisions(var20)) {
                             var8 = null;
                         }
-
                     }
-
                 }
-
                 if (!this.isAmphibious() && var12 == BlockPathTypes.WATER && !this.canFloat()) {
                     if (this.getCachedBlockType(this.mob, var0, var1 - 1, var2) != BlockPathTypes.WATER)
                         return var8;
@@ -146,9 +137,7 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
                         var8 = this.getNodeAndUpdateCostToMax(var0, var1, var2, var12,
                                 this.mvmt.getPathfindingMalus(var12));
                     }
-
                 }
-
                 if (var12 == BlockPathTypes.OPEN) {
                     int var16 = 0;
                     int var17 = var1;
@@ -167,25 +156,19 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
                             var8 = this.getNodeAndUpdateCostToMax(var0, var1, var2, var12, var13);
                             break;
                         }
-
                         if (var13 < 0.0F)
                             return this.getBlockedNode(var0, var1, var2);
                     }
-
                 }
-
                 if (doesBlockHavePartialCollision(var12) && var8 == null) {
                     var8 = this.getNode(var0, var1, var2);
                     var8.closed = true;
                     var8.type = var12;
                     var8.costMalus = var12.getMalus();
                 }
-
             }
-
             return var8;
         }
-
     }
 
     private Node getBlockedNode(int var0, int var1, int var2) {
@@ -220,9 +203,7 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
                 if (mvmt.getPathfindingMalus(varr9) >= mvmt.getPathfindingMalus(var7)) {
                     var7 = varr9;
                 }
-
             }
-
             if (var6 == BlockPathTypes.OPEN && mvmt.getPathfindingMalus(var7) == 0.0F && this.entityWidth <= 1)
                 return BlockPathTypes.OPEN;
             else
@@ -251,9 +232,7 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
                 if (var4.getPathfindingMalus(varr9) >= var4.getPathfindingMalus(var7)) {
                     var7 = varr9;
                 }
-
             }
-
             if (var6 == BlockPathTypes.OPEN && var4.getPathfindingMalus(var7) == 0.0F && this.entityWidth <= 1)
                 return BlockPathTypes.OPEN;
             else
@@ -278,14 +257,10 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
                     if (var7 == 0 && var8 == 0 && var9 == 0) {
                         var5 = var13;
                     }
-
                     var4.add(var13);
                 }
-
             }
-
         }
-
         return var5;
     }
 
@@ -318,48 +293,39 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
         if (this.mvmt.getPathfindingMalus(var4) >= 0.0F && var5 != BlockPathTypes.STICKY_HONEY) {
             var3 = Mth.floor(Math.max(1.0F, this.mob.maxUpStep()));
         }
-
         double var6 = this.getFloorLevel(new BlockPos(var1.x, var1.y, var1.z));
         Node var8 = this.findAcceptedNode(var1.x, var1.y, var1.z + 1, var3, var6, Direction.SOUTH, var5);
         if (this.isNeighborValid(var8, var1)) {
             var0[var2++] = var8;
         }
-
         Node var9 = this.findAcceptedNode(var1.x - 1, var1.y, var1.z, var3, var6, Direction.WEST, var5);
         if (this.isNeighborValid(var9, var1)) {
             var0[var2++] = var9;
         }
-
         Node var10 = this.findAcceptedNode(var1.x + 1, var1.y, var1.z, var3, var6, Direction.EAST, var5);
         if (this.isNeighborValid(var10, var1)) {
             var0[var2++] = var10;
         }
-
         Node var11 = this.findAcceptedNode(var1.x, var1.y, var1.z - 1, var3, var6, Direction.NORTH, var5);
         if (this.isNeighborValid(var11, var1)) {
             var0[var2++] = var11;
         }
-
         Node var12 = this.findAcceptedNode(var1.x - 1, var1.y, var1.z - 1, var3, var6, Direction.NORTH, var5);
         if (this.isDiagonalValid(var1, var9, var11, var12)) {
             var0[var2++] = var12;
         }
-
         Node var13 = this.findAcceptedNode(var1.x + 1, var1.y, var1.z - 1, var3, var6, Direction.NORTH, var5);
         if (this.isDiagonalValid(var1, var10, var11, var13)) {
             var0[var2++] = var13;
         }
-
         Node var14 = this.findAcceptedNode(var1.x - 1, var1.y, var1.z + 1, var3, var6, Direction.SOUTH, var5);
         if (this.isDiagonalValid(var1, var9, var8, var14)) {
             var0[var2++] = var14;
         }
-
         Node var15 = this.findAcceptedNode(var1.x + 1, var1.y, var1.z + 1, var3, var6, Direction.SOUTH, var5);
         if (this.isDiagonalValid(var1, var10, var8, var15)) {
             var0[var2++] = var15;
         }
-
         return var2;
     }
 
@@ -383,11 +349,9 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
                         --var0;
                         break;
                     }
-
                     ++var0;
                     var2 = this.level.getBlockState(var1.set(this.mob.getX(), var0, this.mob.getZ()));
                 }
-
             } else if (this.mob.isOnGround()) {
                 var0 = Mth.floor(this.mob.getY() + 0.5);
             } else {
@@ -395,23 +359,18 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
                         || this.level.getBlockState(var3).isPathfindable(this.level, var3, PathComputationType.LAND))
                         && var3.getY() > this.mob.level.getMinBuildHeight(); var3 = var3.below()) {
                 }
-
                 var0 = var3.above().getY();
             }
-
         } else {
             while (true) {
                 if (!this.mob.canStandOnFluid(var2.getFluidState())) {
                     --var0;
                     break;
                 }
-
                 ++var0;
                 var2 = this.level.getBlockState(var1.set(this.mob.getX(), var0, this.mob.getZ()));
             }
-
         }
-
         var3 = this.mob.blockPosition();
         if (!this.canStartAt(var1.set(var3.getX(), var0, var3.getZ()))) {
             AABB var4 = this.mob.getBoundingBox();
@@ -421,7 +380,6 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
                     || this.canStartAt(var1.set(var4.maxX, var0, var4.maxZ)))
                 return this.getStartNode(var1);
         }
-
         return this.getStartNode(new BlockPos(var3.getX(), var0, var3.getZ()));
     }
 
@@ -452,7 +410,6 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
                         && (var1.y < var0.y || var1.costMalus >= 0.0F || var4);
             } else
                 return false;
-
         } else
             return false;
     }
@@ -494,13 +451,9 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
                         if (var0.getFluidState(var1).is(FluidTags.WATER))
                             return BlockPathTypes.WATER_BORDER;
                     }
-
                 }
-
             }
-
         }
-
         return var2;
     }
 
@@ -566,25 +519,19 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
             if (var6 == BlockPathTypes.DAMAGE_FIRE) {
                 var5 = BlockPathTypes.DAMAGE_FIRE;
             }
-
             if (var6 == BlockPathTypes.DAMAGE_OTHER) {
                 var5 = BlockPathTypes.DAMAGE_OTHER;
             }
-
             if (var6 == BlockPathTypes.STICKY_HONEY) {
                 var5 = BlockPathTypes.STICKY_HONEY;
             }
-
             if (var6 == BlockPathTypes.POWDER_SNOW) {
                 var5 = BlockPathTypes.DANGER_POWDER_SNOW;
             }
-
         }
-
         if (var5 == BlockPathTypes.WALKABLE) {
             var5 = checkNeighbourBlocks(var0, var1.set(var2, var3, var4), var5);
         }
-
         return var5;
     }
 
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/EntityPathfinder.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/EntityPathfinder.java
index d8731dece..05c54c1aa 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/EntityPathfinder.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/EntityPathfinder.java
@@ -80,17 +80,13 @@ public class EntityPathfinder extends PathFinder {
                     target.setReached();
                     var9.add(target);
                 }
-
             }
-
             if (!var9.isEmpty()) {
                 break;
             }
-
             if (node.distanceTo(var1) >= var3) {
                 continue;
             }
-
             int i = this.nodeEvaluator.getNeighbors(this.neighbors, node);
             for (int var13 = 0; var13 < i; var13++) {
                 Node var14 = this.neighbors[var13];
@@ -107,13 +103,9 @@ public class EntityPathfinder extends PathFinder {
                         var14.f = var14.g + var14.h;
                         this.openSet.insert(var14);
                     }
-
                 }
-
             }
-
         }
-
         Optional<Path> var11 = !var9.isEmpty()
                 ? var9.stream().map(p -> reconstructPath(p.getBestNode(), var2.get(p), true)).min(
                         Comparator.comparingInt(Path::getNodeCount))
@@ -131,7 +123,6 @@ public class EntityPathfinder extends PathFinder {
             var4.updateBest(var5, var0);
             var2 = Math.min(var5, var2);
         }
-
         return var2;
     }
 
@@ -150,7 +141,6 @@ public class EntityPathfinder extends PathFinder {
             var4 = var4.cameFrom;
             var3.add(0, var4);
         }
-
         return new Path(var3, var1, var2);
     }
 }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/ForwardingNPCHolder.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/ForwardingNPCHolder.java
index 801c7dd79..ab1f04370 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/ForwardingNPCHolder.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/ForwardingNPCHolder.java
@@ -17,7 +17,6 @@ public interface ForwardingNPCHolder extends NPCHolder, Entity {
                     () -> Joiner.on(' ').join("ForwardingNPCHolder with an improper bukkit entity", this, handle));
             return null;
         }
-
         return ((NPCHolder) handle).getNPC();
     }
 }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/MobAI.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/MobAI.java
index cd15d114a..fd7b84b81 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/MobAI.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/MobAI.java
@@ -41,7 +41,6 @@ public interface MobAI {
         if (!nav.isDone()) {
             nav.tick();
         }
-
     }
 
     default void updatePathfindingRange(float range) {
@@ -171,7 +170,6 @@ public interface MobAI {
             };
         } else if (handle instanceof MobAI)
             return (MobAI) handle;
-
         return null;
     }
 }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/NMSImpl.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/NMSImpl.java
index a594c258c..104e7b7c3 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/NMSImpl.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/NMSImpl.java
@@ -389,21 +389,17 @@ public class NMSImpl implements NMSBridge {
                 viewDistance = (int) PLAYER_CHUNK_MAP_VIEW_DISTANCE_GETTER.invoke(chunkMap);
                 PLAYER_CHUNK_MAP_VIEW_DISTANCE_SETTER.invoke(chunkMap, -1);
             }
-
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         boolean success = getHandle(entity).level.addFreshEntity(getHandle(entity), custom);
         try {
             if (chunkMap != null) {
                 PLAYER_CHUNK_MAP_VIEW_DISTANCE_SETTER.invoke(chunkMap, viewDistance);
             }
-
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         return success;
     }
 
@@ -419,14 +415,12 @@ public class NMSImpl implements NMSBridge {
         } else if (!handle.level.players().contains(handle)) {
             ((List) handle.level.players()).add(handle);
         }
-
         try {
             CHUNKMAP_UPDATE_PLAYER_STATUS.invoke(((ServerLevel) handle.level).getChunkSource().chunkMap, handle,
                     !remove);
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         // PlayerUpdateTask.addOrRemove(entity, remove);
     }
 
@@ -439,13 +433,11 @@ public class NMSImpl implements NMSBridge {
             PlayerAnimation.ARM_SWING.play((Player) source.getBukkitEntity());
             return;
         }
-
         boolean hasAttackDamage = source.getAttributes().hasAttribute(Attributes.ATTACK_DAMAGE);
         if (source instanceof Mob && hasAttackDamage) {
             ((Mob) source).doHurtTarget(target);
             return;
         }
-
         float f = (float) (hasAttackDamage ? source.getAttributeValue(Attributes.ATTACK_DAMAGE) : 1f);
         int i = 0;
         f += EnchantmentHelper.getDamageBonus(source.getMainHandItem(), target.getMobType());
@@ -458,12 +450,10 @@ public class NMSImpl implements NMSBridge {
                     Math.cos(source.getYRot() * Math.PI / 180.0F) * i * 0.5F);
             source.setDeltaMovement(source.getDeltaMovement().multiply(0.6, 1, 0.6));
         }
-
         int fireAspectLevel = EnchantmentHelper.getFireAspect(source);
         if (fireAspectLevel > 0) {
             target.setSecondsOnFire(fireAspectLevel * 4, false);
         }
-
         if (target instanceof ServerPlayer) {
             ServerPlayer entityhuman = (ServerPlayer) target;
             ItemStack itemstack = source.getMainHandItem();
@@ -475,11 +465,8 @@ public class NMSImpl implements NMSBridge {
                     entityhuman.getCooldowns().addCooldown(Items.SHIELD, 100);
                     source.level.broadcastEntityEvent(entityhuman, (byte) 30);
                 }
-
             }
-
         }
-
         EnchantmentHelper.doPostHurtEffects(source, target);
         EnchantmentHelper.doPostDamageEffects(target, source);
     }
@@ -497,9 +484,7 @@ public class NMSImpl implements NMSBridge {
             } catch (Throwable t) {
                 t.printStackTrace();
             }
-
         }
-
     }
 
     @Override
@@ -536,21 +521,16 @@ public class NMSImpl implements NMSBridge {
                         if (!changed && entity.equipmentHasChanged(old, curr)) {
                             changed = true;
                         }
-
                         equipment.put(slot, curr);
                     }
-
                     if (changed) {
                         List<com.mojang.datafixers.util.Pair<EquipmentSlot, ItemStack>> vals = Lists.newArrayList();
                         for (EquipmentSlot slot : EquipmentSlot.values()) {
                             vals.add(com.mojang.datafixers.util.Pair.of(slot, equipment.get(slot)));
                         }
-
                         agg.send(new ClientboundSetEquipmentPacket(handle.getId(), vals));
                     }
-
                 }
-
                 tracker.sendChanges();
             }
 
@@ -571,9 +551,7 @@ public class NMSImpl implements NMSBridge {
                     if (callback != null) {
                         callback.accept(entity);
                     }
-
                 }
-
                 linked.clear();
             }
         };
@@ -622,13 +600,10 @@ public class NMSImpl implements NMSBridge {
                 if (df != null) {
                     bserver = df.dragonEvent;
                 }
-
             }
-
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         if (bserver == null)
             return null;
         BossBar ret = Bukkit.createBossBar("", BarColor.BLUE, BarStyle.SEGMENTED_10);
@@ -637,7 +612,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         return ret;
     }
 
@@ -748,14 +722,12 @@ public class NMSImpl implements NMSBridge {
             if (SKULL_META_PROFILE == null)
                 return null;
         }
-
         try {
             return (GameProfile) SKULL_META_PROFILE.invoke(meta);
         } catch (Throwable e) {
             e.printStackTrace();
             return null;
         }
-
     }
 
     @Override
@@ -768,7 +740,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             throw new CommandException(Messages.INVALID_SOUND);
         }
-
     }
 
     @Override
@@ -784,7 +755,6 @@ public class NMSImpl implements NMSBridge {
         LivingEntity handle = getHandle((org.bukkit.entity.LivingEntity) npc.getEntity());
         if (handle == null) {
         }
-
         return DEFAULT_SPEED;
         // return (float)
         // handle.getAttribute(Attributes.d).getValue();
@@ -828,9 +798,7 @@ public class NMSImpl implements NMSBridge {
             } else {
                 ((Mob) raw).setPathfindingMalus(BlockPathTypes.WATER, oldWater + 1F);
             }
-
         }
-
         navigation.getNodeEvaluator().setCanOpenDoors(params.hasExaminer(DoorExaminer.class));
         return new MCNavigator() {
             float lastSpeed;
@@ -842,7 +810,6 @@ public class NMSImpl implements NMSBridge {
                     Node pp = path.getNode(i);
                     blocks.add(entity.getWorld().getBlockAt(pp.x, pp.y, pp.z));
                 }
-
                 return blocks;
             }
 
@@ -863,16 +830,13 @@ public class NMSImpl implements NMSBridge {
                     List<org.bukkit.block.Block> blocks = getBlocks(entity, path);
                     Util.sendBlockChanges(blocks, null);
                 }
-
                 if (oldWater >= 0) {
                     if (raw instanceof MobAI) {
                         ((MobAI) raw).setPathfindingMalus(BlockPathTypes.WATER, oldWater);
                     } else {
                         ((Mob) raw).setPathfindingMalus(BlockPathTypes.WATER, oldWater);
                     }
-
                 }
-
                 navigation.stop();
             }
 
@@ -887,15 +851,12 @@ public class NMSImpl implements NMSBridge {
                             SIZE_FIELD_SETTER.invoke(handle,
                                     new EntityDimensions(Math.min(0.99F, size.width), size.height, false));
                         }
-
                     } catch (Throwable e) {
                         e.printStackTrace();
                     }
-
                     if (!function.apply(navigation)) {
                         reason = CancelReason.STUCK;
                     }
-
                     try {
                         SIZE_FIELD_SETTER.invoke(handle, size);
                     } catch (Throwable e) {
@@ -903,14 +864,11 @@ public class NMSImpl implements NMSBridge {
                         // minecraft requires that an entity fit onto both blocks if width >= 1f, but we'd prefer to
                         // make it just fit on 1 so hack around it a bit.
                     }
-
                     if (params.debug() && getPathEntity(navigation) != null) {
                         Util.sendBlockChanges(getBlocks(entity, getPathEntity(navigation)), Material.DANDELION);
                     }
-
                     lastSpeed = params.speed();
                 }
-
                 navigation.setSpeedModifier(params.speed());
                 return navigation.isDone();
             }
@@ -1169,37 +1127,30 @@ public class NMSImpl implements NMSBridge {
             if (zDiff < 0.0) {
                 yaw += Math.abs(180 - yaw) * 2;
             }
-
             if (handle.getBukkitEntity().getType() == EntityType.ENDER_DRAGON) {
                 yaw = Util.getDragonYaw(handle.getBukkitEntity(), xDiff, zDiff);
             } else {
                 yaw = yaw - 90;
             }
-
             if (headOnly) {
                 setHeadYaw(entity, (float) yaw);
             } else {
                 look(entity, (float) yaw, (float) pitch);
             }
-
             return;
         }
-
         if (handle instanceof Mob) {
             ((Mob) handle).getLookControl().setLookAt(to.getX(), to.getY(), to.getZ(), ((Mob) handle).getHeadRotSpeed(),
                     ((Mob) handle).getMaxHeadXRot());
             while (((LivingEntity) handle).yHeadRot >= 180F) {
                 ((LivingEntity) handle).yHeadRot -= 360F;
             }
-
             while (((LivingEntity) handle).yHeadRot < -180F) {
                 ((LivingEntity) handle).yHeadRot += 360F;
             }
-
         } else if (handle instanceof NPCHolder) {
             ((NPCHolder) handle).getNPC().getOrAddTrait(RotationTrait.class).getPhysicalSession().rotateToFace(to);
         }
-
     }
 
     @Override
@@ -1212,22 +1163,18 @@ public class NMSImpl implements NMSBridge {
             } else {
                 look(from, to.getLocation(), false, true);
             }
-
         } else if (handle instanceof Mob) {
             ((Mob) handle).getLookControl().setLookAt(target, ((Mob) handle).getHeadRotSpeed(),
                     ((Mob) handle).getMaxHeadXRot());
             while (((LivingEntity) handle).yHeadRot >= 180F) {
                 ((LivingEntity) handle).yHeadRot -= 360F;
             }
-
             while (((LivingEntity) handle).yHeadRot < -180F) {
                 ((LivingEntity) handle).yHeadRot += 360F;
             }
-
         } else if (handle instanceof NPCHolder) {
             ((NPCHolder) handle).getNPC().getOrAddTrait(RotationTrait.class).getPhysicalSession().rotateToFace(to);
         }
-
     }
 
     @Override
@@ -1248,12 +1195,10 @@ public class NMSImpl implements NMSBridge {
             if (npcInfo == null) {
                 continue;
             }
-
             MirrorTrait trait = mirrorTraits.apply(npcInfo.profileId());
             if (trait == null || !trait.isMirroring(player)) {
                 continue;
             }
-
             if (Setting.DISABLE_TABLIST.asBoolean() != npcInfo.listed()) {
                 list.set(i,
                         new ClientboundPlayerInfoUpdatePacket.Entry(npcInfo.profileId(), npcInfo.profile(),
@@ -1262,11 +1207,9 @@ public class NMSImpl implements NMSBridge {
                                 npcInfo.chatSession()));
                 changed = true;
             }
-
             if (playerProfile == null) {
                 playerProfile = NMS.getProfile(player);
             }
-
             if (trait.mirrorName()) {
                 list.set(i,
                         new ClientboundPlayerInfoUpdatePacket.Entry(npcInfo.profileId(), playerProfile,
@@ -1275,29 +1218,23 @@ public class NMSImpl implements NMSBridge {
                 changed = true;
                 continue;
             }
-
             Collection<Property> textures = playerProfile.getProperties().get("textures");
             if (textures == null || textures.size() == 0) {
                 continue;
             }
-
             npcInfo.profile().getProperties().clear();
             for (String key : playerProfile.getProperties().keySet()) {
                 npcInfo.profile().getProperties().putAll(key, playerProfile.getProperties().get(key));
             }
-
             changed = true;
         }
-
         if (changed) {
             try {
                 PLAYER_INFO_ENTRIES_LIST.invoke(packet, list);
             } catch (Throwable e) {
                 e.printStackTrace();
             }
-
         }
-
     }
 
     @Override
@@ -1325,7 +1262,6 @@ public class NMSImpl implements NMSBridge {
                                     this, anvil),
                             this);
                 }
-
                 return this.bukkitEntity;
             }
         };
@@ -1373,13 +1309,11 @@ public class NMSImpl implements NMSBridge {
             if (key == null || type == null) {
                 continue;
             }
-
             CITIZENS_ENTITY_TYPES.put(clazz, type);
             int code = ENTITY_REGISTRY.getId(type);
             ENTITY_REGISTRY.put(code, key, type);
             return;
         }
-
         throw new IllegalArgumentException("unable to find valid entity superclass for class " + clazz.toString());
     }
 
@@ -1417,7 +1351,6 @@ public class NMSImpl implements NMSBridge {
             hook.hookedIn = null;
             hook.getBukkitEntity().remove();
         }
-
     }
 
     @Override
@@ -1457,7 +1390,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         sendPacket(recipient, packet);
         return true;
     }
@@ -1472,7 +1404,6 @@ public class NMSImpl implements NMSBridge {
             entities[i] = (ServerPlayer) skinnable;
             i++;
         }
-
         sendPacket(recipient, new ClientboundPlayerInfoRemovePacket(
                 skinnableNPCs.stream().map(e -> ((ServerPlayer) e).getUUID()).collect(Collectors.toList())));
     }
@@ -1491,7 +1422,6 @@ public class NMSImpl implements NMSBridge {
         if (TEAM_FIELD == null) {
             TEAM_FIELD = NMS.getGetter(team.getClass(), "team");
         }
-
         try {
             PlayerTeam nmsTeam = (PlayerTeam) TEAM_FIELD.invoke(team);
             if (mode == 1) {
@@ -1499,11 +1429,9 @@ public class NMSImpl implements NMSBridge {
             } else {
                 sendPacket(recipient, ClientboundSetPlayerTeamPacket.createAddOrModifyPacket(nmsTeam, mode == 0));
             }
-
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     @Override
@@ -1552,7 +1480,6 @@ public class NMSImpl implements NMSBridge {
                 }
                 return;
         }
-
     }
 
     @Override
@@ -1564,7 +1491,6 @@ public class NMSImpl implements NMSBridge {
         } else {
             getHandle(entity).setCustomName((Component) component);
         }
-
     }
 
     @Override
@@ -1576,7 +1502,6 @@ public class NMSImpl implements NMSBridge {
         if (ai != null) {
             ai.getMoveControl().setWantedPosition(x, y, z, speed);
         }
-
     }
 
     @Override
@@ -1601,7 +1526,6 @@ public class NMSImpl implements NMSBridge {
         if (!(handle instanceof net.minecraft.world.entity.player.Player)) {
             handle.setYBodyRot(yaw);
         }
-
         handle.setYHeadRot(yaw);
     }
 
@@ -1647,11 +1571,9 @@ public class NMSImpl implements NMSBridge {
                 FLYING_MOVECONTROL_FLOAT_SETTER.invoke(mob.getMoveControl(), npc.data().get("flying-nogravity-float"));
                 npc.data().remove("flying-nogravity-float");
             }
-
         } catch (Throwable t) {
             t.printStackTrace();
         }
-
     }
 
     @Override
@@ -1688,13 +1610,11 @@ public class NMSImpl implements NMSBridge {
             if (SET_PROFILE_METHOD == null)
                 return;
         }
-
         try {
             SET_PROFILE_METHOD.invoke(meta, profile);
         } catch (Throwable t) {
             t.printStackTrace();
         }
-
     }
 
     @Override
@@ -1708,7 +1628,6 @@ public class NMSImpl implements NMSBridge {
         } else {
             ((LivingEntity) handle).setJumping(true);
         }
-
     }
 
     @Override
@@ -1726,7 +1645,6 @@ public class NMSImpl implements NMSBridge {
         if (entity instanceof Player) {
             ((Player) entity).setSneaking(sneaking);
         }
-
         Pose pose = sneaking ? Pose.CROUCHING : Pose.STANDING;
         getHandle(entity).setPose(pose);
     }
@@ -1771,7 +1689,6 @@ public class NMSImpl implements NMSBridge {
                 if (warden.hasPose(Pose.EMERGING)) {
                     warden.setPose(Pose.STANDING);
                 }
-
             }, 134);
         } else if (pose == org.bukkit.entity.Pose.ROARING) {
             if (warden.hasPose(Pose.ROARING))
@@ -1784,12 +1701,10 @@ public class NMSImpl implements NMSBridge {
                 if (warden.hasPose(Pose.ROARING)) {
                     warden.setPose(Pose.STANDING);
                 }
-
             }, 84);
         } else {
             warden.setPose(Pose.STANDING);
         }
-
     }
 
     @Override
@@ -1807,7 +1722,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         return false;
     }
 
@@ -1819,7 +1733,6 @@ public class NMSImpl implements NMSBridge {
             ENTITY_REGISTRY_SETTER.invoke(null, ENTITY_REGISTRY.get());
         } catch (Throwable e) {
         }
-
     }
 
     @Override
@@ -1841,7 +1754,6 @@ public class NMSImpl implements NMSBridge {
             handle.setDeltaMovement(handle.getDeltaMovement().x, handle.getDeltaMovement().y + power,
                     handle.getDeltaMovement().z);
         }
-
     }
 
     @Override
@@ -1933,7 +1845,6 @@ public class NMSImpl implements NMSBridge {
                 menuType = MenuType.CRAFTING;
                 break;
         }
-
         handle.connection.send(new ClientboundOpenScreenPacket(handle.containerMenu.containerId, menuType,
                 MutableComponent.create(new LiteralContents(newTitle))));
         player.updateInventory();
@@ -1955,7 +1866,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     @Override
@@ -1967,7 +1877,6 @@ public class NMSImpl implements NMSBridge {
             ((MobAI) en).updatePathfindingRange(pathfindingRange);
             return;
         }
-
         if (NAVIGATION_PATHFINDER == null)
             return;
         PathNavigation navigation = ((Mob) en).getNavigation();
@@ -1979,7 +1888,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     private static class CitizensInventoryAnvil extends CraftInventoryAnvil implements ForwardingInventory {
@@ -2090,7 +1998,6 @@ public class NMSImpl implements NMSBridge {
             e.printStackTrace();
             return;
         }
-
         float oldw = size.width;
         float oldl = size.height;
         cb.accept(datawatcherobject);
@@ -2098,7 +2005,6 @@ public class NMSImpl implements NMSBridge {
             living.setPos(living.getX() - 0.01, living.getY(), living.getZ() - 0.01);
             living.setPos(living.getX() + 0.01, living.getY(), living.getZ() + 0.01);
         }
-
     }
 
     public static void clearGoals(NPC npc, GoalSelector... goalSelectors) {
@@ -2111,17 +2017,14 @@ public class NMSImpl implements NMSBridge {
                 if (!list.isEmpty()) {
                     npc.data().set("selector" + i, Lists.newArrayList(list));
                 }
-
                 list.clear();
             } catch (Exception e) {
                 Messaging.logTr(Messages.ERROR_CLEARING_GOALS, e.getLocalizedMessage());
             } catch (Throwable e) {
                 Messaging.logTr(Messages.ERROR_CLEARING_GOALS, e.getLocalizedMessage());
             }
-
             i++;
         }
-
     }
 
     private static CompoundTag convertNBT(net.minecraft.nbt.CompoundTag tag) {
@@ -2131,7 +2034,6 @@ public class NMSImpl implements NMSBridge {
         for (String key : tag.getAllKeys()) {
             tags.put(key, convertNBT(key, tag.get(key)));
         }
-
         return new CompoundTag("", tags);
     }
 
@@ -2162,10 +2064,8 @@ public class NMSImpl implements NMSBridge {
                 for (int i = 0; i < list.size(); i++) {
                     converted.add(convertNBT("", list.get(i)));
                 }
-
                 return new ListTag(key, tagType, converted);
             }
-
         } else if (base instanceof net.minecraft.nbt.CompoundTag)
             return convertNBT((net.minecraft.nbt.CompoundTag) base);
         else if (base instanceof net.minecraft.nbt.EndTag)
@@ -2181,7 +2081,6 @@ public class NMSImpl implements NMSBridge {
                 d0 = 0.01D;
                 entity.fallDistance = 0.0F;
             }
-
             FluidState fluid = entity.level.getFluidState(entity.blockPosition());
             if (entity.isInWater() && !entity.canStandOnFluid(fluid)) {
                 double d1 = entity.getY();
@@ -2191,27 +2090,22 @@ public class NMSImpl implements NMSBridge {
                 if (f2 > 3.0F) {
                     f2 = 3.0F;
                 }
-
                 if (!entity.isOnGround()) {
                     f2 *= 0.5F;
                 }
-
                 if (f2 > 0.0F) {
                     f += (0.546F - f) * f2 / 3.0F;
                     f1 += (entity.getSpeed() - f1) * f2 / 3.0F;
                 }
-
                 if (entity.hasEffect(MobEffects.DOLPHINS_GRACE)) {
                     f = 0.96F;
                 }
-
                 entity.moveRelative(f1, vec3d);
                 entity.move(MoverType.SELF, entity.getDeltaMovement());
                 Vec3 vec3d1 = entity.getDeltaMovement();
                 if (entity.horizontalCollision && entity.onClimbable()) {
                     vec3d1 = new Vec3(vec3d1.x, 0.2D, vec3d1.z);
                 }
-
                 entity.setDeltaMovement(vec3d1.multiply(f, 0.8D, f));
                 Vec3 vec3d2 = entity.getFluidFallingAdjustedMovement(d0, flag, entity.getDeltaMovement());
                 entity.setDeltaMovement(vec3d2);
@@ -2219,7 +2113,6 @@ public class NMSImpl implements NMSBridge {
                         && entity.isFree(vec3d2.x, vec3d2.y + 0.6D - entity.getY() + d1, vec3d2.z)) {
                     entity.setDeltaMovement(vec3d2.x, 0.3D, vec3d2.z);
                 }
-
             } else if (entity.isInLava() && !entity.canStandOnFluid(fluid)) {
                 double d1 = entity.getY();
                 entity.moveRelative(0.02F, vec3d);
@@ -2231,23 +2124,19 @@ public class NMSImpl implements NMSBridge {
                 } else {
                     entity.setDeltaMovement(entity.getDeltaMovement().scale(0.5D));
                 }
-
                 if (!entity.isNoGravity()) {
                     entity.setDeltaMovement(entity.getDeltaMovement().add(0.0D, -d0 / 4.0D, 0.0D));
                 }
-
                 Vec3 vec3d3 = entity.getDeltaMovement();
                 if (entity.horizontalCollision
                         && entity.isFree(vec3d3.x, vec3d3.y + 0.6D - entity.getY() + d1, vec3d3.z)) {
                     entity.setDeltaMovement(vec3d3.x, 0.3D, vec3d3.z);
                 }
-
             } else if (entity.isFallFlying()) {
                 Vec3 vec3d4 = entity.getDeltaMovement();
                 if (vec3d4.y > -0.5D) {
                     entity.fallDistance = 1.0F;
                 }
-
                 Vec3 vec3d5 = entity.getLookAngle();
                 float f = entity.getXRot() * 0.017453292F;
                 double d2 = Math.sqrt(vec3d5.x * vec3d5.x + vec3d5.z * vec3d5.z);
@@ -2260,17 +2149,14 @@ public class NMSImpl implements NMSBridge {
                     double d5 = vec3d4.y * -0.1D * f3;
                     vec3d4 = vec3d4.add(vec3d5.x * d5 / d2, d5, vec3d5.z * d5 / d2);
                 }
-
                 if (f < 0.0F && d2 > 0.0D) {
                     double d5 = d3 * -Mth.sin(f) * 0.04D;
                     vec3d4 = vec3d4.add(-vec3d5.x * d5 / d2, d5 * 3.2D, -vec3d5.z * d5 / d2);
                 }
-
                 if (d2 > 0.0D) {
                     vec3d4 = vec3d4.add((vec3d5.x / d2 * d3 - vec3d4.x) * 0.1D, 0.0D,
                             (vec3d5.z / d2 * d3 - vec3d4.z) * 0.1D);
                 }
-
                 entity.setDeltaMovement(vec3d4.multiply(0.99D, 0.98D, 0.99D));
                 entity.move(MoverType.SELF, entity.getDeltaMovement());
                 if (entity.horizontalCollision && !entity.level.isClientSide) {
@@ -2281,14 +2167,11 @@ public class NMSImpl implements NMSBridge {
                         entity.playSound(entity.getFallDamageSound0((int) f4), 1.0F, 1.0F);
                         entity.hurt(entity.damageSources().flyIntoWall(), f4);
                     }
-
                 }
-
                 if (entity.isOnGround() && !entity.level.isClientSide && entity.getSharedFlag(7)
                         && !CraftEventFactory.callToggleGlideEvent(entity, false).isCancelled()) {
                     entity.setSharedFlag(7, false);
                 }
-
             } else {
                 BlockPos blockposition = BlockPos.containing(entity.getX(), entity.getBoundingBox().minY - 0.5D,
                         entity.getZ());
@@ -2305,21 +2188,16 @@ public class NMSImpl implements NMSBridge {
                     } else {
                         d7 = 0.0D;
                     }
-
                 } else if (!entity.isNoGravity()) {
                     d7 -= d0;
                 }
-
                 if (entity.shouldDiscardFriction()) {
                     entity.setDeltaMovement(vec3d6.x, d7, vec3d6.z);
                 } else {
                     entity.setDeltaMovement(vec3d6.x * f, d7 * 0.98D, vec3d6.z * f);
                 }
-
             }
-
         }
-
         entity.calculateEntityAnimation(entity instanceof net.minecraft.world.entity.animal.FlyingAnimal);
     }
 
@@ -2329,7 +2207,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         return null;
     }
 
@@ -2365,7 +2242,6 @@ public class NMSImpl implements NMSBridge {
             e.printStackTrace();
             return null;
         }
-
     }
 
     public static List<Packet<?>> getPositionUpdate(org.bukkit.entity.Entity from, boolean position, Float bodyYaw,
@@ -2374,11 +2250,9 @@ public class NMSImpl implements NMSBridge {
         if (bodyYaw == null) {
             bodyYaw = handle.getYRot();
         }
-
         if (pitch == null) {
             pitch = handle.getXRot();
         }
-
         List<Packet<?>> toSend = Lists.newArrayList();
         if (position) {
             TrackedEntity entry = ((ServerLevel) handle.level).getChunkSource().chunkMap.entityMap.get(handle.getId());
@@ -2389,7 +2263,6 @@ public class NMSImpl implements NMSBridge {
                 e.printStackTrace();
                 return Collections.emptyList();
             }
-
             Vec3 pos = handle.trackingPosition();
             toSend.add(new ClientboundMoveEntityPacket.PosRot(handle.getId(), (short) vdc.encodeX(pos),
                     (short) vdc.encodeY(pos), (short) vdc.encodeZ(pos), (byte) (bodyYaw * 256.0F / 360.0F),
@@ -2398,11 +2271,9 @@ public class NMSImpl implements NMSBridge {
             toSend.add(new ClientboundMoveEntityPacket.Rot(handle.getId(), (byte) (bodyYaw * 256.0F / 360.0F),
                     (byte) (pitch * 256.0F / 360.0F), handle.onGround));
         }
-
         if (headYaw != null) {
             toSend.add(new ClientboundRotateHeadPacket(handle, (byte) (headYaw * 256.0F / 360.0F)));
         }
-
         return toSend;
     }
 
@@ -2416,7 +2287,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         return null;
     }
 
@@ -2450,7 +2320,6 @@ public class NMSImpl implements NMSBridge {
         if (mat != null) {
             minecart.setDisplayBlockState(BuiltInRegistries.BLOCK.byId(mat.getId()).defaultBlockState());
         }
-
         minecart.setDisplayOffset(offset);
     }
 
@@ -2464,7 +2333,6 @@ public class NMSImpl implements NMSBridge {
             handle.setDeltaMovement(handle.getDeltaMovement().scale(0.9));
             return true;
         }
-
         return false;
     }
 
@@ -2475,7 +2343,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     public static void restoreGoals(NPC npc, GoalSelector... goalSelectors) {
@@ -2490,16 +2357,13 @@ public class NMSImpl implements NMSBridge {
                 if (old != null) {
                     list.addAll(old);
                 }
-
             } catch (Exception e) {
                 Messaging.logTr(Messages.ERROR_RESTORING_GOALS, e.getLocalizedMessage());
             } catch (Throwable e) {
                 Messaging.logTr(Messages.ERROR_RESTORING_GOALS, e.getLocalizedMessage());
             }
-
             i++;
         }
-
     }
 
     public static void sendPacket(Player player, Packet<?> packet) {
@@ -2526,13 +2390,10 @@ public class NMSImpl implements NMSBridge {
                     || location.distanceSquared(player.getLocation(PACKET_CACHE_LOCATION)) > radius) {
                 continue;
             }
-
             for (Packet<?> packet : packets) {
                 sendPacket(player, packet);
             }
-
         }
-
     }
 
     public static void sendPacketsNearby(Player from, Location location, Packet<?>... packets) {
@@ -2545,7 +2406,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     public static void setAttribute(LivingEntity entity, Attribute attribute, double value) {
@@ -2563,10 +2423,8 @@ public class NMSImpl implements NMSBridge {
             } catch (Throwable e) {
                 e.printStackTrace();
             }
-
             attr = entity.getAttribute(attribute);
         }
-
         attr.setBaseValue(value);
     }
 
@@ -2576,7 +2434,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     public static void setFallingBlockState(FallingBlockEntity handle, BlockState state) {
@@ -2585,7 +2442,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     public static void setLife(FishingHook entity, int life) {
@@ -2594,7 +2450,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     public static void setLookControl(Mob mob, LookControl control) {
@@ -2603,7 +2458,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     public static void setNotInSchool(AbstractFish entity) {
@@ -2611,11 +2465,9 @@ public class NMSImpl implements NMSBridge {
             if (ENTITY_FISH_NUM_IN_SCHOOL != null) {
                 ENTITY_FISH_NUM_IN_SCHOOL.invoke(entity, 2);
             }
-
         } catch (Throwable ex) {
             ex.printStackTrace();
         }
-
     }
 
     public static void setSize(Entity entity, boolean justCreated) {
@@ -2638,13 +2490,10 @@ public class NMSImpl implements NMSBridge {
                     float f = entitysize.width - entitysize1.width;
                     entity.move(MoverType.SELF, new Vec3(f, 0.0D, f));
                 }
-
             }
-
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     public static void setSize(Entity entity, EntityDimensions size) {
@@ -2655,7 +2504,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     public static Entity teleportAcrossWorld(Entity entity, ServerLevel worldserver, PositionImpl location) {
@@ -2670,7 +2518,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         if (npc == null || sds == null)
             return null;
         npc.despawn(DespawnReason.PENDING_RESPAWN);
@@ -2683,7 +2530,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         return handle;
     }
 
@@ -2698,7 +2544,6 @@ public class NMSImpl implements NMSBridge {
         } else if (entity instanceof MobAI) {
             ((MobAI) entity).tickAI();
         }
-
     }
 
     public static void updateMinecraftAIState(NPC npc, Mob entity) {
@@ -2711,7 +2556,6 @@ public class NMSImpl implements NMSBridge {
                 getBehaviorMap(entity).putAll(behavior);
                 npc.data().remove("behavior-map");
             }
-
         } else {
             clearGoals(npc, entity.goalSelector, entity.targetSelector);
             TreeMap behaviorMap = getBehaviorMap(entity);
@@ -2719,9 +2563,7 @@ public class NMSImpl implements NMSBridge {
                 npc.data().set("behavior-map", new TreeMap(behaviorMap));
                 behaviorMap.clear();
             }
-
         }
-
     }
 
     private static final MethodHandle ADVANCEMENTS_PLAYER_SETTER = NMS.getFirstFinalSetter(ServerPlayer.class,
@@ -2812,39 +2654,33 @@ public class NMSImpl implements NMSBridge {
             Messaging.logTr(Messages.ERROR_GETTING_ID_MAPPING, e.getMessage());
             e.printStackTrace();
         }
-
         try {
             // Middle one
             ENDERMAN_CREEPY = (EntityDataAccessor<Boolean>) NMS.getField(EnderMan.class, "bU").get(null);
         } catch (Exception e) {
             e.printStackTrace();
         }
-
         try {
             RABBIT_TYPE_DATAWATCHER = (EntityDataAccessor<Integer>) NMS
                     .getFirstStaticGetter(Rabbit.class, EntityDataAccessor.class).invoke();
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         try {
             INTERACTION_HEIGHT = (EntityDataAccessor<Float>) NMS.getGetter(Interaction.class, "d").invoke();
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         try {
             INTERACTION_WIDTH = (EntityDataAccessor<Float>) NMS.getGetter(Interaction.class, "c").invoke();
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         try {
             DATA_POSE = (EntityDataAccessor<Pose>) NMS.getGetter(Entity.class, "ar").invoke();
             DATA_NAME_VISIBLE = (EntityDataAccessor<Boolean>) NMS.getGetter(Entity.class, "aS").invoke();
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/PitchableLookControl.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/PitchableLookControl.java
index d355a9bab..6b86c84c2 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/PitchableLookControl.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/PitchableLookControl.java
@@ -18,7 +18,6 @@ public class PitchableLookControl extends LookControl {
         } else {
             resetOnTick = () -> true;
         }
-
     }
 
     @Override
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/PlayerAnimationImpl.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/PlayerAnimationImpl.java
index d1b1993e9..8b7589fb0 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/PlayerAnimationImpl.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/PlayerAnimationImpl.java
@@ -24,7 +24,6 @@ public class PlayerAnimationImpl {
             playDefaultAnimation(player, to, DEFAULTS.get(animation));
             return;
         }
-
         switch (animation) {
             case HURT:
                 sendPacketNearby(new ClientboundHurtAnimationPacket(player), to);
@@ -62,7 +61,6 @@ public class PlayerAnimationImpl {
             default:
                 throw new UnsupportedOperationException();
         }
-
     }
 
     protected static void playDefaultAnimation(ServerPlayer player, Iterable<Player> to, int code) {
@@ -80,7 +78,6 @@ public class PlayerAnimationImpl {
         for (Player player : to) {
             NMSImpl.sendPacket(player, packet);
         }
-
     }
 
     private static Map<PlayerAnimation, Integer> DEFAULTS = Maps.newEnumMap(PlayerAnimation.class);
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/AllayController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/AllayController.java
index 0ac8e0465..c7ef2e289 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/AllayController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/AllayController.java
@@ -90,7 +90,6 @@ public class AllayController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -98,7 +97,6 @@ public class AllayController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -108,7 +106,6 @@ public class AllayController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -121,7 +118,6 @@ public class AllayController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new AllayNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -194,10 +190,8 @@ public class AllayController extends MobEntityController {
                         taskId = -1;
                     }, 2);
                 }
-
                 return InteractionResult.FAIL;
             }
-
             return super.mobInteract(var0, var1);
         }
 
@@ -215,7 +209,6 @@ public class AllayController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -226,7 +219,6 @@ public class AllayController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -248,7 +240,6 @@ public class AllayController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -260,7 +251,6 @@ public class AllayController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/ArmorStandController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/ArmorStandController.java
index 62c38e411..930eb3d8c 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/ArmorStandController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/ArmorStandController.java
@@ -60,7 +60,6 @@ public class ArmorStandController extends MobEntityController {
             if (npc != null) {
                 ai = new BasicMobAI(this);
             }
-
         }
 
         @Override
@@ -73,7 +72,6 @@ public class ArmorStandController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ArmorStandNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -109,7 +107,6 @@ public class ArmorStandController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -120,7 +117,6 @@ public class ArmorStandController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -142,7 +138,6 @@ public class ArmorStandController extends MobEntityController {
                 npc.update();
                 ai.tickAI();
             }
-
         }
 
         @Override
@@ -154,7 +149,6 @@ public class ArmorStandController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/AxolotlController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/AxolotlController.java
index 1fe05a8c9..6dc090469 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/AxolotlController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/AxolotlController.java
@@ -76,7 +76,6 @@ public class AxolotlController extends MobEntityController {
                 this.getAttribute(Attributes.MOVEMENT_SPEED)
                         .setBaseValue(this.getAttribute(Attributes.MOVEMENT_SPEED).getBaseValue() / 10);
             }
-
         }
 
         @Override
@@ -98,7 +97,6 @@ public class AxolotlController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -106,7 +104,6 @@ public class AxolotlController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -119,7 +116,6 @@ public class AxolotlController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new AxolotlNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -206,7 +202,6 @@ public class AxolotlController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -217,7 +212,6 @@ public class AxolotlController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -240,14 +234,11 @@ public class AxolotlController extends MobEntityController {
                 if (npc.useMinecraftAI() && this.moveControl != this.oldMoveController) {
                     this.moveControl = this.oldMoveController;
                 }
-
                 if (!npc.useMinecraftAI() && this.moveControl == this.oldMoveController) {
                     this.moveControl = new MoveControl(this);
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
@@ -256,11 +247,9 @@ public class AxolotlController extends MobEntityController {
                 if (!NMSImpl.moveFish(npc, this, vec3d)) {
                     super.travel(vec3d);
                 }
-
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -272,7 +261,6 @@ public class AxolotlController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/BatController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/BatController.java
index 4d35647d4..25c70b87a 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/BatController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/BatController.java
@@ -59,7 +59,6 @@ public class BatController extends MobEntityController {
             if (npc != null) {
                 setResting(false);
             }
-
         }
 
         @Override
@@ -74,7 +73,6 @@ public class BatController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -86,10 +84,8 @@ public class BatController extends MobEntityController {
                 if (npc.useMinecraftAI()) {
                     super.customServerAiStep();
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
@@ -102,7 +98,6 @@ public class BatController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new BatNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -164,7 +159,6 @@ public class BatController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -175,7 +169,6 @@ public class BatController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -199,7 +192,6 @@ public class BatController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/BeeController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/BeeController.java
index 3929abe65..a2c5668dc 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/BeeController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/BeeController.java
@@ -70,7 +70,6 @@ public class BeeController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -82,10 +81,8 @@ public class BeeController extends MobEntityController {
                 if (npc.useMinecraftAI()) {
                     super.customServerAiStep();
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
@@ -98,7 +95,6 @@ public class BeeController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new BeeNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -160,7 +156,6 @@ public class BeeController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -171,7 +166,6 @@ public class BeeController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -195,7 +189,6 @@ public class BeeController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/BlazeController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/BlazeController.java
index 9fa27450b..04c58daef 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/BlazeController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/BlazeController.java
@@ -70,7 +70,6 @@ public class BlazeController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -79,7 +78,6 @@ public class BlazeController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -92,7 +90,6 @@ public class BlazeController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new BlazeNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -154,7 +151,6 @@ public class BlazeController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -165,7 +161,6 @@ public class BlazeController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -189,7 +184,6 @@ public class BlazeController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/CamelController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/CamelController.java
index e76c9109a..cd22f8396 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/CamelController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/CamelController.java
@@ -78,7 +78,6 @@ public class CamelController extends MobEntityController {
                         .setDomestication(((org.bukkit.entity.Camel) getBukkitEntity()).getMaxDomestication());
                 baseMovementSpeed = this.getAttribute(Attributes.MOVEMENT_SPEED).getValue();
             }
-
         }
 
         @Override
@@ -100,7 +99,6 @@ public class CamelController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -108,7 +106,6 @@ public class CamelController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -123,20 +120,16 @@ public class CamelController extends MobEntityController {
                 } else {
                     riding = false;
                 }
-
                 if (riding) {
                     if (npc.getNavigator().isNavigating()) {
                         org.bukkit.entity.Entity basePassenger = passengers.get(0).getBukkitEntity();
                         NMS.look(basePassenger, getYRot(), getXRot());
                     }
-
                     setFlag(4, true); // datawatcher method
                 }
-
                 NMS.setStepHeight(getBukkitEntity(), 1);
                 npc.update();
             }
-
         }
 
         @Override
@@ -149,7 +142,6 @@ public class CamelController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new CamelNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -231,7 +223,6 @@ public class CamelController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -241,7 +232,6 @@ public class CamelController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -252,7 +242,6 @@ public class CamelController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -274,7 +263,6 @@ public class CamelController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -286,7 +274,6 @@ public class CamelController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/CatController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/CatController.java
index b2c6201a8..9b47daa9b 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/CatController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/CatController.java
@@ -80,7 +80,6 @@ public class CatController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -88,7 +87,6 @@ public class CatController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -98,7 +96,6 @@ public class CatController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -111,7 +108,6 @@ public class CatController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new CatNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -181,7 +177,6 @@ public class CatController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -191,7 +186,6 @@ public class CatController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -202,7 +196,6 @@ public class CatController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -224,7 +217,6 @@ public class CatController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -236,7 +228,6 @@ public class CatController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/CaveSpiderController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/CaveSpiderController.java
index 74f6970f5..6bfd2981e 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/CaveSpiderController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/CaveSpiderController.java
@@ -79,7 +79,6 @@ public class CaveSpiderController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -87,7 +86,6 @@ public class CaveSpiderController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -97,7 +95,6 @@ public class CaveSpiderController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -110,7 +107,6 @@ public class CaveSpiderController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new CaveSpiderNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -180,7 +176,6 @@ public class CaveSpiderController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -191,7 +186,6 @@ public class CaveSpiderController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -201,7 +195,6 @@ public class CaveSpiderController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -223,7 +216,6 @@ public class CaveSpiderController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -235,7 +227,6 @@ public class CaveSpiderController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/ChickenController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/ChickenController.java
index 9ee7be521..2ebb2222e 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/ChickenController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/ChickenController.java
@@ -66,7 +66,6 @@ public class ChickenController extends MobEntityController {
             if (npc != null) {
                 this.eggTime = 100;
             }
-
             super.aiStep();
         }
 
@@ -89,7 +88,6 @@ public class ChickenController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -97,7 +95,6 @@ public class ChickenController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -107,7 +104,6 @@ public class ChickenController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -120,7 +116,6 @@ public class ChickenController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ChickenNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -190,7 +185,6 @@ public class ChickenController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -200,7 +194,6 @@ public class ChickenController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -211,7 +204,6 @@ public class ChickenController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -233,7 +225,6 @@ public class ChickenController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -245,7 +236,6 @@ public class ChickenController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/CodController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/CodController.java
index be4eee0cf..830b89f41 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/CodController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/CodController.java
@@ -71,7 +71,6 @@ public class CodController extends MobEntityController {
                 this.oldMoveController = this.moveControl;
                 this.moveControl = new MoveControl(this);
             }
-
         }
 
         @Override
@@ -80,12 +79,10 @@ public class CodController extends MobEntityController {
             if (npc != null) {
                 this.verticalCollision = false;
             }
-
             super.aiStep();
             if (npc != null) {
                 this.verticalCollision = lastInWater;
             }
-
         }
 
         @Override
@@ -107,7 +104,6 @@ public class CodController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -115,7 +111,6 @@ public class CodController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -124,23 +119,18 @@ public class CodController extends MobEntityController {
                 if (!npc.useMinecraftAI()) {
                     NMSImpl.setNotInSchool(this);
                 }
-
                 NMSImpl.updateMinecraftAIState(npc, this);
                 if (npc.useMinecraftAI() && this.moveControl != this.oldMoveController) {
                     this.moveControl = this.oldMoveController;
                 }
-
                 if (!npc.useMinecraftAI() && this.moveControl == this.oldMoveController) {
                     this.moveControl = new EntityMoveControl(this);
                 }
-
             }
-
             super.customServerAiStep();
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -153,7 +143,6 @@ public class CodController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new CodNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -233,7 +222,6 @@ public class CodController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -244,7 +232,6 @@ public class CodController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -265,11 +252,9 @@ public class CodController extends MobEntityController {
                 if (!NMSImpl.moveFish(npc, this, vec3d)) {
                     super.travel(vec3d);
                 }
-
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -281,7 +266,6 @@ public class CodController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/CowController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/CowController.java
index 3b7bcf1ed..f701fc7b3 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/CowController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/CowController.java
@@ -85,7 +85,6 @@ public class CowController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -93,7 +92,6 @@ public class CowController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -103,7 +101,6 @@ public class CowController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -116,7 +113,6 @@ public class CowController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new CowNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -196,7 +192,6 @@ public class CowController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -206,7 +201,6 @@ public class CowController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -217,7 +211,6 @@ public class CowController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -239,7 +232,6 @@ public class CowController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -251,7 +243,6 @@ public class CowController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/CreeperController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/CreeperController.java
index afa936719..01aafd36a 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/CreeperController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/CreeperController.java
@@ -82,7 +82,6 @@ public class CreeperController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -90,7 +89,6 @@ public class CreeperController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -100,7 +98,6 @@ public class CreeperController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -113,7 +110,6 @@ public class CreeperController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new CreeperNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -152,7 +148,6 @@ public class CreeperController extends MobEntityController {
             if (npc == null || !npc.isProtected()) {
                 super.ignite();
             }
-
         }
 
         @Override
@@ -191,7 +186,6 @@ public class CreeperController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -202,7 +196,6 @@ public class CreeperController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -212,7 +205,6 @@ public class CreeperController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -236,7 +228,6 @@ public class CreeperController extends MobEntityController {
             if (npc == null || allowPowered) {
                 super.thunderHit(worldserver, entitylightning);
             }
-
         }
 
         @Override
@@ -246,7 +237,6 @@ public class CreeperController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -258,7 +248,6 @@ public class CreeperController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/DolphinController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/DolphinController.java
index 0b1af507b..fc996698b 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/DolphinController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/DolphinController.java
@@ -70,7 +70,6 @@ public class DolphinController extends MobEntityController {
                 this.getAttribute(Attributes.MOVEMENT_SPEED)
                         .setBaseValue(this.getAttribute(Attributes.MOVEMENT_SPEED).getBaseValue() / 10);
             }
-
         }
 
         @Override
@@ -92,7 +91,6 @@ public class DolphinController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -100,7 +98,6 @@ public class DolphinController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -113,7 +110,6 @@ public class DolphinController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new DolphinNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -188,7 +184,6 @@ public class DolphinController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -199,7 +194,6 @@ public class DolphinController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -219,7 +213,6 @@ public class DolphinController extends MobEntityController {
             if (npc != null && npc.isProtected()) {
                 inProtectedTick = true;
             }
-
             super.tick();
             inProtectedTick = false;
             if (npc != null) {
@@ -227,14 +220,11 @@ public class DolphinController extends MobEntityController {
                 if (npc.useMinecraftAI() && this.moveControl != this.oldMoveController) {
                     this.moveControl = this.oldMoveController;
                 }
-
                 if (!npc.useMinecraftAI() && this.moveControl == this.oldMoveController) {
                     this.moveControl = new MoveControl(this);
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
@@ -243,11 +233,9 @@ public class DolphinController extends MobEntityController {
                 if (!NMSImpl.moveFish(npc, this, vec3d)) {
                     super.travel(vec3d);
                 }
-
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -259,7 +247,6 @@ public class DolphinController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/DrownedController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/DrownedController.java
index ad7b59699..713acd47f 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/DrownedController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/DrownedController.java
@@ -79,7 +79,6 @@ public class DrownedController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -87,7 +86,6 @@ public class DrownedController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -97,7 +95,6 @@ public class DrownedController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -110,7 +107,6 @@ public class DrownedController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new DrownedNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -180,7 +176,6 @@ public class DrownedController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -191,7 +186,6 @@ public class DrownedController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -213,7 +207,6 @@ public class DrownedController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -225,7 +218,6 @@ public class DrownedController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/EnderDragonController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/EnderDragonController.java
index 1c18b65ed..3d335ce2f 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/EnderDragonController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/EnderDragonController.java
@@ -68,25 +68,20 @@ public class EnderDragonController extends MobEntityController {
                 npc.update();
 
             }
-
             if (npc != null && !npc.useMinecraftAI()) {
                 if (isDeadOrDying()) {
                     setHealth(0F);
                     return;
                 }
-
                 if (this.posPointer < 0) {
                     for (int i = 0; i < this.positions.length; ++i) {
                         this.positions[i][0] = this.getYRot();
                         this.positions[i][1] = this.getY();
                     }
-
                 }
-
                 if (++this.posPointer == this.positions.length) {
                     this.posPointer = 0;
                 }
-
                 this.positions[this.posPointer][0] = this.getYRot();
                 this.positions[this.posPointer][1] = this.getY();
 
@@ -101,22 +96,18 @@ public class EnderDragonController extends MobEntityController {
                     subEntities[j].yo = subEntities[j].yOld = vec3.y;
                     subEntities[j].zo = subEntities[j].zOld = vec3.z;
                 }
-
                 if (getFirstPassenger() != null) {
                     setYRot(getFirstPassenger().getBukkitYaw() - 180);
                 }
-
                 Vec3 mot = getDeltaMovement();
                 if (mot.x != 0 || mot.y != 0 || mot.z != 0) {
                     mot = mot.multiply(0.98, 0.91, 0.98);
                     if (getFirstPassenger() == null) {
                         setYRot(Util.getDragonYaw(getBukkitEntity(), mot.x, mot.z));
                     }
-
                     setPos(getX() + mot.x, getY() + mot.y, getZ() + mot.z);
                     setDeltaMovement(mot);
                 }
-
                 if (npc.hasTrait(EnderDragonTrait.class) && npc.getOrAddTrait(EnderDragonTrait.class).isDestroyWalls()
                         && NMSImpl.ENDERDRAGON_CHECK_WALLS != null) {
                     for (int i = 0; i < 3; i++) {
@@ -126,11 +117,8 @@ public class EnderDragonController extends MobEntityController {
                         } catch (Throwable e) {
                             e.printStackTrace();
                         }
-
                     }
-
                 }
-
                 if (npc.data().get(NPC.Metadata.COLLIDABLE, false)) {
                     try {
                         NMSImpl.ENDERDRAGON_KNOCKBACK.invoke(this,
@@ -148,13 +136,10 @@ public class EnderDragonController extends MobEntityController {
                     } catch (Throwable t) {
                         t.printStackTrace();
                     }
-
                 }
-
             } else {
                 super.aiStep();
             }
-
         }
 
         @Override
@@ -169,7 +154,6 @@ public class EnderDragonController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -182,7 +166,6 @@ public class EnderDragonController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new EnderDragonNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -244,7 +227,6 @@ public class EnderDragonController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -255,7 +237,6 @@ public class EnderDragonController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -268,7 +249,6 @@ public class EnderDragonController extends MobEntityController {
             if (getPhaseManager().getCurrentPhase().getPhase() == EnderDragonPhase.HOVERING) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
 
@@ -293,7 +273,6 @@ public class EnderDragonController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/EndermanController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/EndermanController.java
index 607124c92..c3b3d65e5 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/EndermanController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/EndermanController.java
@@ -82,7 +82,6 @@ public class EndermanController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -90,7 +89,6 @@ public class EndermanController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -100,7 +98,6 @@ public class EndermanController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -113,7 +110,6 @@ public class EndermanController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new EndermanNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -183,7 +179,6 @@ public class EndermanController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -194,7 +189,6 @@ public class EndermanController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -212,7 +206,6 @@ public class EndermanController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -234,7 +227,6 @@ public class EndermanController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -246,7 +238,6 @@ public class EndermanController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/EndermiteController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/EndermiteController.java
index 4ad592535..2866f4050 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/EndermiteController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/EndermiteController.java
@@ -79,7 +79,6 @@ public class EndermiteController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -87,7 +86,6 @@ public class EndermiteController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -97,7 +95,6 @@ public class EndermiteController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -110,7 +107,6 @@ public class EndermiteController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new EndermiteNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -180,7 +176,6 @@ public class EndermiteController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -191,7 +186,6 @@ public class EndermiteController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -201,7 +195,6 @@ public class EndermiteController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -223,7 +216,6 @@ public class EndermiteController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -235,7 +227,6 @@ public class EndermiteController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/EntityHumanNPC.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/EntityHumanNPC.java
index 360575144..bfcc6cb6e 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/EntityHumanNPC.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/EntityHumanNPC.java
@@ -77,12 +77,10 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
             } catch (Throwable e) {
                 e.printStackTrace();
             }
-
             initialise(minecraftServer, ci);
         } else {
             skinTracker = null;
         }
-
     }
 
     @Override
@@ -97,7 +95,6 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
         if (npc == null || !npc.isFlyable()) {
             super.checkFallDamage(d0, flag, iblockdata, blockposition);
         }
-
     }
 
     @Override
@@ -120,7 +117,6 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
             super.doTick();
             return;
         }
-
         super.baseTick();
         boolean navigating = npc.getNavigator().isNavigating() || ai.getMoveControl().hasWanted();
         if (!navigating && getBukkitEntity() != null
@@ -129,27 +125,22 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
                 && (!npc.isProtected() || SpigotUtil.checkYSafe(getY(), getBukkitEntity().getWorld()))) {
             moveWithFallDamage(Vec3.ZERO);
         }
-
         Vec3 mot = getDeltaMovement();
         if (Math.abs(mot.x) < EPSILON && Math.abs(mot.y) < EPSILON && Math.abs(mot.z) < EPSILON) {
             setDeltaMovement(Vec3.ZERO);
         }
-
         if (navigating) {
             if (!ai.getNavigation().isDone()) {
                 ai.getNavigation().tick();
             }
-
             moveOnCurrentHeading();
         }
-
         tickAI();
         detectEquipmentUpdatesPublic();
         noPhysics = isSpectator();
         if (isSpectator()) {
             this.onGround = false;
         }
-
         pushEntities();
 
         if (npc.data().get(NPC.Metadata.PICKUP_ITEMS, false)) {
@@ -159,13 +150,10 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
             } else {
                 axisalignedbb = this.getBoundingBox().inflate(1.0, 0.5, 1.0);
             }
-
             for (Entity entity : level().getEntities(this, axisalignedbb)) {
                 entity.playerTouch(this);
             }
-
         }
-
     }
 
     @Override
@@ -179,7 +167,6 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
             NMSImpl.setBukkitEntity(this, new PlayerNPC(this));
             setBukkitEntity = true;
         }
-
         return super.getBukkitEntity();
     }
 
@@ -209,7 +196,6 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
         if (skinName == null) {
             skinName = npc.getName();
         }
-
         return skinName.toLowerCase();
     }
 
@@ -240,7 +226,6 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
             hurtMarked = false;
             Bukkit.getScheduler().runTask(CitizensAPI.getPlugin(), () -> EntityHumanNPC.this.hurtMarked = true);
         }
-
         return damaged;
     }
 
@@ -252,7 +237,6 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
         } catch (IOException e) {
             e.printStackTrace();
         }
-
         this.invulnerableTime = 0;
         NMS.setStepHeight(getBukkitEntity(), 1); // the default (0) breaks step climbing
         setSkinFlags((byte) 0xFF);
@@ -287,11 +271,9 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
                 jumpFromGround();
                 jumpTicks = 10;
             }
-
         } else {
             jumpTicks = 0;
         }
-
         xxa *= 0.98F;
         zza *= 0.98F;
         moveWithFallDamage(new Vec3(this.xxa, this.yya, this.zza));
@@ -299,7 +281,6 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
         if (jumpTicks > 0) {
             jumpTicks--;
         }
-
     }
 
     private void moveWithFallDamage(Vec3 vec) {
@@ -310,7 +291,6 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
         if (!npc.isProtected()) {
             doCheckFallDamage(getX() - x, getY() - y, getZ() - z, onGround);
         }
-
     }
 
     @Override
@@ -327,7 +307,6 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
         if (vector != null) {
             super.push(vector.getX(), vector.getY(), vector.getZ());
         }
-
     }
 
     @Override
@@ -338,7 +317,6 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
         if (npc != null) {
             Util.callCollisionEvent(npc, entity.getBukkitEntity());
         }
-
     }
 
     @Override
@@ -391,7 +369,6 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
         } else {
             NMSImpl.flyingMoveLogic(this, vec3d);
         }
-
     }
 
     @Override
@@ -401,7 +378,6 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
         if (!npc.isPushableByFluids()) {
             setDeltaMovement(old);
         }
-
         return res;
     }
 
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/EvokerController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/EvokerController.java
index cc102f892..9ee0dcb37 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/EvokerController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/EvokerController.java
@@ -73,7 +73,6 @@ public class EvokerController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -81,7 +80,6 @@ public class EvokerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -91,7 +89,6 @@ public class EvokerController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -104,7 +101,6 @@ public class EvokerController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new EvokerNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -174,7 +170,6 @@ public class EvokerController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -185,7 +180,6 @@ public class EvokerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -207,7 +201,6 @@ public class EvokerController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -219,7 +212,6 @@ public class EvokerController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/FoxController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/FoxController.java
index 1ad6dbf3e..8c8e4b2fb 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/FoxController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/FoxController.java
@@ -74,7 +74,6 @@ public class FoxController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -82,7 +81,6 @@ public class FoxController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -92,7 +90,6 @@ public class FoxController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -105,7 +102,6 @@ public class FoxController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new FoxNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -175,7 +171,6 @@ public class FoxController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -185,7 +180,6 @@ public class FoxController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -196,7 +190,6 @@ public class FoxController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -218,7 +211,6 @@ public class FoxController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -230,7 +222,6 @@ public class FoxController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/FrogController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/FrogController.java
index 2ade59969..1727cc73d 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/FrogController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/FrogController.java
@@ -56,7 +56,6 @@ public class FrogController extends MobEntityController {
             if (npc != null) {
                 croakAnimationState.start(1);
             }
-
         }
 
         @Override
@@ -78,7 +77,6 @@ public class FrogController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -86,7 +84,6 @@ public class FrogController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -96,7 +93,6 @@ public class FrogController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -109,7 +105,6 @@ public class FrogController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new FrogNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -179,7 +174,6 @@ public class FrogController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -189,7 +183,6 @@ public class FrogController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -200,7 +193,6 @@ public class FrogController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -222,7 +214,6 @@ public class FrogController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -234,7 +225,6 @@ public class FrogController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/GhastController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/GhastController.java
index bde5e1adf..fd1d5e4a7 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/GhastController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/GhastController.java
@@ -64,7 +64,6 @@ public class GhastController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -73,7 +72,6 @@ public class GhastController extends MobEntityController {
                 npc.update();
                 NMSImpl.updateMinecraftAIState(npc, this);
             }
-
             super.customServerAiStep();
         }
 
@@ -87,7 +85,6 @@ public class GhastController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new GhastNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -154,7 +151,6 @@ public class GhastController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -165,7 +161,6 @@ public class GhastController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -189,7 +184,6 @@ public class GhastController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/GiantController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/GiantController.java
index 99e4cc3c8..438fccc17 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/GiantController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/GiantController.java
@@ -73,7 +73,6 @@ public class GiantController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -81,7 +80,6 @@ public class GiantController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -91,7 +89,6 @@ public class GiantController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -104,7 +101,6 @@ public class GiantController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new GiantNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -174,7 +170,6 @@ public class GiantController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -185,7 +180,6 @@ public class GiantController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -195,7 +189,6 @@ public class GiantController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -217,7 +210,6 @@ public class GiantController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -229,7 +221,6 @@ public class GiantController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/GlowSquidController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/GlowSquidController.java
index cb9d94caf..59a1c9ac8 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/GlowSquidController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/GlowSquidController.java
@@ -73,7 +73,6 @@ public class GlowSquidController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -81,7 +80,6 @@ public class GlowSquidController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -91,7 +89,6 @@ public class GlowSquidController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -104,7 +101,6 @@ public class GlowSquidController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new GlowSquidNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -174,7 +170,6 @@ public class GlowSquidController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -185,7 +180,6 @@ public class GlowSquidController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -195,7 +189,6 @@ public class GlowSquidController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -217,7 +210,6 @@ public class GlowSquidController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -229,7 +221,6 @@ public class GlowSquidController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/GoatController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/GoatController.java
index cb69363b8..1d417754b 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/GoatController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/GoatController.java
@@ -74,7 +74,6 @@ public class GoatController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -82,7 +81,6 @@ public class GoatController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -92,7 +90,6 @@ public class GoatController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -105,7 +102,6 @@ public class GoatController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new GoatNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -175,7 +171,6 @@ public class GoatController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -185,7 +180,6 @@ public class GoatController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -196,7 +190,6 @@ public class GoatController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -218,7 +211,6 @@ public class GoatController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -230,7 +222,6 @@ public class GoatController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/GuardianController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/GuardianController.java
index 9534d62b0..49c07a6e4 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/GuardianController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/GuardianController.java
@@ -65,10 +65,8 @@ public class GuardianController extends MobEntityController {
                 } else {
                     super.aiStep();
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
@@ -90,7 +88,6 @@ public class GuardianController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -98,7 +95,6 @@ public class GuardianController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -111,7 +107,6 @@ public class GuardianController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new GuardianNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -181,7 +176,6 @@ public class GuardianController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -192,7 +186,6 @@ public class GuardianController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -202,7 +195,6 @@ public class GuardianController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -224,7 +216,6 @@ public class GuardianController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -236,7 +227,6 @@ public class GuardianController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/GuardianElderController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/GuardianElderController.java
index a0a2925fe..6e80136a3 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/GuardianElderController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/GuardianElderController.java
@@ -65,10 +65,8 @@ public class GuardianElderController extends MobEntityController {
                 } else {
                     super.aiStep();
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
@@ -90,7 +88,6 @@ public class GuardianElderController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -98,7 +95,6 @@ public class GuardianElderController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -111,7 +107,6 @@ public class GuardianElderController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new GuardianElderNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -181,7 +176,6 @@ public class GuardianElderController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -192,7 +186,6 @@ public class GuardianElderController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -202,7 +195,6 @@ public class GuardianElderController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -224,7 +216,6 @@ public class GuardianElderController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -236,7 +227,6 @@ public class GuardianElderController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/HoglinController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/HoglinController.java
index 1af2eb269..e1154b3f0 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/HoglinController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/HoglinController.java
@@ -55,7 +55,6 @@ public class HoglinController extends MobEntityController {
             if (npc != null) {
                 NMSImpl.clearGoals(npc, goalSelector, targetSelector);
             }
-
         }
 
         @Override
@@ -77,7 +76,6 @@ public class HoglinController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -85,7 +83,6 @@ public class HoglinController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -94,12 +91,10 @@ public class HoglinController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 setImmuneToZombification(true);
             }
-
             super.customServerAiStep();
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -112,7 +107,6 @@ public class HoglinController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new HoglinNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -182,7 +176,6 @@ public class HoglinController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -193,7 +186,6 @@ public class HoglinController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -215,7 +207,6 @@ public class HoglinController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -227,7 +218,6 @@ public class HoglinController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/HorseController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/HorseController.java
index eba8f24c2..9464a0217 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/HorseController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/HorseController.java
@@ -72,7 +72,6 @@ public class HorseController extends MobEntityController {
                 horse.setDomestication(horse.getMaxDomestication());
                 baseMovementSpeed = this.getAttribute(Attributes.MOVEMENT_SPEED).getValue();
             }
-
         }
 
         @Override
@@ -94,7 +93,6 @@ public class HorseController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -102,7 +100,6 @@ public class HorseController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -118,16 +115,13 @@ public class HorseController extends MobEntityController {
             } else {
                 riding = false;
             }
-
             if (riding) {
                 if (npc.getNavigator().isNavigating()) {
                     org.bukkit.entity.Entity basePassenger = passengers.get(0).getBukkitEntity();
                     NMS.look(basePassenger, getYRot(), getXRot());
                 }
-
                 setFlag(4, true); // datawatcher method
             }
-
             NMS.setStepHeight(getBukkitEntity(), 1);
             npc.update();
         }
@@ -142,7 +136,6 @@ public class HorseController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new HorseNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -224,7 +217,6 @@ public class HorseController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -234,7 +226,6 @@ public class HorseController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -245,7 +236,6 @@ public class HorseController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -267,7 +257,6 @@ public class HorseController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -279,7 +268,6 @@ public class HorseController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/HorseDonkeyController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/HorseDonkeyController.java
index 82f1be4a9..12f5e0917 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/HorseDonkeyController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/HorseDonkeyController.java
@@ -72,7 +72,6 @@ public class HorseDonkeyController extends MobEntityController {
                         .setDomestication(((org.bukkit.entity.Donkey) getBukkitEntity()).getMaxDomestication());
                 baseMovementSpeed = this.getAttribute(Attributes.MOVEMENT_SPEED).getValue();
             }
-
         }
 
         @Override
@@ -94,7 +93,6 @@ public class HorseDonkeyController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -102,7 +100,6 @@ public class HorseDonkeyController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -117,20 +114,16 @@ public class HorseDonkeyController extends MobEntityController {
                 } else {
                     riding = false;
                 }
-
                 if (riding) {
                     if (npc.getNavigator().isNavigating()) {
                         org.bukkit.entity.Entity basePassenger = passengers.get(0).getBukkitEntity();
                         NMS.look(basePassenger, getYRot(), getXRot());
                     }
-
                     setFlag(4, true); // datawatcher method
                 }
-
                 NMS.setStepHeight(getBukkitEntity(), 1);
                 npc.update();
             }
-
         }
 
         @Override
@@ -143,7 +136,6 @@ public class HorseDonkeyController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new HorseDonkeyNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -225,7 +217,6 @@ public class HorseDonkeyController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -235,7 +226,6 @@ public class HorseDonkeyController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -246,7 +236,6 @@ public class HorseDonkeyController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -268,7 +257,6 @@ public class HorseDonkeyController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -280,7 +268,6 @@ public class HorseDonkeyController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/HorseMuleController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/HorseMuleController.java
index 246c8c35b..8be45c3e7 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/HorseMuleController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/HorseMuleController.java
@@ -72,7 +72,6 @@ public class HorseMuleController extends MobEntityController {
                         .setDomestication(((org.bukkit.entity.Mule) getBukkitEntity()).getMaxDomestication());
                 baseMovementSpeed = this.getAttribute(Attributes.MOVEMENT_SPEED).getValue();
             }
-
         }
 
         @Override
@@ -94,7 +93,6 @@ public class HorseMuleController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -102,7 +100,6 @@ public class HorseMuleController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -117,20 +114,16 @@ public class HorseMuleController extends MobEntityController {
                 } else {
                     riding = false;
                 }
-
                 if (riding) {
                     if (npc.getNavigator().isNavigating()) {
                         org.bukkit.entity.Entity basePassenger = passengers.get(0).getBukkitEntity();
                         NMS.look(basePassenger, getYRot(), getXRot());
                     }
-
                     setFlag(4, true); // datawatcher method
                 }
-
                 NMS.setStepHeight(getBukkitEntity(), 1);
                 npc.update();
             }
-
         }
 
         @Override
@@ -143,7 +136,6 @@ public class HorseMuleController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new HorseMuleNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -225,7 +217,6 @@ public class HorseMuleController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -235,7 +226,6 @@ public class HorseMuleController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -246,7 +236,6 @@ public class HorseMuleController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -268,7 +257,6 @@ public class HorseMuleController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -280,7 +268,6 @@ public class HorseMuleController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/HorseSkeletonController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/HorseSkeletonController.java
index 733e3711a..a6778e686 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/HorseSkeletonController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/HorseSkeletonController.java
@@ -71,7 +71,6 @@ public class HorseSkeletonController extends MobEntityController {
                         .setDomestication(((org.bukkit.entity.SkeletonHorse) getBukkitEntity()).getMaxDomestication());
                 baseMovementSpeed = this.getAttribute(Attributes.MOVEMENT_SPEED).getValue();
             }
-
         }
 
         @Override
@@ -93,7 +92,6 @@ public class HorseSkeletonController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -101,7 +99,6 @@ public class HorseSkeletonController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -116,20 +113,16 @@ public class HorseSkeletonController extends MobEntityController {
                 } else {
                     riding = false;
                 }
-
                 if (riding) {
                     if (npc.getNavigator().isNavigating()) {
                         org.bukkit.entity.Entity basePassenger = passengers.get(0).getBukkitEntity();
                         NMS.look(basePassenger, getYRot(), getXRot());
                     }
-
                     setFlag(4, true); // datawatcher method
                 }
-
                 NMS.setStepHeight(getBukkitEntity(), 1);
                 npc.update();
             }
-
         }
 
         @Override
@@ -142,7 +135,6 @@ public class HorseSkeletonController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new HorseSkeletonNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -224,7 +216,6 @@ public class HorseSkeletonController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -234,7 +225,6 @@ public class HorseSkeletonController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -245,7 +235,6 @@ public class HorseSkeletonController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -267,7 +256,6 @@ public class HorseSkeletonController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -279,7 +267,6 @@ public class HorseSkeletonController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/HorseZombieController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/HorseZombieController.java
index 90c75d79d..e8e1a03d7 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/HorseZombieController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/HorseZombieController.java
@@ -72,7 +72,6 @@ public class HorseZombieController extends MobEntityController {
                         .setDomestication(((org.bukkit.entity.ZombieHorse) getBukkitEntity()).getMaxDomestication());
                 baseMovementSpeed = this.getAttribute(Attributes.MOVEMENT_SPEED).getValue();
             }
-
         }
 
         @Override
@@ -94,7 +93,6 @@ public class HorseZombieController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -102,7 +100,6 @@ public class HorseZombieController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -117,20 +114,16 @@ public class HorseZombieController extends MobEntityController {
                 } else {
                     riding = false;
                 }
-
                 if (riding) {
                     if (npc.getNavigator().isNavigating()) {
                         org.bukkit.entity.Entity basePassenger = passengers.get(0).getBukkitEntity();
                         NMS.look(basePassenger, getYRot(), getXRot());
                     }
-
                     setFlag(4, true); // datawatcher method
                 }
-
                 NMS.setStepHeight(getBukkitEntity(), 1);
                 npc.update();
             }
-
         }
 
         @Override
@@ -143,7 +136,6 @@ public class HorseZombieController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new HorseZombieNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -225,7 +217,6 @@ public class HorseZombieController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -235,7 +226,6 @@ public class HorseZombieController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -246,7 +236,6 @@ public class HorseZombieController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -268,7 +257,6 @@ public class HorseZombieController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -280,7 +268,6 @@ public class HorseZombieController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/HumanController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/HumanController.java
index eddfd835b..a7c6da9f1 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/HumanController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/HumanController.java
@@ -36,11 +36,9 @@ public class HumanController extends AbstractEntityController {
         if (npc.requiresNameHologram()) {
             name = teamName;
         }
-
         if (Setting.USE_SCOREBOARD_TEAMS.asBoolean()) {
             npc.getOrAddTrait(ScoreboardTrait.class).createTeam(name);
         }
-
         final GameProfile profile = new GameProfile(uuid, name);
         final EntityHumanNPC handle = new EntityHumanNPC(MinecraftServer.getServer(), nmsWorld, profile,
                 ClientInformation.createDefault(), npc);
@@ -48,7 +46,6 @@ public class HumanController extends AbstractEntityController {
         if (skin != null) {
             skin.apply(handle);
         }
-
         Bukkit.getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(), () -> {
             if (getBukkitEntity() == null || !getBukkitEntity().isValid()
                     || getBukkitEntity() != handle.getBukkitEntity())
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/IllusionerController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/IllusionerController.java
index 5ab5f3b17..d64c902af 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/IllusionerController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/IllusionerController.java
@@ -73,7 +73,6 @@ public class IllusionerController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -81,7 +80,6 @@ public class IllusionerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -91,7 +89,6 @@ public class IllusionerController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -104,7 +101,6 @@ public class IllusionerController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new IllusionerNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -174,7 +170,6 @@ public class IllusionerController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -185,7 +180,6 @@ public class IllusionerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -207,7 +201,6 @@ public class IllusionerController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -219,7 +212,6 @@ public class IllusionerController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/IronGolemController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/IronGolemController.java
index ebb7aaf6d..363e4a2c8 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/IronGolemController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/IronGolemController.java
@@ -73,7 +73,6 @@ public class IronGolemController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -81,7 +80,6 @@ public class IronGolemController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -91,7 +89,6 @@ public class IronGolemController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -104,7 +101,6 @@ public class IronGolemController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new IronGolemNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -174,7 +170,6 @@ public class IronGolemController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -185,7 +180,6 @@ public class IronGolemController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -195,7 +189,6 @@ public class IronGolemController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -217,7 +210,6 @@ public class IronGolemController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -229,7 +221,6 @@ public class IronGolemController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/LlamaController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/LlamaController.java
index bcbb5b74a..e0b83d3a7 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/LlamaController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/LlamaController.java
@@ -72,7 +72,6 @@ public class LlamaController extends MobEntityController {
                         .setDomestication(((org.bukkit.entity.Llama) getBukkitEntity()).getMaxDomestication());
                 baseMovementSpeed = this.getAttribute(Attributes.MOVEMENT_SPEED).getValue();
             }
-
         }
 
         @Override
@@ -94,7 +93,6 @@ public class LlamaController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -102,7 +100,6 @@ public class LlamaController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -117,20 +114,16 @@ public class LlamaController extends MobEntityController {
                 } else {
                     riding = false;
                 }
-
                 if (riding) {
                     if (npc.getNavigator().isNavigating()) {
                         org.bukkit.entity.Entity basePassenger = passengers.get(0).getBukkitEntity();
                         NMS.look(basePassenger, getYRot(), getXRot());
                     }
-
                     setFlag(4, true); // datawatcher method
                 }
-
                 NMS.setStepHeight(getBukkitEntity(), 1);
                 npc.update();
             }
-
         }
 
         @Override
@@ -143,7 +136,6 @@ public class LlamaController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new LlamaNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -225,7 +217,6 @@ public class LlamaController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -235,7 +226,6 @@ public class LlamaController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -246,7 +236,6 @@ public class LlamaController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -268,7 +257,6 @@ public class LlamaController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -280,7 +268,6 @@ public class LlamaController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/MagmaCubeController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/MagmaCubeController.java
index 90889d900..b47e66734 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/MagmaCubeController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/MagmaCubeController.java
@@ -62,7 +62,6 @@ public class MagmaCubeController extends MobEntityController {
                 this.oldMoveController = this.moveControl;
                 this.moveControl = new EntityMoveControl(this);
             }
-
         }
 
         @Override
@@ -84,7 +83,6 @@ public class MagmaCubeController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -92,7 +90,6 @@ public class MagmaCubeController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -105,7 +102,6 @@ public class MagmaCubeController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new MagmaCubeNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -174,7 +170,6 @@ public class MagmaCubeController extends MobEntityController {
             if (npc == null) {
                 super.playerTouch(human);
             }
-
         }
 
         @Override
@@ -183,7 +178,6 @@ public class MagmaCubeController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -194,7 +188,6 @@ public class MagmaCubeController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -204,7 +197,6 @@ public class MagmaCubeController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -227,14 +219,11 @@ public class MagmaCubeController extends MobEntityController {
                 if (npc.useMinecraftAI() && this.moveControl != this.oldMoveController) {
                     this.moveControl = this.oldMoveController;
                 }
-
                 if (!npc.useMinecraftAI() && this.moveControl == this.oldMoveController) {
                     this.moveControl = new EntityMoveControl(this);
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
@@ -244,7 +233,6 @@ public class MagmaCubeController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -256,7 +244,6 @@ public class MagmaCubeController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/MobEntityController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/MobEntityController.java
index 6dcd97e6c..ba98c5af4 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/MobEntityController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/MobEntityController.java
@@ -39,9 +39,7 @@ public abstract class MobEntityController extends AbstractEntityController {
             if (mob.getLookControl().getClass() == LookControl.class) {
                 NMSImpl.setLookControl(mob, new PitchableLookControl(mob));
             }
-
         }
-
         entity.absMoveTo(at.getX(), at.getY(), at.getZ(), at.getYaw(), at.getPitch());
         if (npc != null) {
             // entity.onGround isn't updated right away - we approximate here so
@@ -50,14 +48,11 @@ public abstract class MobEntityController extends AbstractEntityController {
             if (beneath.isSolid()) {
                 entity.setOnGround(true);
             }
-
             entity.setUUID(npc.getUniqueId());
             if (Setting.USE_SCOREBOARD_TEAMS.asBoolean()) {
                 npc.getOrAddTrait(ScoreboardTrait.class).createTeam(npc.getUniqueId().toString());
             }
-
         }
-
         return entity.getBukkitEntity();
     }
 
@@ -68,7 +63,6 @@ public abstract class MobEntityController extends AbstractEntityController {
             ex.printStackTrace();
             return null;
         }
-
     }
 
     private static Constructor<?> getConstructor(Class<?> clazz) {
@@ -81,7 +75,6 @@ public abstract class MobEntityController extends AbstractEntityController {
         } catch (Exception ex) {
             throw new IllegalStateException("unable to find an entity constructor");
         }
-
     }
 
     private static final Map<Class<?>, Constructor<?>> CONSTRUCTOR_CACHE = new WeakHashMap<>();
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/MushroomCowController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/MushroomCowController.java
index 040549a25..c8ea307e5 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/MushroomCowController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/MushroomCowController.java
@@ -77,7 +77,6 @@ public class MushroomCowController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -85,7 +84,6 @@ public class MushroomCowController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -95,7 +93,6 @@ public class MushroomCowController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -108,7 +105,6 @@ public class MushroomCowController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new MushroomCowNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -185,7 +181,6 @@ public class MushroomCowController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -195,7 +190,6 @@ public class MushroomCowController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -206,7 +200,6 @@ public class MushroomCowController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -228,7 +221,6 @@ public class MushroomCowController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -240,7 +232,6 @@ public class MushroomCowController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/OcelotController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/OcelotController.java
index f761e026e..86b9dbf53 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/OcelotController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/OcelotController.java
@@ -75,7 +75,6 @@ public class OcelotController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -83,7 +82,6 @@ public class OcelotController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -94,12 +92,10 @@ public class OcelotController extends MobEntityController {
             if (restorePose) {
                 this.setPose(old);
             }
-
             if (npc != null) {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -112,7 +108,6 @@ public class OcelotController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new OcelotNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -182,7 +177,6 @@ public class OcelotController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -192,7 +186,6 @@ public class OcelotController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -203,7 +196,6 @@ public class OcelotController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -225,7 +217,6 @@ public class OcelotController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -237,7 +228,6 @@ public class OcelotController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/PandaController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/PandaController.java
index 72774abc8..eb00bc947 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/PandaController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/PandaController.java
@@ -74,7 +74,6 @@ public class PandaController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -82,7 +81,6 @@ public class PandaController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -92,7 +90,6 @@ public class PandaController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -105,7 +102,6 @@ public class PandaController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new PandaNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -175,7 +171,6 @@ public class PandaController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -185,7 +180,6 @@ public class PandaController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -196,7 +190,6 @@ public class PandaController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -218,7 +211,6 @@ public class PandaController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -230,7 +222,6 @@ public class PandaController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/ParrotController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/ParrotController.java
index 0bb83c21c..a59284f8b 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/ParrotController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/ParrotController.java
@@ -67,7 +67,6 @@ public class ParrotController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -79,10 +78,8 @@ public class ParrotController extends MobEntityController {
                 if (npc.useMinecraftAI()) {
                     super.customServerAiStep();
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
@@ -95,7 +92,6 @@ public class ParrotController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ParrotNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -165,7 +161,6 @@ public class ParrotController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -176,7 +171,6 @@ public class ParrotController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -200,7 +194,6 @@ public class ParrotController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/PhantomController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/PhantomController.java
index 2855a5e93..423146a0c 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/PhantomController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/PhantomController.java
@@ -67,7 +67,6 @@ public class PhantomController extends MobEntityController {
                 this.lookControl = new LookControl(this);
                 // TODO: phantom pitch reversed
             }
-
         }
 
         @Override
@@ -79,19 +78,15 @@ public class PhantomController extends MobEntityController {
                     this.moveControl = this.oldMoveController;
                     this.lookControl = this.oldLookController;
                 }
-
                 if (!npc.useMinecraftAI() && this.moveControl == this.oldMoveController) {
                     this.moveControl = new EntityMoveControl(this);
                     this.lookControl = new LookControl(this);
                 }
-
                 if (npc.isProtected()) {
                     setSecondsOnFire(0);
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
@@ -113,7 +108,6 @@ public class PhantomController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -121,7 +115,6 @@ public class PhantomController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -134,7 +127,6 @@ public class PhantomController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new PhantomNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -211,7 +203,6 @@ public class PhantomController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -221,7 +212,6 @@ public class PhantomController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -232,7 +222,6 @@ public class PhantomController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -259,7 +248,6 @@ public class PhantomController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -271,7 +259,6 @@ public class PhantomController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/PigController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/PigController.java
index f7caa1116..9d59d4276 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/PigController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/PigController.java
@@ -75,7 +75,6 @@ public class PigController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -83,7 +82,6 @@ public class PigController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -93,7 +91,6 @@ public class PigController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -106,7 +103,6 @@ public class PigController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new PigNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -182,7 +178,6 @@ public class PigController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -192,7 +187,6 @@ public class PigController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -203,7 +197,6 @@ public class PigController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -223,7 +216,6 @@ public class PigController extends MobEntityController {
             if (npc == null) {
                 super.thunderHit(worldserver, entitylightning);
             }
-
         }
 
         @Override
@@ -233,7 +225,6 @@ public class PigController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -245,7 +236,6 @@ public class PigController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/PigZombieController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/PigZombieController.java
index 86d4e572d..f611883b3 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/PigZombieController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/PigZombieController.java
@@ -73,7 +73,6 @@ public class PigZombieController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -81,7 +80,6 @@ public class PigZombieController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -91,7 +89,6 @@ public class PigZombieController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -104,7 +101,6 @@ public class PigZombieController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new PigZombieNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -174,7 +170,6 @@ public class PigZombieController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -185,7 +180,6 @@ public class PigZombieController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -207,7 +201,6 @@ public class PigZombieController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -219,7 +212,6 @@ public class PigZombieController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/PiglinBruteController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/PiglinBruteController.java
index bc82477b6..a33d45e69 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/PiglinBruteController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/PiglinBruteController.java
@@ -73,7 +73,6 @@ public class PiglinBruteController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -81,7 +80,6 @@ public class PiglinBruteController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -90,12 +88,10 @@ public class PiglinBruteController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 setImmuneToZombification(true);
             }
-
             super.customServerAiStep();
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -108,7 +104,6 @@ public class PiglinBruteController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new PiglinBruteNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -178,7 +173,6 @@ public class PiglinBruteController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -189,7 +183,6 @@ public class PiglinBruteController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -211,7 +204,6 @@ public class PiglinBruteController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -223,7 +215,6 @@ public class PiglinBruteController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/PiglinController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/PiglinController.java
index a8166a2f6..dc61003ed 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/PiglinController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/PiglinController.java
@@ -73,7 +73,6 @@ public class PiglinController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -81,7 +80,6 @@ public class PiglinController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -90,12 +88,10 @@ public class PiglinController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 setImmuneToZombification(true);
             }
-
             super.customServerAiStep();
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -108,7 +104,6 @@ public class PiglinController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new PiglinNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -178,7 +173,6 @@ public class PiglinController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -189,7 +183,6 @@ public class PiglinController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -211,7 +204,6 @@ public class PiglinController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -223,7 +215,6 @@ public class PiglinController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/PillagerController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/PillagerController.java
index 5261658e4..77536f521 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/PillagerController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/PillagerController.java
@@ -74,7 +74,6 @@ public class PillagerController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -82,7 +81,6 @@ public class PillagerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -92,7 +90,6 @@ public class PillagerController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -105,7 +102,6 @@ public class PillagerController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new PillagerNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -175,7 +171,6 @@ public class PillagerController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -185,7 +180,6 @@ public class PillagerController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -196,7 +190,6 @@ public class PillagerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -218,7 +211,6 @@ public class PillagerController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -230,7 +222,6 @@ public class PillagerController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/PolarBearController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/PolarBearController.java
index 1d3d88d10..99de39e52 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/PolarBearController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/PolarBearController.java
@@ -65,7 +65,6 @@ public class PolarBearController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -75,7 +74,6 @@ public class PolarBearController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -88,7 +86,6 @@ public class PolarBearController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new PolarBearNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -150,7 +147,6 @@ public class PolarBearController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -160,7 +156,6 @@ public class PolarBearController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -171,7 +166,6 @@ public class PolarBearController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -195,7 +189,6 @@ public class PolarBearController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/PufferFishController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/PufferFishController.java
index 064f82be5..c33e48bb6 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/PufferFishController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/PufferFishController.java
@@ -68,7 +68,6 @@ public class PufferFishController extends MobEntityController {
                 this.oldMoveController = this.moveControl;
                 this.moveControl = new MoveControl(this);
             }
-
         }
 
         @Override
@@ -79,13 +78,11 @@ public class PufferFishController extends MobEntityController {
                 this.verticalCollision = false;
                 setPuffState(0);
             }
-
             super.aiStep();
             if (npc != null) {
                 this.verticalCollision = lastInWater;
                 setPuffState(lastPuffState);
             }
-
         }
 
         @Override
@@ -107,7 +104,6 @@ public class PufferFishController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -115,7 +111,6 @@ public class PufferFishController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -126,14 +121,11 @@ public class PufferFishController extends MobEntityController {
                 if (npc.useMinecraftAI() && this.moveControl != this.oldMoveController) {
                     this.moveControl = this.oldMoveController;
                 }
-
                 if (!npc.useMinecraftAI() && this.moveControl == this.oldMoveController) {
                     this.moveControl = new EntityMoveControl(this);
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
@@ -146,7 +138,6 @@ public class PufferFishController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new PufferFishNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -233,7 +224,6 @@ public class PufferFishController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -244,7 +234,6 @@ public class PufferFishController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -264,13 +253,11 @@ public class PufferFishController extends MobEntityController {
             if (npc != null) {
                 NMSImpl.resetPuffTicks(this);
             }
-
             super.tick();
             PufferFishTrait trait = null;
             if (npc != null && (trait = npc.getTraitNullable(PufferFishTrait.class)) != null) {
                 setPuffState(trait.getPuffState());
             }
-
         }
 
         @Override
@@ -279,11 +266,9 @@ public class PufferFishController extends MobEntityController {
                 if (!NMSImpl.moveFish(npc, this, vec3d)) {
                     super.travel(vec3d);
                 }
-
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -295,7 +280,6 @@ public class PufferFishController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
 
@@ -308,7 +292,6 @@ public class PufferFishController extends MobEntityController {
                 default:
                     return 1.0F;
             }
-
         }
     }
 
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/RabbitController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/RabbitController.java
index dee238994..9eecbc356 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/RabbitController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/RabbitController.java
@@ -75,7 +75,6 @@ public class RabbitController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -83,7 +82,6 @@ public class RabbitController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -94,10 +92,8 @@ public class RabbitController extends MobEntityController {
                 if (npc.getNavigator().isNavigating()) {
                     NMS.setShouldJump(getBukkitEntity());
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
@@ -110,7 +106,6 @@ public class RabbitController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new RabbitNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -185,7 +180,6 @@ public class RabbitController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -195,7 +189,6 @@ public class RabbitController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -206,7 +199,6 @@ public class RabbitController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -222,7 +214,6 @@ public class RabbitController extends MobEntityController {
                 this.entityData.set(NMSImpl.RABBIT_TYPE_DATAWATCHER, variant.id());
                 return;
             }
-
             super.setVariant(variant);
         }
 
@@ -240,7 +231,6 @@ public class RabbitController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -252,7 +242,6 @@ public class RabbitController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/RavagerController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/RavagerController.java
index 39a06ea08..03ef06621 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/RavagerController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/RavagerController.java
@@ -74,7 +74,6 @@ public class RavagerController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -82,7 +81,6 @@ public class RavagerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -92,7 +90,6 @@ public class RavagerController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -105,7 +102,6 @@ public class RavagerController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new RavagerNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -180,7 +176,6 @@ public class RavagerController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -190,7 +185,6 @@ public class RavagerController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -201,7 +195,6 @@ public class RavagerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -223,7 +216,6 @@ public class RavagerController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -235,7 +227,6 @@ public class RavagerController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SalmonController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SalmonController.java
index 249e66f61..5639e1435 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SalmonController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SalmonController.java
@@ -65,7 +65,6 @@ public class SalmonController extends MobEntityController {
                 this.oldMoveController = this.moveControl;
                 this.moveControl = new MoveControl(this);
             }
-
         }
 
         @Override
@@ -74,12 +73,10 @@ public class SalmonController extends MobEntityController {
             if (npc != null) {
                 this.verticalCollision = false;
             }
-
             super.aiStep();
             if (npc != null) {
                 this.verticalCollision = lastInWater;
             }
-
         }
 
         @Override
@@ -101,7 +98,6 @@ public class SalmonController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -109,7 +105,6 @@ public class SalmonController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -120,18 +115,14 @@ public class SalmonController extends MobEntityController {
                 if (npc.useMinecraftAI() && this.moveControl != this.oldMoveController) {
                     this.moveControl = this.oldMoveController;
                 }
-
                 if (!npc.useMinecraftAI() && this.moveControl == this.oldMoveController) {
                     this.moveControl = new EntityMoveControl(this);
                 }
-
             }
-
             super.customServerAiStep();
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -144,7 +135,6 @@ public class SalmonController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SalmonNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -224,7 +214,6 @@ public class SalmonController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -235,7 +224,6 @@ public class SalmonController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -256,11 +244,9 @@ public class SalmonController extends MobEntityController {
                 if (!NMSImpl.moveFish(npc, this, vec3d)) {
                     super.travel(vec3d);
                 }
-
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -272,7 +258,6 @@ public class SalmonController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SheepController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SheepController.java
index 2ac29b6bb..c410c7666 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SheepController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SheepController.java
@@ -74,7 +74,6 @@ public class SheepController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -82,7 +81,6 @@ public class SheepController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -92,7 +90,6 @@ public class SheepController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -105,7 +102,6 @@ public class SheepController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SheepNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -175,7 +171,6 @@ public class SheepController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -185,7 +180,6 @@ public class SheepController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -196,7 +190,6 @@ public class SheepController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -218,7 +211,6 @@ public class SheepController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -230,7 +222,6 @@ public class SheepController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/ShulkerController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/ShulkerController.java
index 3da7f0876..ab5e96e38 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/ShulkerController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/ShulkerController.java
@@ -60,7 +60,6 @@ public class ShulkerController extends MobEntityController {
             if (npc == null || npc.useMinecraftAI()) {
                 super.aiStep();
             }
-
         }
 
         @Override
@@ -82,7 +81,6 @@ public class ShulkerController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -90,7 +88,6 @@ public class ShulkerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -108,7 +105,6 @@ public class ShulkerController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ShulkerNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -178,7 +174,6 @@ public class ShulkerController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -189,7 +184,6 @@ public class ShulkerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -199,7 +193,6 @@ public class ShulkerController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -221,12 +214,10 @@ public class ShulkerController extends MobEntityController {
                 if (npc.useMinecraftAI()) {
                     super.tick();
                 }
-
                 npc.update();
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -236,7 +227,6 @@ public class ShulkerController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -248,7 +238,6 @@ public class ShulkerController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SilverfishController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SilverfishController.java
index ab5a9b5dd..04084383e 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SilverfishController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SilverfishController.java
@@ -73,7 +73,6 @@ public class SilverfishController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -81,7 +80,6 @@ public class SilverfishController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -91,7 +89,6 @@ public class SilverfishController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -104,7 +101,6 @@ public class SilverfishController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SilverfishNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -174,7 +170,6 @@ public class SilverfishController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -185,7 +180,6 @@ public class SilverfishController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -195,7 +189,6 @@ public class SilverfishController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -217,7 +210,6 @@ public class SilverfishController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -229,7 +221,6 @@ public class SilverfishController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SkeletonController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SkeletonController.java
index ad65551a8..b8a91683f 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SkeletonController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SkeletonController.java
@@ -73,7 +73,6 @@ public class SkeletonController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -81,7 +80,6 @@ public class SkeletonController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -91,7 +89,6 @@ public class SkeletonController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -104,7 +101,6 @@ public class SkeletonController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SkeletonNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -174,7 +170,6 @@ public class SkeletonController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -185,7 +180,6 @@ public class SkeletonController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -195,7 +189,6 @@ public class SkeletonController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -217,7 +210,6 @@ public class SkeletonController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -229,7 +221,6 @@ public class SkeletonController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SkeletonStrayController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SkeletonStrayController.java
index 4b593b292..0922f032f 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SkeletonStrayController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SkeletonStrayController.java
@@ -73,7 +73,6 @@ public class SkeletonStrayController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -81,7 +80,6 @@ public class SkeletonStrayController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -91,7 +89,6 @@ public class SkeletonStrayController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -104,7 +101,6 @@ public class SkeletonStrayController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new StrayNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -174,7 +170,6 @@ public class SkeletonStrayController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -185,7 +180,6 @@ public class SkeletonStrayController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -195,7 +189,6 @@ public class SkeletonStrayController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -217,7 +210,6 @@ public class SkeletonStrayController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -229,7 +221,6 @@ public class SkeletonStrayController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SkeletonWitherController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SkeletonWitherController.java
index 09908e923..e96afa1f5 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SkeletonWitherController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SkeletonWitherController.java
@@ -73,7 +73,6 @@ public class SkeletonWitherController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -81,7 +80,6 @@ public class SkeletonWitherController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -91,7 +89,6 @@ public class SkeletonWitherController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -104,7 +101,6 @@ public class SkeletonWitherController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SkeletonWitherNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -174,7 +170,6 @@ public class SkeletonWitherController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -185,7 +180,6 @@ public class SkeletonWitherController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -195,7 +189,6 @@ public class SkeletonWitherController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -217,7 +210,6 @@ public class SkeletonWitherController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -229,7 +221,6 @@ public class SkeletonWitherController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SlimeController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SlimeController.java
index 5706f0dc9..db8881c14 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SlimeController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SlimeController.java
@@ -62,7 +62,6 @@ public class SlimeController extends MobEntityController {
                 this.oldMoveController = this.moveControl;
                 this.moveControl = new EntityMoveControl(this);
             }
-
         }
 
         @Override
@@ -86,7 +85,6 @@ public class SlimeController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -94,7 +92,6 @@ public class SlimeController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -107,7 +104,6 @@ public class SlimeController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SlimeNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -176,7 +172,6 @@ public class SlimeController extends MobEntityController {
             if (npc == null) {
                 super.playerTouch(human);
             }
-
         }
 
         @Override
@@ -185,7 +180,6 @@ public class SlimeController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -196,7 +190,6 @@ public class SlimeController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -206,7 +199,6 @@ public class SlimeController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -229,14 +221,11 @@ public class SlimeController extends MobEntityController {
                 if (npc.useMinecraftAI() && this.moveControl != this.oldMoveController) {
                     this.moveControl = this.oldMoveController;
                 }
-
                 if (!npc.useMinecraftAI() && this.moveControl == this.oldMoveController) {
                     this.moveControl = new EntityMoveControl(this);
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
@@ -246,7 +235,6 @@ public class SlimeController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -258,7 +246,6 @@ public class SlimeController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SnifferController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SnifferController.java
index 49f33d8ce..aa2f5a70e 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SnifferController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SnifferController.java
@@ -79,7 +79,6 @@ public class SnifferController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -87,7 +86,6 @@ public class SnifferController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -97,7 +95,6 @@ public class SnifferController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -110,7 +107,6 @@ public class SnifferController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SnifferNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -190,7 +186,6 @@ public class SnifferController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -200,7 +195,6 @@ public class SnifferController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -211,7 +205,6 @@ public class SnifferController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -233,7 +226,6 @@ public class SnifferController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -245,7 +237,6 @@ public class SnifferController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SnowmanController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SnowmanController.java
index e6878cd16..0a5afe94e 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SnowmanController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SnowmanController.java
@@ -73,7 +73,6 @@ public class SnowmanController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -81,7 +80,6 @@ public class SnowmanController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -91,7 +89,6 @@ public class SnowmanController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -104,7 +101,6 @@ public class SnowmanController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SnowmanNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -174,7 +170,6 @@ public class SnowmanController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -185,7 +180,6 @@ public class SnowmanController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -195,7 +189,6 @@ public class SnowmanController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -217,7 +210,6 @@ public class SnowmanController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -229,7 +221,6 @@ public class SnowmanController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SpiderController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SpiderController.java
index 258a379ec..332eb1373 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SpiderController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SpiderController.java
@@ -73,7 +73,6 @@ public class SpiderController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -81,7 +80,6 @@ public class SpiderController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -91,7 +89,6 @@ public class SpiderController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -104,7 +101,6 @@ public class SpiderController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SpiderNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -174,7 +170,6 @@ public class SpiderController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -185,7 +180,6 @@ public class SpiderController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -195,7 +189,6 @@ public class SpiderController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -217,7 +210,6 @@ public class SpiderController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -229,7 +221,6 @@ public class SpiderController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SquidController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SquidController.java
index fc82b4bc1..50e1c845f 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SquidController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/SquidController.java
@@ -73,7 +73,6 @@ public class SquidController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -81,7 +80,6 @@ public class SquidController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -91,7 +89,6 @@ public class SquidController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -104,7 +101,6 @@ public class SquidController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SquidNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -174,7 +170,6 @@ public class SquidController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -185,7 +180,6 @@ public class SquidController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -195,7 +189,6 @@ public class SquidController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -217,7 +210,6 @@ public class SquidController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -229,7 +221,6 @@ public class SquidController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/StriderController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/StriderController.java
index fc4b237ef..cd776d39e 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/StriderController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/StriderController.java
@@ -73,7 +73,6 @@ public class StriderController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -81,7 +80,6 @@ public class StriderController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -91,7 +89,6 @@ public class StriderController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -104,7 +101,6 @@ public class StriderController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new StriderNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -174,7 +170,6 @@ public class StriderController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -185,7 +180,6 @@ public class StriderController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -207,7 +201,6 @@ public class StriderController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -219,7 +212,6 @@ public class StriderController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/TadpoleController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/TadpoleController.java
index 936106c1b..c264963d9 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/TadpoleController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/TadpoleController.java
@@ -66,7 +66,6 @@ public class TadpoleController extends MobEntityController {
                 this.oldMoveController = this.moveControl;
                 this.moveControl = new MoveControl(this);
             }
-
         }
 
         @Override
@@ -75,12 +74,10 @@ public class TadpoleController extends MobEntityController {
             if (npc != null) {
                 this.verticalCollision = false;
             }
-
             super.aiStep();
             if (npc != null) {
                 this.verticalCollision = lastInWater;
             }
-
         }
 
         @Override
@@ -102,7 +99,6 @@ public class TadpoleController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -110,7 +106,6 @@ public class TadpoleController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -120,18 +115,14 @@ public class TadpoleController extends MobEntityController {
                 if (npc.useMinecraftAI() && this.moveControl != this.oldMoveController) {
                     this.moveControl = this.oldMoveController;
                 }
-
                 if (!npc.useMinecraftAI() && this.moveControl == this.oldMoveController) {
                     this.moveControl = new EntityMoveControl(this);
                 }
-
             }
-
             super.customServerAiStep();
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -144,7 +135,6 @@ public class TadpoleController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new TadpoleNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -224,7 +214,6 @@ public class TadpoleController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -235,7 +224,6 @@ public class TadpoleController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -256,11 +244,9 @@ public class TadpoleController extends MobEntityController {
                 if (!NMSImpl.moveFish(npc, this, vec3d)) {
                     super.travel(vec3d);
                 }
-
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -272,7 +258,6 @@ public class TadpoleController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/TraderLlamaController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/TraderLlamaController.java
index 0b7b5cc59..c9fc3d327 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/TraderLlamaController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/TraderLlamaController.java
@@ -65,7 +65,6 @@ public class TraderLlamaController extends MobEntityController {
                 ((org.bukkit.entity.TraderLlama) getBukkitEntity())
                         .setDomestication(((org.bukkit.entity.TraderLlama) getBukkitEntity()).getMaxDomestication());
             }
-
         }
 
         @Override
@@ -87,7 +86,6 @@ public class TraderLlamaController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -95,7 +93,6 @@ public class TraderLlamaController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -107,12 +104,10 @@ public class TraderLlamaController extends MobEntityController {
                 if (npc.useMinecraftAI()) {
                     super.customServerAiStep();
                 }
-
                 setDespawnDelay(10);
                 NMS.setStepHeight(getBukkitEntity(), 1);
                 npc.update();
             }
-
         }
 
         @Override
@@ -125,7 +120,6 @@ public class TraderLlamaController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new TraderLlamaNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -195,7 +189,6 @@ public class TraderLlamaController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -205,7 +198,6 @@ public class TraderLlamaController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -216,7 +208,6 @@ public class TraderLlamaController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -238,7 +229,6 @@ public class TraderLlamaController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -250,7 +240,6 @@ public class TraderLlamaController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/TropicalFishController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/TropicalFishController.java
index 32f023204..d4ea0e9f6 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/TropicalFishController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/TropicalFishController.java
@@ -65,7 +65,6 @@ public class TropicalFishController extends MobEntityController {
                 this.oldMoveController = this.moveControl;
                 this.moveControl = new MoveControl(this);
             }
-
         }
 
         @Override
@@ -74,12 +73,10 @@ public class TropicalFishController extends MobEntityController {
             if (npc != null) {
                 this.verticalCollision = false;
             }
-
             super.aiStep();
             if (npc != null) {
                 this.verticalCollision = lastInWater;
             }
-
         }
 
         @Override
@@ -101,7 +98,6 @@ public class TropicalFishController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -109,7 +105,6 @@ public class TropicalFishController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -118,23 +113,18 @@ public class TropicalFishController extends MobEntityController {
                 if (!npc.useMinecraftAI()) {
                     NMSImpl.setNotInSchool(this);
                 }
-
                 NMSImpl.updateMinecraftAIState(npc, this);
                 if (npc.useMinecraftAI() && this.moveControl != this.oldMoveController) {
                     this.moveControl = this.oldMoveController;
                 }
-
                 if (!npc.useMinecraftAI() && this.moveControl == this.oldMoveController) {
                     this.moveControl = new EntityMoveControl(this);
                 }
-
             }
-
             super.customServerAiStep();
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -147,7 +137,6 @@ public class TropicalFishController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new TropicalFishNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -227,7 +216,6 @@ public class TropicalFishController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -238,7 +226,6 @@ public class TropicalFishController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -259,11 +246,9 @@ public class TropicalFishController extends MobEntityController {
                 if (!NMSImpl.moveFish(npc, this, vec3d)) {
                     super.travel(vec3d);
                 }
-
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -275,7 +260,6 @@ public class TropicalFishController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/TurtleController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/TurtleController.java
index bfcdc3777..7e1bf2c93 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/TurtleController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/TurtleController.java
@@ -66,7 +66,6 @@ public class TurtleController extends MobEntityController {
                 this.moveControl = new MoveControl(this);
                 this.jumpControl = new EmptyControllerJump(this);
             }
-
         }
 
         @Override
@@ -88,7 +87,6 @@ public class TurtleController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -96,7 +94,6 @@ public class TurtleController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -108,15 +105,12 @@ public class TurtleController extends MobEntityController {
                     this.moveControl = this.oldMoveController;
                     this.jumpControl = this.oldJumpController;
                 }
-
                 if (!npc.useMinecraftAI() && this.moveControl == this.oldMoveController) {
                     this.moveControl = new EntityMoveControl(this);
                     this.jumpControl = new EmptyControllerJump(this);
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
@@ -129,7 +123,6 @@ public class TurtleController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new TurtleNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -199,7 +192,6 @@ public class TurtleController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -210,7 +202,6 @@ public class TurtleController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -231,11 +222,9 @@ public class TurtleController extends MobEntityController {
                 if (!NMSImpl.moveFish(npc, this, vec3d)) {
                     super.travel(vec3d);
                 }
-
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -247,7 +236,6 @@ public class TurtleController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
 
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/VexController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/VexController.java
index 758adb4e5..3a56b602d 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/VexController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/VexController.java
@@ -53,7 +53,6 @@ public class VexController extends MobEntityController {
             if (npc != null) {
                 setNoGravity(true);
             }
-
         }
 
         @Override
@@ -68,7 +67,6 @@ public class VexController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -78,7 +76,6 @@ public class VexController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -91,7 +88,6 @@ public class VexController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new VexNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -153,7 +149,6 @@ public class VexController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -164,7 +159,6 @@ public class VexController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -188,7 +182,6 @@ public class VexController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/VillagerController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/VillagerController.java
index 6128c8ab1..f72869dd8 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/VillagerController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/VillagerController.java
@@ -64,7 +64,6 @@ public class VillagerController extends MobEntityController {
             if (npc != null) {
                 getAttribute(Attributes.MOVEMENT_SPEED).setBaseValue(0.3);
             }
-
         }
 
         @Override
@@ -86,7 +85,6 @@ public class VillagerController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -94,7 +92,6 @@ public class VillagerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -102,16 +99,13 @@ public class VillagerController extends MobEntityController {
             if (npc != null) {
                 NMSImpl.updateMinecraftAIState(npc, this);
             }
-
             super.customServerAiStep();
             if (npc != null) {
                 npc.update();
                 if (npc.data().get(NPC.Metadata.RESET_PITCH_ON_TICK, true)) {
                     NMS.setPitch(getBukkitEntity(), 0);
                 }
-
             }
-
         }
 
         @Override
@@ -124,7 +118,6 @@ public class VillagerController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new VillagerNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -175,7 +168,6 @@ public class VillagerController extends MobEntityController {
                 blockingATrade = false;
                 return true;
             }
-
             return super.isTrading();
         }
 
@@ -198,9 +190,7 @@ public class VillagerController extends MobEntityController {
                 if (list != null) {
                     list.clear();
                 }
-
             }
-
             return super.mobInteract(entityhuman, enumhand);
         }
 
@@ -218,7 +208,6 @@ public class VillagerController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -228,7 +217,6 @@ public class VillagerController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -239,7 +227,6 @@ public class VillagerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -259,7 +246,6 @@ public class VillagerController extends MobEntityController {
             if (npc == null) {
                 super.thunderHit(worldserver, entitylightning);
             }
-
         }
 
         @Override
@@ -269,7 +255,6 @@ public class VillagerController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -281,7 +266,6 @@ public class VillagerController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/VindicatorController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/VindicatorController.java
index 9df6de5f8..dfc4c6aa3 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/VindicatorController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/VindicatorController.java
@@ -74,7 +74,6 @@ public class VindicatorController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -82,7 +81,6 @@ public class VindicatorController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -92,7 +90,6 @@ public class VindicatorController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -105,7 +102,6 @@ public class VindicatorController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new VindicatorNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -175,7 +171,6 @@ public class VindicatorController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -185,7 +180,6 @@ public class VindicatorController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -196,7 +190,6 @@ public class VindicatorController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -218,7 +211,6 @@ public class VindicatorController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -230,7 +222,6 @@ public class VindicatorController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/WanderingTraderController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/WanderingTraderController.java
index cf3bb1c21..64a275fd2 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/WanderingTraderController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/WanderingTraderController.java
@@ -83,7 +83,6 @@ public class WanderingTraderController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -91,7 +90,6 @@ public class WanderingTraderController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -99,13 +97,11 @@ public class WanderingTraderController extends MobEntityController {
             if (npc != null) {
                 NMSImpl.updateMinecraftAIState(npc, this);
             }
-
             super.customServerAiStep();
             if (npc != null) {
                 setDespawnDelay(10);
                 npc.update();
             }
-
         }
 
         @Override
@@ -118,7 +114,6 @@ public class WanderingTraderController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new WanderingTraderNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -173,7 +168,6 @@ public class WanderingTraderController extends MobEntityController {
                 blockingATrade = false;
                 return true;
             }
-
             return super.isTrading();
         }
 
@@ -196,9 +190,7 @@ public class WanderingTraderController extends MobEntityController {
                 if (list != null) {
                     list.clear();
                 }
-
             }
-
             return super.mobInteract(entityhuman, enumhand);
         }
 
@@ -216,7 +208,6 @@ public class WanderingTraderController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -226,7 +217,6 @@ public class WanderingTraderController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -237,7 +227,6 @@ public class WanderingTraderController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -261,7 +250,6 @@ public class WanderingTraderController extends MobEntityController {
             if (npc == null) {
                 super.thunderHit(worldserver, entitylightning);
             }
-
         }
 
         @Override
@@ -271,7 +259,6 @@ public class WanderingTraderController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -283,7 +270,6 @@ public class WanderingTraderController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/WardenController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/WardenController.java
index 65b341934..815a4747f 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/WardenController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/WardenController.java
@@ -76,7 +76,6 @@ public class WardenController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -84,7 +83,6 @@ public class WardenController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -93,13 +91,11 @@ public class WardenController extends MobEntityController {
                 super.customServerAiStep();
                 return;
             }
-
             NMSImpl.updateMinecraftAIState(npc, this);
             npc.update();
             if (npc.useMinecraftAI()) {
                 super.customServerAiStep();
             }
-
         }
 
         @Override
@@ -112,7 +108,6 @@ public class WardenController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new WardenNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -182,7 +177,6 @@ public class WardenController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -193,7 +187,6 @@ public class WardenController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -215,7 +208,6 @@ public class WardenController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -227,7 +219,6 @@ public class WardenController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/WitchController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/WitchController.java
index 124bd6968..6cd459873 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/WitchController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/WitchController.java
@@ -73,7 +73,6 @@ public class WitchController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -81,7 +80,6 @@ public class WitchController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -91,7 +89,6 @@ public class WitchController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -104,7 +101,6 @@ public class WitchController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new WitchNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -174,7 +170,6 @@ public class WitchController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -185,7 +180,6 @@ public class WitchController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -195,7 +189,6 @@ public class WitchController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -217,7 +210,6 @@ public class WitchController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -229,7 +221,6 @@ public class WitchController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/WitherController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/WitherController.java
index ec742398e..f61826fc0 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/WitherController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/WitherController.java
@@ -64,7 +64,6 @@ public class WitherController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -76,10 +75,8 @@ public class WitherController extends MobEntityController {
                 if (npc.useMinecraftAI()) {
                     super.customServerAiStep();
                 }
-
                 npc.update();
             }
-
         }
 
         @Override
@@ -97,7 +94,6 @@ public class WitherController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new WitherNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -165,7 +161,6 @@ public class WitherController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -176,7 +171,6 @@ public class WitherController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -200,7 +194,6 @@ public class WitherController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/WolfController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/WolfController.java
index eb92a426a..59020304d 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/WolfController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/WolfController.java
@@ -76,7 +76,6 @@ public class WolfController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -84,7 +83,6 @@ public class WolfController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -94,7 +92,6 @@ public class WolfController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -107,7 +104,6 @@ public class WolfController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new WolfNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -177,7 +173,6 @@ public class WolfController extends MobEntityController {
                 super.onSyncedDataUpdated(datawatcherobject);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, datawatcherobject, super::onSyncedDataUpdated);
         }
 
@@ -187,7 +182,6 @@ public class WolfController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -198,7 +192,6 @@ public class WolfController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -225,7 +218,6 @@ public class WolfController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -237,7 +229,6 @@ public class WolfController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/ZoglinController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/ZoglinController.java
index c3fbdc6b9..c2af35171 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/ZoglinController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/ZoglinController.java
@@ -73,7 +73,6 @@ public class ZoglinController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -81,7 +80,6 @@ public class ZoglinController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -89,12 +87,10 @@ public class ZoglinController extends MobEntityController {
             if (npc != null) {
                 NMSImpl.updateMinecraftAIState(npc, this);
             }
-
             super.customServerAiStep();
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -107,7 +103,6 @@ public class ZoglinController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ZoglinNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -177,7 +172,6 @@ public class ZoglinController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -188,7 +182,6 @@ public class ZoglinController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -210,7 +203,6 @@ public class ZoglinController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -222,7 +214,6 @@ public class ZoglinController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/ZombieController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/ZombieController.java
index 2eb173095..376446056 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/ZombieController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/ZombieController.java
@@ -73,7 +73,6 @@ public class ZombieController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -81,7 +80,6 @@ public class ZombieController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -91,7 +89,6 @@ public class ZombieController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -104,7 +101,6 @@ public class ZombieController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ZombieNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -174,7 +170,6 @@ public class ZombieController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -185,7 +180,6 @@ public class ZombieController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -207,7 +201,6 @@ public class ZombieController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -219,7 +212,6 @@ public class ZombieController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/ZombieHuskController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/ZombieHuskController.java
index 72fc11511..aabd03e9c 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/ZombieHuskController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/ZombieHuskController.java
@@ -73,7 +73,6 @@ public class ZombieHuskController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -81,7 +80,6 @@ public class ZombieHuskController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -91,7 +89,6 @@ public class ZombieHuskController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -104,7 +101,6 @@ public class ZombieHuskController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ZombieHuskNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -174,7 +170,6 @@ public class ZombieHuskController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -185,7 +180,6 @@ public class ZombieHuskController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -207,7 +201,6 @@ public class ZombieHuskController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -219,7 +212,6 @@ public class ZombieHuskController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/ZombieVillagerController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/ZombieVillagerController.java
index 930592b03..9726402c3 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/ZombieVillagerController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/ZombieVillagerController.java
@@ -73,7 +73,6 @@ public class ZombieVillagerController extends MobEntityController {
             if (npc == null) {
                 super.checkDespawn();
             }
-
         }
 
         @Override
@@ -81,7 +80,6 @@ public class ZombieVillagerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.checkFallDamage(d0, flag, iblockdata, blockposition);
             }
-
         }
 
         @Override
@@ -91,7 +89,6 @@ public class ZombieVillagerController extends MobEntityController {
                 NMSImpl.updateMinecraftAIState(npc, this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -104,7 +101,6 @@ public class ZombieVillagerController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ZombieVillagerNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -174,7 +170,6 @@ public class ZombieVillagerController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -185,7 +180,6 @@ public class ZombieVillagerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -207,7 +201,6 @@ public class ZombieVillagerController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, vec3d);
             }
-
         }
 
         @Override
@@ -219,7 +212,6 @@ public class ZombieVillagerController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/AreaEffectCloudController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/AreaEffectCloudController.java
index ed788c71b..a5e896327 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/AreaEffectCloudController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/AreaEffectCloudController.java
@@ -59,7 +59,6 @@ public class AreaEffectCloudController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new AreaEffectCloudNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -90,7 +89,6 @@ public class AreaEffectCloudController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -101,7 +99,6 @@ public class AreaEffectCloudController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -123,7 +120,6 @@ public class AreaEffectCloudController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -135,7 +131,6 @@ public class AreaEffectCloudController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/BlockDisplayController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/BlockDisplayController.java
index 2df72df1c..f271d6d11 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/BlockDisplayController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/BlockDisplayController.java
@@ -41,7 +41,6 @@ public class BlockDisplayController extends MobEntityController {
             ((org.bukkit.entity.BlockDisplay) handle.getBukkitEntity())
                     .setBlock(npc.getItemProvider().get().getType().createBlockData());
         }
-
         return handle.getBukkitEntity();
     }
 
@@ -73,7 +72,6 @@ public class BlockDisplayController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new BlockDisplayNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -104,7 +102,6 @@ public class BlockDisplayController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -115,7 +112,6 @@ public class BlockDisplayController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -137,7 +133,6 @@ public class BlockDisplayController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -149,7 +144,6 @@ public class BlockDisplayController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/BoatController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/BoatController.java
index 5d4ad8177..b60e261be 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/BoatController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/BoatController.java
@@ -72,7 +72,6 @@ public class BoatController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new BoatNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -92,7 +91,6 @@ public class BoatController extends MobEntityController {
                 this.aC = getBoundingBox().maxY;
                 return entityboat_Status;
             }
-
             if (t())
                 return Status.IN_WATER;
             float f = getGroundFriction();
@@ -100,7 +98,6 @@ public class BoatController extends MobEntityController {
                 this.aD = f;
                 return Status.ON_LAND;
             }
-
             return Status.IN_AIR;
         }
 
@@ -121,7 +118,6 @@ public class BoatController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -132,7 +128,6 @@ public class BoatController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -142,7 +137,6 @@ public class BoatController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -172,13 +166,9 @@ public class BoatController extends MobEntityController {
                             this.aC = Math.max(f, this.aC);
                             m = flag | (axisalignedbb.minY < f ? true : false);
                         }
-
                     }
-
                 }
-
             }
-
             return m;
         }
 
@@ -220,9 +210,7 @@ public class BoatController extends MobEntityController {
                         if (getControllingPassenger() instanceof ServerPlayer) {
                             this.aD /= 2.0F;
                         }
-
                     }
-
                     Vec3 vec3d = getDeltaMovement();
                     setDeltaMovement(vec3d.x * this.ap, vec3d.y + d1, vec3d.z * this.ap);
                     this.ar *= this.ap;
@@ -230,18 +218,14 @@ public class BoatController extends MobEntityController {
                         Vec3 vec3d1 = getDeltaMovement();
                         setDeltaMovement(vec3d1.x, vec3d1.y + d2 * 0.0615D, vec3d1.z);
                     }
-
                 }
-
                 move(MoverType.SELF, getDeltaMovement());
                 if (isVehicle()) {
                     setYRot((float) (getYRot() + this.ar));
                 }
-
             } else {
                 super.tick();
             }
-
         }
 
         private Status u() {
@@ -266,13 +250,9 @@ public class BoatController extends MobEntityController {
                                 return Status.UNDER_FLOWING_WATER;
                             flag = true;
                         }
-
                     }
-
                 }
-
             }
-
             return flag ? Status.UNDER_WATER : null;
         }
 
@@ -285,7 +265,6 @@ public class BoatController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/ChestBoatController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/ChestBoatController.java
index a67caea57..1fe2c735c 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/ChestBoatController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/ChestBoatController.java
@@ -73,7 +73,6 @@ public class ChestBoatController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ChestBoatNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -93,7 +92,6 @@ public class ChestBoatController extends MobEntityController {
                 this.aC = getBoundingBox().maxY;
                 return entityboat_Status;
             }
-
             if (t())
                 return Status.IN_WATER;
             float f = getGroundFriction();
@@ -101,7 +99,6 @@ public class ChestBoatController extends MobEntityController {
                 this.aD = f;
                 return Status.ON_LAND;
             }
-
             return Status.IN_AIR;
         }
 
@@ -122,7 +119,6 @@ public class ChestBoatController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -133,7 +129,6 @@ public class ChestBoatController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -143,7 +138,6 @@ public class ChestBoatController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -173,13 +167,9 @@ public class ChestBoatController extends MobEntityController {
                             this.aC = Math.max(f, this.aC);
                             m = flag | (axisalignedbb.minY < f ? true : false);
                         }
-
                     }
-
                 }
-
             }
-
             return m;
         }
 
@@ -221,9 +211,7 @@ public class ChestBoatController extends MobEntityController {
                         if (getControllingPassenger() instanceof ServerPlayer) {
                             this.aD /= 2.0F;
                         }
-
                     }
-
                     Vec3 vec3d = getDeltaMovement();
                     setDeltaMovement(vec3d.x * this.ap, vec3d.y + d1, vec3d.z * this.ap);
                     this.ar *= this.ap;
@@ -231,18 +219,14 @@ public class ChestBoatController extends MobEntityController {
                         Vec3 vec3d1 = getDeltaMovement();
                         setDeltaMovement(vec3d1.x, vec3d1.y + d2 * 0.0615D, vec3d1.z);
                     }
-
                 }
-
                 move(MoverType.SELF, getDeltaMovement());
                 if (isVehicle()) {
                     setYRot((float) (getYRot() + this.ar));
                 }
-
             } else {
                 super.tick();
             }
-
         }
 
         private Status u() {
@@ -267,13 +251,9 @@ public class ChestBoatController extends MobEntityController {
                                 return Status.UNDER_FLOWING_WATER;
                             flag = true;
                         }
-
                     }
-
                 }
-
             }
-
             return flag ? Status.UNDER_WATER : null;
         }
 
@@ -286,7 +266,6 @@ public class ChestBoatController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/DragonFireballController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/DragonFireballController.java
index f9bcf0cf9..bd4eba6e4 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/DragonFireballController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/DragonFireballController.java
@@ -59,7 +59,6 @@ public class DragonFireballController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new DragonFireballNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -90,7 +89,6 @@ public class DragonFireballController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -101,7 +99,6 @@ public class DragonFireballController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -111,7 +108,6 @@ public class DragonFireballController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -133,11 +129,9 @@ public class DragonFireballController extends MobEntityController {
                 if (!npc.isProtected()) {
                     super.tick();
                 }
-
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -149,7 +143,6 @@ public class DragonFireballController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/EggController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/EggController.java
index b0b0d6852..5fab87da0 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/EggController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/EggController.java
@@ -73,7 +73,6 @@ public class EggController extends AbstractEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new EggNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -104,7 +103,6 @@ public class EggController extends AbstractEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -115,7 +113,6 @@ public class EggController extends AbstractEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -137,11 +134,9 @@ public class EggController extends AbstractEntityController {
                 if (!npc.isProtected()) {
                     super.tick();
                 }
-
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -153,7 +148,6 @@ public class EggController extends AbstractEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/EnderCrystalController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/EnderCrystalController.java
index e4fc7a30e..732a430c9 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/EnderCrystalController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/EnderCrystalController.java
@@ -59,7 +59,6 @@ public class EnderCrystalController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new EnderCrystalNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -90,7 +89,6 @@ public class EnderCrystalController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -101,7 +99,6 @@ public class EnderCrystalController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -123,7 +120,6 @@ public class EnderCrystalController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -135,7 +131,6 @@ public class EnderCrystalController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/EnderPearlController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/EnderPearlController.java
index 498085446..7d4bf385f 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/EnderPearlController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/EnderPearlController.java
@@ -60,7 +60,6 @@ public class EnderPearlController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new EnderPearlNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -91,7 +90,6 @@ public class EnderPearlController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -102,7 +100,6 @@ public class EnderPearlController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -124,11 +121,9 @@ public class EnderPearlController extends MobEntityController {
                 if (!npc.isProtected()) {
                     super.tick();
                 }
-
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -140,7 +135,6 @@ public class EnderPearlController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/EnderSignalController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/EnderSignalController.java
index 4262b76de..c46119e0d 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/EnderSignalController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/EnderSignalController.java
@@ -60,7 +60,6 @@ public class EnderSignalController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new EnderSignalNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -91,7 +90,6 @@ public class EnderSignalController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -102,7 +100,6 @@ public class EnderSignalController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -124,7 +121,6 @@ public class EnderSignalController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -136,7 +132,6 @@ public class EnderSignalController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/EvokerFangsController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/EvokerFangsController.java
index 0d37f55e6..490561a2e 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/EvokerFangsController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/EvokerFangsController.java
@@ -57,7 +57,6 @@ public class EvokerFangsController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new EvokerFangsNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -98,7 +97,6 @@ public class EvokerFangsController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -109,7 +107,6 @@ public class EvokerFangsController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -130,7 +127,6 @@ public class EvokerFangsController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -142,7 +138,6 @@ public class EvokerFangsController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/ExperienceOrbController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/ExperienceOrbController.java
index 78d0c24cd..e24a26b84 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/ExperienceOrbController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/ExperienceOrbController.java
@@ -53,7 +53,6 @@ public class ExperienceOrbController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ExperienceOrbNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -84,7 +83,6 @@ public class ExperienceOrbController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -95,7 +93,6 @@ public class ExperienceOrbController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -117,7 +114,6 @@ public class ExperienceOrbController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -129,7 +125,6 @@ public class ExperienceOrbController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/FallingBlockController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/FallingBlockController.java
index 89f67bc6f..4384d36c1 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/FallingBlockController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/FallingBlockController.java
@@ -69,7 +69,6 @@ public class FallingBlockController extends AbstractEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new FallingBlockNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -100,7 +99,6 @@ public class FallingBlockController extends AbstractEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -111,7 +109,6 @@ public class FallingBlockController extends AbstractEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -121,7 +118,6 @@ public class FallingBlockController extends AbstractEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -146,11 +142,9 @@ public class FallingBlockController extends AbstractEntityController {
                     setDeltaMovement(mot);
                     move(MoverType.SELF, mot);
                 }
-
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -162,7 +156,6 @@ public class FallingBlockController extends AbstractEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
 
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/FireworkController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/FireworkController.java
index 5062cb9d2..61326b671 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/FireworkController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/FireworkController.java
@@ -54,7 +54,6 @@ public class FireworkController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new FireworkNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -85,7 +84,6 @@ public class FireworkController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -96,7 +94,6 @@ public class FireworkController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -118,7 +115,6 @@ public class FireworkController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -130,7 +126,6 @@ public class FireworkController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/FishingHookController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/FishingHookController.java
index 389994b09..1118d9b68 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/FishingHookController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/FishingHookController.java
@@ -86,7 +86,6 @@ public class FishingHookController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new FishingHookNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -117,7 +116,6 @@ public class FishingHookController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -128,7 +126,6 @@ public class FishingHookController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -152,7 +149,6 @@ public class FishingHookController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -164,7 +160,6 @@ public class FishingHookController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/GlowItemFrameController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/GlowItemFrameController.java
index defeeee73..2354f7fc7 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/GlowItemFrameController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/GlowItemFrameController.java
@@ -65,7 +65,6 @@ public class GlowItemFrameController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new GlowItemFrameNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -96,7 +95,6 @@ public class GlowItemFrameController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -107,7 +105,6 @@ public class GlowItemFrameController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -134,7 +131,6 @@ public class GlowItemFrameController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -146,7 +142,6 @@ public class GlowItemFrameController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/InteractionController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/InteractionController.java
index e089b4748..0f5c6ff77 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/InteractionController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/InteractionController.java
@@ -53,7 +53,6 @@ public class InteractionController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new InteractionNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -84,7 +83,6 @@ public class InteractionController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -95,7 +93,6 @@ public class InteractionController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -117,7 +114,6 @@ public class InteractionController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -129,7 +125,6 @@ public class InteractionController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/ItemController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/ItemController.java
index 181c3e831..6975021a2 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/ItemController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/ItemController.java
@@ -66,7 +66,6 @@ public class ItemController extends AbstractEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ItemNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -96,7 +95,6 @@ public class ItemController extends AbstractEntityController {
             if (npc == null) {
                 super.playerTouch(entityhuman);
             }
-
         }
 
         @Override
@@ -105,7 +103,6 @@ public class ItemController extends AbstractEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -116,7 +113,6 @@ public class ItemController extends AbstractEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -138,7 +134,6 @@ public class ItemController extends AbstractEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -150,7 +145,6 @@ public class ItemController extends AbstractEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/ItemDisplayController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/ItemDisplayController.java
index 985fa2762..ee0281f94 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/ItemDisplayController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/ItemDisplayController.java
@@ -41,7 +41,6 @@ public class ItemDisplayController extends MobEntityController {
         if (npc != null) {
             handle.setItemStack(CraftItemStack.asNMSCopy(npc.getItemProvider().get()));
         }
-
         return handle.getBukkitEntity();
     }
 
@@ -67,7 +66,6 @@ public class ItemDisplayController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ItemDisplayNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -98,7 +96,6 @@ public class ItemDisplayController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -109,7 +106,6 @@ public class ItemDisplayController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -130,7 +126,6 @@ public class ItemDisplayController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -142,7 +137,6 @@ public class ItemDisplayController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/ItemFrameController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/ItemFrameController.java
index 4f06213c3..447d5051b 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/ItemFrameController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/ItemFrameController.java
@@ -64,7 +64,6 @@ public class ItemFrameController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ItemFrameNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -95,7 +94,6 @@ public class ItemFrameController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -106,7 +104,6 @@ public class ItemFrameController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -133,7 +130,6 @@ public class ItemFrameController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -145,7 +141,6 @@ public class ItemFrameController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/LargeFireballController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/LargeFireballController.java
index 8db37c99d..02afab167 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/LargeFireballController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/LargeFireballController.java
@@ -53,7 +53,6 @@ public class LargeFireballController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new LargeFireballNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -84,7 +83,6 @@ public class LargeFireballController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -95,7 +93,6 @@ public class LargeFireballController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -105,7 +102,6 @@ public class LargeFireballController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, firstTick);
             }
-
         }
 
         @Override
@@ -127,11 +123,9 @@ public class LargeFireballController extends MobEntityController {
                 if (!npc.isProtected()) {
                     super.tick();
                 }
-
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -143,7 +137,6 @@ public class LargeFireballController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/LeashController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/LeashController.java
index 008263c79..01f3d38c5 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/LeashController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/LeashController.java
@@ -54,7 +54,6 @@ public class LeashController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new LeashNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -85,7 +84,6 @@ public class LeashController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -96,7 +94,6 @@ public class LeashController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -123,7 +120,6 @@ public class LeashController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -135,7 +131,6 @@ public class LeashController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/LlamaSpitController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/LlamaSpitController.java
index a05b71581..2966ff8cc 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/LlamaSpitController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/LlamaSpitController.java
@@ -70,7 +70,6 @@ public class LlamaSpitController extends AbstractEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new LlamaSpitNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -101,7 +100,6 @@ public class LlamaSpitController extends AbstractEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -112,7 +110,6 @@ public class LlamaSpitController extends AbstractEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -134,11 +131,9 @@ public class LlamaSpitController extends AbstractEntityController {
                 if (!npc.isProtected()) {
                     super.tick();
                 }
-
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -150,7 +145,6 @@ public class LlamaSpitController extends AbstractEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/MarkerController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/MarkerController.java
index 680978e3d..85a3af3e2 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/MarkerController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/MarkerController.java
@@ -53,7 +53,6 @@ public class MarkerController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new MarkerNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -84,7 +83,6 @@ public class MarkerController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -95,7 +93,6 @@ public class MarkerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -117,7 +114,6 @@ public class MarkerController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -129,7 +125,6 @@ public class MarkerController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/MinecartChestController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/MinecartChestController.java
index b5793f8dc..d6d4aa757 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/MinecartChestController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/MinecartChestController.java
@@ -54,7 +54,6 @@ public class MinecartChestController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new MinecartChestNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -85,7 +84,6 @@ public class MinecartChestController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -96,7 +94,6 @@ public class MinecartChestController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -118,7 +115,6 @@ public class MinecartChestController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
 
         @Override
@@ -130,7 +126,6 @@ public class MinecartChestController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/MinecartCommandController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/MinecartCommandController.java
index 7ce5e7ab4..2f6ff03a0 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/MinecartCommandController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/MinecartCommandController.java
@@ -54,7 +54,6 @@ public class MinecartCommandController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new MinecartCommandNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -85,7 +84,6 @@ public class MinecartCommandController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -96,7 +94,6 @@ public class MinecartCommandController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -118,7 +115,6 @@ public class MinecartCommandController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
 
         @Override
@@ -130,7 +126,6 @@ public class MinecartCommandController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/MinecartFurnaceController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/MinecartFurnaceController.java
index f08ea5041..e826e41c6 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/MinecartFurnaceController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/MinecartFurnaceController.java
@@ -54,7 +54,6 @@ public class MinecartFurnaceController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new MinecartFurnaceNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -85,7 +84,6 @@ public class MinecartFurnaceController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -96,7 +94,6 @@ public class MinecartFurnaceController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -118,7 +115,6 @@ public class MinecartFurnaceController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
 
         @Override
@@ -130,7 +126,6 @@ public class MinecartFurnaceController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/MinecartHopperController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/MinecartHopperController.java
index 2721b5019..9ea6fcf94 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/MinecartHopperController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/MinecartHopperController.java
@@ -71,7 +71,6 @@ public class MinecartHopperController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -82,7 +81,6 @@ public class MinecartHopperController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -104,7 +102,6 @@ public class MinecartHopperController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
 
         @Override
@@ -116,7 +113,6 @@ public class MinecartHopperController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/MinecartRideableController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/MinecartRideableController.java
index 2403c266b..669abee7e 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/MinecartRideableController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/MinecartRideableController.java
@@ -53,7 +53,6 @@ public class MinecartRideableController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new MinecartRideableNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -84,7 +83,6 @@ public class MinecartRideableController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -95,7 +93,6 @@ public class MinecartRideableController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -117,7 +114,6 @@ public class MinecartRideableController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
 
         @Override
@@ -129,7 +125,6 @@ public class MinecartRideableController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/MinecartSpawnerController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/MinecartSpawnerController.java
index 4b98b1a30..110bf0f0b 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/MinecartSpawnerController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/MinecartSpawnerController.java
@@ -71,7 +71,6 @@ public class MinecartSpawnerController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -82,7 +81,6 @@ public class MinecartSpawnerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -104,7 +102,6 @@ public class MinecartSpawnerController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
 
         @Override
@@ -116,7 +113,6 @@ public class MinecartSpawnerController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/MinecartTNTController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/MinecartTNTController.java
index 3e090ead8..c3a0ba5d6 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/MinecartTNTController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/MinecartTNTController.java
@@ -71,7 +71,6 @@ public class MinecartTNTController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -82,7 +81,6 @@ public class MinecartTNTController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -104,7 +102,6 @@ public class MinecartTNTController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
 
         @Override
@@ -116,7 +113,6 @@ public class MinecartTNTController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/PaintingController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/PaintingController.java
index 1ea73e9f1..b91dadb10 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/PaintingController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/PaintingController.java
@@ -53,7 +53,6 @@ public class PaintingController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new PaintingNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -84,7 +83,6 @@ public class PaintingController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -95,7 +93,6 @@ public class PaintingController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -122,7 +119,6 @@ public class PaintingController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -134,7 +130,6 @@ public class PaintingController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/ShulkerBulletController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/ShulkerBulletController.java
index 86b0c39ef..ac1277909 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/ShulkerBulletController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/ShulkerBulletController.java
@@ -53,7 +53,6 @@ public class ShulkerBulletController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ShulkerBulletNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -84,7 +83,6 @@ public class ShulkerBulletController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -95,7 +93,6 @@ public class ShulkerBulletController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -117,7 +114,6 @@ public class ShulkerBulletController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -129,7 +125,6 @@ public class ShulkerBulletController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/SmallFireballController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/SmallFireballController.java
index 2ec54c21e..e52a9b5bd 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/SmallFireballController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/SmallFireballController.java
@@ -53,7 +53,6 @@ public class SmallFireballController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SmallFireballNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -84,7 +83,6 @@ public class SmallFireballController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -95,7 +93,6 @@ public class SmallFireballController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -117,11 +114,9 @@ public class SmallFireballController extends MobEntityController {
                 if (!npc.isProtected()) {
                     super.tick();
                 }
-
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -133,7 +128,6 @@ public class SmallFireballController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/SnowballController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/SnowballController.java
index cc4322331..e9b3b9074 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/SnowballController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/SnowballController.java
@@ -53,7 +53,6 @@ public class SnowballController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SnowballNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -84,7 +83,6 @@ public class SnowballController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -95,7 +93,6 @@ public class SnowballController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -117,7 +114,6 @@ public class SnowballController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -129,7 +125,6 @@ public class SnowballController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/SpectralArrowController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/SpectralArrowController.java
index ae0ebdb2a..8ae96aee2 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/SpectralArrowController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/SpectralArrowController.java
@@ -54,7 +54,6 @@ public class SpectralArrowController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new SpectralArrowNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -85,7 +84,6 @@ public class SpectralArrowController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -96,7 +94,6 @@ public class SpectralArrowController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -118,7 +115,6 @@ public class SpectralArrowController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -130,7 +126,6 @@ public class SpectralArrowController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/TNTPrimedController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/TNTPrimedController.java
index 538cbf9b7..cb65179d9 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/TNTPrimedController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/TNTPrimedController.java
@@ -54,7 +54,6 @@ public class TNTPrimedController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new TNTPrimedNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -85,7 +84,6 @@ public class TNTPrimedController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -96,7 +94,6 @@ public class TNTPrimedController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -118,7 +115,6 @@ public class TNTPrimedController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -130,7 +126,6 @@ public class TNTPrimedController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/TextDisplayController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/TextDisplayController.java
index 8a0466602..8294c3cc4 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/TextDisplayController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/TextDisplayController.java
@@ -53,7 +53,6 @@ public class TextDisplayController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new TextDisplayNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -84,7 +83,6 @@ public class TextDisplayController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -95,7 +93,6 @@ public class TextDisplayController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -116,7 +113,6 @@ public class TextDisplayController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -128,7 +124,6 @@ public class TextDisplayController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/ThrownExpBottleController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/ThrownExpBottleController.java
index f99a3f5aa..b495316c3 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/ThrownExpBottleController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/ThrownExpBottleController.java
@@ -54,7 +54,6 @@ public class ThrownExpBottleController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ThrownExpBottleNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -85,7 +84,6 @@ public class ThrownExpBottleController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -96,7 +94,6 @@ public class ThrownExpBottleController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -118,11 +115,9 @@ public class ThrownExpBottleController extends MobEntityController {
                 if (!npc.isProtected()) {
                     super.tick();
                 }
-
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -134,7 +129,6 @@ public class ThrownExpBottleController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/ThrownPotionController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/ThrownPotionController.java
index 94c1771d2..b158b2925 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/ThrownPotionController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/ThrownPotionController.java
@@ -57,9 +57,7 @@ public class ThrownPotionController extends MobEntityController {
                 } else {
                     NMSImpl.setBukkitEntity(this, new SplashThrownPotionNPC(this));
                 }
-
             }
-
             return super.getBukkitEntity();
         }
 
@@ -90,7 +88,6 @@ public class ThrownPotionController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -101,7 +98,6 @@ public class ThrownPotionController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -123,7 +119,6 @@ public class ThrownPotionController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -135,7 +130,6 @@ public class ThrownPotionController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/ThrownTridentController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/ThrownTridentController.java
index 74e590c63..6e6490188 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/ThrownTridentController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/ThrownTridentController.java
@@ -54,7 +54,6 @@ public class ThrownTridentController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new ThrownTridentNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -85,7 +84,6 @@ public class ThrownTridentController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -96,7 +94,6 @@ public class ThrownTridentController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -118,7 +115,6 @@ public class ThrownTridentController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -130,7 +126,6 @@ public class ThrownTridentController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/TippedArrowController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/TippedArrowController.java
index 10c466afa..bd7b1584c 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/TippedArrowController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/TippedArrowController.java
@@ -53,7 +53,6 @@ public class TippedArrowController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new TippedArrowNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -84,7 +83,6 @@ public class TippedArrowController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -95,7 +93,6 @@ public class TippedArrowController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -117,7 +114,6 @@ public class TippedArrowController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -129,7 +125,6 @@ public class TippedArrowController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/WitherSkullController.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/WitherSkullController.java
index f5d210e45..4a66739cf 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/WitherSkullController.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/entity/nonliving/WitherSkullController.java
@@ -53,7 +53,6 @@ public class WitherSkullController extends MobEntityController {
             if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
                 NMSImpl.setBukkitEntity(this, new WitherSkullNPC(this));
             }
-
             return super.getBukkitEntity();
         }
 
@@ -84,7 +83,6 @@ public class WitherSkullController extends MobEntityController {
             if (vector != null) {
                 super.push(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -95,7 +93,6 @@ public class WitherSkullController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -117,7 +114,6 @@ public class WitherSkullController extends MobEntityController {
             } else {
                 super.tick();
             }
-
         }
 
         @Override
@@ -129,7 +125,6 @@ public class WitherSkullController extends MobEntityController {
             if (!npc.isPushableByFluids()) {
                 setDeltaMovement(old);
             }
-
             return res;
         }
     }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/network/EmptyConnection.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/network/EmptyConnection.java
index f07e076dd..78bb29791 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/network/EmptyConnection.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/network/EmptyConnection.java
@@ -49,6 +49,5 @@ public class EmptyConnection extends Connection {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 }
\ No newline at end of file
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/util/CitizensBlockBreaker.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/util/CitizensBlockBreaker.java
index c22cd9e21..1c514c058 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/util/CitizensBlockBreaker.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/util/CitizensBlockBreaker.java
@@ -47,7 +47,6 @@ public class CitizensBlockBreaker extends AbstractBlockBreaker {
             ItemStack current = getCurrentItem();
             return current != null ? current.isCorrectToolForDrops(block) : false;
         }
-
     }
 
     @Override
@@ -66,13 +65,10 @@ public class CitizensBlockBreaker extends AbstractBlockBreaker {
                 if (i > 0) {
                     f += i * i + 1;
                 }
-
             }
-
             if (MobEffectUtil.hasDigSpeed(handle)) {
                 f *= 1.0F + (MobEffectUtil.getDigSpeedAmplification(handle) + 1) * 0.2F;
             }
-
             if (handle.hasEffect(MobEffects.DIG_SLOWDOWN)) {
                 float f1 = 1.0F;
                 switch (handle.getEffect(MobEffects.DIG_SLOWDOWN).getAmplifier()) {
@@ -89,20 +85,15 @@ public class CitizensBlockBreaker extends AbstractBlockBreaker {
                     default:
                         f1 = 8.1E-4F;
                 }
-
                 f *= f1;
             }
-
             if (handle.isEyeInFluid(FluidTags.WATER) && !EnchantmentHelper.hasAquaAffinity(handle)) {
                 f /= 5.0F;
             }
-
         }
-
         if (!entity.isOnGround()) {
             f /= 5.0F;
         }
-
         return f;
     }
 }
\ No newline at end of file
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/util/CitizensEntityTracker.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/util/CitizensEntityTracker.java
index 05fdb8661..945a179f3 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/util/CitizensEntityTracker.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/util/CitizensEntityTracker.java
@@ -37,7 +37,6 @@ public class CitizensEntityTracker extends ChunkMap.TrackedEntity {
                         Bukkit.getPluginManager().callEvent(new NPCLinkToPlayerEvent(((NPCHolder) tracker).getNPC(),
                                 conn.getPlayer().getBukkitEntity()));
                     }
-
                     return res;
                 }
 
@@ -49,7 +48,6 @@ public class CitizensEntityTracker extends ChunkMap.TrackedEntity {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     public CitizensEntityTracker(ChunkMap map, TrackedEntity entry) {
@@ -66,7 +64,6 @@ public class CitizensEntityTracker extends ChunkMap.TrackedEntity {
             if (REQUIRES_SYNC == null) {
                 REQUIRES_SYNC = !Bukkit.isPrimaryThread();
             }
-
             boolean cancelled = Util.callPossiblySync(() -> {
                 NPCSeenByPlayerEvent event = new NPCSeenByPlayerEvent(npc, entityplayer.getBukkitEntity());
                 try {
@@ -75,7 +72,6 @@ public class CitizensEntityTracker extends ChunkMap.TrackedEntity {
                     REQUIRES_SYNC = true;
                     throw e;
                 }
-
                 if (event.isCancelled())
                     return true;
 
@@ -88,16 +84,13 @@ public class CitizensEntityTracker extends ChunkMap.TrackedEntity {
                     } catch (Throwable e) {
                         e.printStackTrace();
                     }
-
                 }
-
                 return false;
             }, REQUIRES_SYNC);
 
             if (cancelled)
                 return;
         }
-
         super.updatePlayer(entityplayer);
     }
 
@@ -107,7 +100,6 @@ public class CitizensEntityTracker extends ChunkMap.TrackedEntity {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         return false;
     }
 
@@ -117,7 +109,6 @@ public class CitizensEntityTracker extends ChunkMap.TrackedEntity {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         return null;
     }
 
@@ -127,7 +118,6 @@ public class CitizensEntityTracker extends ChunkMap.TrackedEntity {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         return 0;
     }
 
@@ -137,7 +127,6 @@ public class CitizensEntityTracker extends ChunkMap.TrackedEntity {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         return 0;
     }
 
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/util/EmptyAdvancementDataPlayer.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/util/EmptyAdvancementDataPlayer.java
index e68a1e44e..7d4ae98b3 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/util/EmptyAdvancementDataPlayer.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/util/EmptyAdvancementDataPlayer.java
@@ -71,11 +71,9 @@ public class EmptyAdvancementDataPlayer extends PlayerAdvancements {
             for (MethodHandle handle : SETS) {
                 ((Set<?>) handle.invoke(data)).clear();
             }
-
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     private static final MethodHandle PROGRESS = NMS.getFirstGetter(PlayerAdvancements.class, Map.class);
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/util/EntityMoveControl.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/util/EntityMoveControl.java
index bc3115724..cf40622a8 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/util/EntityMoveControl.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/util/EntityMoveControl.java
@@ -60,18 +60,15 @@ public class EntityMoveControl extends MoveControl {
         if (f3 > f2) {
             f3 = f2;
         }
-
         if (f3 < -f2) {
             f3 = -f2;
         }
-
         float f4 = f + f3;
         if (f4 < 0.0F) {
             f4 += 360.0F;
         } else if (f4 > 360.0F) {
             f4 -= 360.0F;
         }
-
         return f4;
     }
 
@@ -104,7 +101,6 @@ public class EntityMoveControl extends MoveControl {
             this.entity.setYRot(rotlerp(this.entity.getYRot(), f, 90.0F));
             NMS.setHeadYaw(entity.getBukkitEntity(), this.entity.getYRot());
         }
-
         float movement = (float) (this.speedMod * this.entity.getAttribute(Attributes.MOVEMENT_SPEED).getValue());
         this.entity.setSpeed(movement);
         this.entity.zza = movement;
@@ -113,15 +109,12 @@ public class EntityMoveControl extends MoveControl {
             if (((Slime) entity).isAggressive()) {
                 this.jumpTicks /= 3;
             }
-
             ((Slime) entity).getJumpControl().jump();
         } else if (dY >= NMS.getStepHeight(entity.getBukkitEntity()) && dXZ < 0.4D) {
             if (entity instanceof Mob) {
                 ((Mob) entity).getJumpControl().jump();
             }
-
             entity.setJumping(true);
         }
-
     }
 }
\ No newline at end of file
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/util/EntityNavigation.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/util/EntityNavigation.java
index 43ae8fb33..1ea4a5466 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/util/EntityNavigation.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/util/EntityNavigation.java
@@ -147,27 +147,22 @@ public class EntityNavigation extends PathNavigation {
             for (var2 = var0.below(); var2.getY() > this.level.getMinBuildHeight()
                     && this.level.getBlockState(var2).isAir(); var2 = var2.below()) {
             }
-
             if (var2.getY() > this.level.getMinBuildHeight())
                 return supercreatePath(var2.above(), var1);
 
             while (var2.getY() < this.level.getMaxBuildHeight() && this.level.getBlockState(var2).isAir()) {
                 var2 = var2.above();
             }
-
             var0 = var2;
         }
-
         if (!this.level.getBlockState(var0).isSolid())
             return supercreatePath(var0, var1);
         else {
             for (var2 = var0.above(); var2.getY() < this.level.getMaxBuildHeight()
                     && this.level.getBlockState(var2).isSolid(); var2 = var2.above()) {
             }
-
             return supercreatePath(var2, var1);
         }
-
     }
 
     @Override
@@ -207,7 +202,6 @@ public class EntityNavigation extends PathNavigation {
             this.reachRange = reachRange;
             this.resetStuckTimeout();
         }
-
         return var8;
     }
 
@@ -230,11 +224,9 @@ public class EntityNavigation extends PathNavigation {
             } else {
                 this.isStuck = false;
             }
-
             this.lastStuckCheck = this.tick;
             this.lastStuckCheckPos = var0;
         }
-
         if (this.path != null && !this.path.isDone()) {
             BlockPos blockPos = this.path.getNextNodePos();
             if (blockPos.equals(this.timeoutCachedNode)) {
@@ -244,14 +236,11 @@ public class EntityNavigation extends PathNavigation {
                 double var2 = var0.distanceTo(Vec3.atBottomCenterOf(this.timeoutCachedNode));
                 this.timeoutLimit = this.mob.getSpeed() > 0.0F ? var2 / this.mob.getSpeed() * 1000.0D : 0.0D;
             }
-
             if (this.timeoutLimit > 0.0D && this.timeoutTimer > this.timeoutLimit * 3.0D) {
                 timeoutPath();
             }
-
             this.lastTimeoutCheck = System.currentTimeMillis();
         }
-
     }
 
     @Override
@@ -267,7 +256,6 @@ public class EntityNavigation extends PathNavigation {
         if (var8 || canCutCorner(this.path.getNextNode().type) && shouldTargetNextNodeInDirection(var0)) {
             this.path.advance();
         }
-
         doStuckDetection(var0);
     }
 
@@ -304,11 +292,9 @@ public class EntityNavigation extends PathNavigation {
                 var1 = this.level.getBlockState(BlockPos.containing(this.mob.getX(), var0, this.mob.getZ()));
                 ++var2;
             } while (var2 <= 16);
-
             return this.mob.getBlockY();
         } else
             return Mth.floor(this.mob.getY() + 0.5);
-
     }
 
     @Override
@@ -366,11 +352,9 @@ public class EntityNavigation extends PathNavigation {
             this.path = null;
             return false;
         }
-
         if (!var0.sameAs(this.path)) {
             this.path = var0;
         }
-
         if (isDone())
             return false;
         trimPath();
@@ -392,11 +376,9 @@ public class EntityNavigation extends PathNavigation {
                 this.timeLastRecompute = this.level.getGameTime();
                 this.hasDelayedRecomputation = false;
             }
-
         } else {
             this.hasDelayedRecomputation = true;
         }
-
     }
 
     @Override
@@ -453,7 +435,6 @@ public class EntityNavigation extends PathNavigation {
                     (var1.z + this.mob.getZ()) / 2.0D);
             return var0.closerToCenterThan(var2, this.path.getNodeCount() - this.path.getNextNodeIndex());
         }
-
     }
 
     private boolean shouldTargetNextNodeInDirection(Vec3 var0) {
@@ -489,11 +470,8 @@ public class EntityNavigation extends PathNavigation {
                 if (var2 != null && var1.y >= var2.y) {
                     this.path.replaceNode(var0 + 1, var1.cloneAndMove(var2.x, var1.y + 1, var2.z));
                 }
-
             }
-
         }
-
     }
 
     @Override
@@ -502,7 +480,6 @@ public class EntityNavigation extends PathNavigation {
         if (this.hasDelayedRecomputation) {
             recomputePath();
         }
-
         if (isDone())
             return;
         if (canUpdatePath()) {
@@ -514,9 +491,7 @@ public class EntityNavigation extends PathNavigation {
                     && Mth.floor(vec31.z) == Mth.floor(vec32.z)) {
                 this.path.advance();
             }
-
         }
-
         if (isDone())
             return;
         Vec3 var0 = this.path.getNextEntityPos(this.mob);
@@ -541,10 +516,7 @@ public class EntityNavigation extends PathNavigation {
                     this.path.truncateNodes(var0);
                     return;
                 }
-
             }
-
         }
-
     }
 }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/util/EntityNodeEvaluator.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/util/EntityNodeEvaluator.java
index 1690d123f..12f8864fb 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/util/EntityNodeEvaluator.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/util/EntityNodeEvaluator.java
@@ -52,7 +52,6 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
             if (this.hasCollisions(var1))
                 return false;
         }
-
         return true;
     }
 
@@ -74,16 +73,13 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
         if (var2 == BlockPathTypes.DOOR_WOOD_CLOSED && this.canOpenDoors() && var3) {
             var2 = BlockPathTypes.WALKABLE_DOOR;
         }
-
         if (var2 == BlockPathTypes.DOOR_OPEN && !var3) {
             var2 = BlockPathTypes.BLOCKED;
         }
-
         if (var2 == BlockPathTypes.RAIL && !(var0.getBlockState(var1).getBlock() instanceof BaseRailBlock)
                 && !(var0.getBlockState(var1.below()).getBlock() instanceof BaseRailBlock)) {
             var2 = BlockPathTypes.UNPASSABLE_RAIL;
         }
-
         return var2;
     }
 
@@ -101,12 +97,10 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
             if (var13 >= 0.0F) {
                 var8 = this.getNodeAndUpdateCostToMax(var0, var1, var2, var12, var13);
             }
-
             if (doesBlockHavePartialCollision(var7) && var8 != null && var8.costMalus >= 0.0F
                     && !this.canReachWithoutCollision(var8)) {
                 var8 = null;
             }
-
             if (var12 == BlockPathTypes.WALKABLE || this.isAmphibious() && var12 == BlockPathTypes.WATER) {
                 if ((var8 == null || var8.costMalus < 0.0F) && var3 > 0
                         && (var12 != BlockPathTypes.FENCE || this.canWalkOverFences())
@@ -127,11 +121,8 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
                         if (this.hasCollisions(var20)) {
                             var8 = null;
                         }
-
                     }
-
                 }
-
                 if (!this.isAmphibious() && var12 == BlockPathTypes.WATER && !this.canFloat()) {
                     if (this.getCachedBlockType(this.mob, var0, var1 - 1, var2) != BlockPathTypes.WATER)
                         return var8;
@@ -145,9 +136,7 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
                         var8 = this.getNodeAndUpdateCostToMax(var0, var1, var2, var12,
                                 this.mvmt.getPathfindingMalus(var12));
                     }
-
                 }
-
                 if (var12 == BlockPathTypes.OPEN) {
                     int var16 = 0;
                     int var17 = var1;
@@ -166,25 +155,19 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
                             var8 = this.getNodeAndUpdateCostToMax(var0, var1, var2, var12, var13);
                             break;
                         }
-
                         if (var13 < 0.0F)
                             return this.getBlockedNode(var0, var1, var2);
                     }
-
                 }
-
                 if (doesBlockHavePartialCollision(var12) && var8 == null) {
                     var8 = this.getNode(var0, var1, var2);
                     var8.closed = true;
                     var8.type = var12;
                     var8.costMalus = var12.getMalus();
                 }
-
             }
-
             return var8;
         }
-
     }
 
     private Node getBlockedNode(int var0, int var1, int var2) {
@@ -219,9 +202,7 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
                 if (mvmt.getPathfindingMalus(varr9) >= mvmt.getPathfindingMalus(var7)) {
                     var7 = varr9;
                 }
-
             }
-
             if (var6 == BlockPathTypes.OPEN && mvmt.getPathfindingMalus(var7) == 0.0F && this.entityWidth <= 1)
                 return BlockPathTypes.OPEN;
             else
@@ -250,9 +231,7 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
                 if (mvmt.getPathfindingMalus(varr9) >= mvmt.getPathfindingMalus(var7)) {
                     var7 = varr9;
                 }
-
             }
-
             if (var6 == BlockPathTypes.OPEN && mvmt.getPathfindingMalus(var7) == 0.0F && this.entityWidth <= 1)
                 return BlockPathTypes.OPEN;
             else
@@ -277,14 +256,10 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
                     if (var7 == 0 && var8 == 0 && var9 == 0) {
                         var5 = var13;
                     }
-
                     var4.add(var13);
                 }
-
             }
-
         }
-
         return var5;
     }
 
@@ -317,48 +292,39 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
         if (this.mvmt.getPathfindingMalus(var4) >= 0.0F && var5 != BlockPathTypes.STICKY_HONEY) {
             var3 = Mth.floor(Math.max(1.0F, this.mob.maxUpStep()));
         }
-
         double var6 = this.getFloorLevel(new BlockPos(var1.x, var1.y, var1.z));
         Node var8 = this.findAcceptedNode(var1.x, var1.y, var1.z + 1, var3, var6, Direction.SOUTH, var5);
         if (this.isNeighborValid(var8, var1)) {
             var0[var2++] = var8;
         }
-
         Node var9 = this.findAcceptedNode(var1.x - 1, var1.y, var1.z, var3, var6, Direction.WEST, var5);
         if (this.isNeighborValid(var9, var1)) {
             var0[var2++] = var9;
         }
-
         Node var10 = this.findAcceptedNode(var1.x + 1, var1.y, var1.z, var3, var6, Direction.EAST, var5);
         if (this.isNeighborValid(var10, var1)) {
             var0[var2++] = var10;
         }
-
         Node var11 = this.findAcceptedNode(var1.x, var1.y, var1.z - 1, var3, var6, Direction.NORTH, var5);
         if (this.isNeighborValid(var11, var1)) {
             var0[var2++] = var11;
         }
-
         Node var12 = this.findAcceptedNode(var1.x - 1, var1.y, var1.z - 1, var3, var6, Direction.NORTH, var5);
         if (this.isDiagonalValid(var1, var9, var11, var12)) {
             var0[var2++] = var12;
         }
-
         Node var13 = this.findAcceptedNode(var1.x + 1, var1.y, var1.z - 1, var3, var6, Direction.NORTH, var5);
         if (this.isDiagonalValid(var1, var10, var11, var13)) {
             var0[var2++] = var13;
         }
-
         Node var14 = this.findAcceptedNode(var1.x - 1, var1.y, var1.z + 1, var3, var6, Direction.SOUTH, var5);
         if (this.isDiagonalValid(var1, var9, var8, var14)) {
             var0[var2++] = var14;
         }
-
         Node var15 = this.findAcceptedNode(var1.x + 1, var1.y, var1.z + 1, var3, var6, Direction.SOUTH, var5);
         if (this.isDiagonalValid(var1, var10, var8, var15)) {
             var0[var2++] = var15;
         }
-
         return var2;
     }
 
@@ -382,11 +348,9 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
                         --var0;
                         break;
                     }
-
                     ++var0;
                     var2 = this.level.getBlockState(var1.set(this.mob.getX(), var0, this.mob.getZ()));
                 }
-
             } else if (this.mob.onGround()) {
                 var0 = Mth.floor(this.mob.getY() + 0.5);
             } else {
@@ -394,23 +358,18 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
                         || this.level.getBlockState(var3).isPathfindable(this.level, var3, PathComputationType.LAND))
                         && var3.getY() > this.mob.level().getMinBuildHeight(); var3 = var3.below()) {
                 }
-
                 var0 = var3.above().getY();
             }
-
         } else {
             while (true) {
                 if (!this.mob.canStandOnFluid(var2.getFluidState())) {
                     --var0;
                     break;
                 }
-
                 ++var0;
                 var2 = this.level.getBlockState(var1.set(this.mob.getX(), var0, this.mob.getZ()));
             }
-
         }
-
         var3 = this.mob.blockPosition();
         if (!this.canStartAt(var1.set(var3.getX(), var0, var3.getZ()))) {
             AABB var4 = this.mob.getBoundingBox();
@@ -420,7 +379,6 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
                     || this.canStartAt(var1.set(var4.maxX, var0, var4.maxZ)))
                 return this.getStartNode(var1);
         }
-
         return this.getStartNode(new BlockPos(var3.getX(), var0, var3.getZ()));
     }
 
@@ -451,7 +409,6 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
                         && (var1.y < var0.y || var1.costMalus >= 0.0F || var4);
             } else
                 return false;
-
         } else
             return false;
     }
@@ -496,13 +453,9 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
                         if (var9.is(Blocks.WITHER_ROSE) || var9.is(Blocks.POINTED_DRIPSTONE))
                             return BlockPathTypes.DAMAGE_CAUTIOUS;
                     }
-
                 }
-
             }
-
         }
-
         return var2;
     }
 
@@ -568,29 +521,22 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
             if (var6 == BlockPathTypes.DAMAGE_FIRE) {
                 var5 = BlockPathTypes.DAMAGE_FIRE;
             }
-
             if (var6 == BlockPathTypes.DAMAGE_OTHER) {
                 var5 = BlockPathTypes.DAMAGE_OTHER;
             }
-
             if (var6 == BlockPathTypes.STICKY_HONEY) {
                 var5 = BlockPathTypes.STICKY_HONEY;
             }
-
             if (var6 == BlockPathTypes.POWDER_SNOW) {
                 var5 = BlockPathTypes.DANGER_POWDER_SNOW;
             }
-
             if (var6 == BlockPathTypes.DAMAGE_CAUTIOUS) {
                 var5 = BlockPathTypes.DAMAGE_CAUTIOUS;
             }
-
         }
-
         if (var5 == BlockPathTypes.WALKABLE) {
             var5 = checkNeighbourBlocks(var0, var1.set(var2, var3, var4), var5);
         }
-
         return var5;
     }
 
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/util/EntityPathfinder.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/util/EntityPathfinder.java
index bc9e52e66..0f3266323 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/util/EntityPathfinder.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/util/EntityPathfinder.java
@@ -81,7 +81,6 @@ public class EntityPathfinder extends PathFinder {
             if (var8 >= maxVisitedNodesScaled) {
                 break;
             }
-
             Node var11 = this.openSet.pop();
             var11.closed = true;
             Iterator var13i = var6.iterator();
@@ -92,13 +91,10 @@ public class EntityPathfinder extends PathFinder {
                     var13.setReached();
                     var9.add(var13);
                 }
-
             }
-
             if (!var9.isEmpty()) {
                 break;
             }
-
             if ((var11.distanceTo(var1) < range)) {
                 int var12 = this.nodeEvaluator.getNeighbors(this.neighbors, var11);
 
@@ -117,15 +113,10 @@ public class EntityPathfinder extends PathFinder {
                             var14.h += var14.f;
                             this.openSet.insert(var14);
                         }
-
                     }
-
                 }
-
             }
-
         }
-
         Optional<Path> var11 = !var9.isEmpty()
                 ? var9.stream().map(var1x -> this.reconstructPath(var1x.getBestNode(), var2.get(var1x), true)).min(
                         Comparator.comparingInt(Path::getNodeCount))
@@ -139,7 +130,6 @@ public class EntityPathfinder extends PathFinder {
             Path var12 = var11.get();
             return var12;
         }
-
     }
 
     private float getBestH(Node var0, Set<Target> var1) {
@@ -149,7 +139,6 @@ public class EntityPathfinder extends PathFinder {
             var4.updateBest(var5, var0);
             var2 = Math.min(var5, var2);
         }
-
         return var2;
     }
 
@@ -169,7 +158,6 @@ public class EntityPathfinder extends PathFinder {
             var4 = var4.cameFrom;
             var3.add(0, var4);
         }
-
         return new Path(var3, var1, var2);
     }
 }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/util/ForwardingNPCHolder.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/util/ForwardingNPCHolder.java
index 4b8911143..08fbd13cf 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/util/ForwardingNPCHolder.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/util/ForwardingNPCHolder.java
@@ -17,7 +17,6 @@ public interface ForwardingNPCHolder extends NPCHolder, Entity {
                     () -> Joiner.on(' ').join("ForwardingNPCHolder with an improper bukkit entity", this, handle));
             return null;
         }
-
         return ((NPCHolder) handle).getNPC();
     }
 }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/util/MobAI.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/util/MobAI.java
index c4acfe6dd..4ade482cc 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/util/MobAI.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/util/MobAI.java
@@ -41,7 +41,6 @@ public interface MobAI {
         if (!nav.isDone()) {
             nav.tick();
         }
-
     }
 
     default void updatePathfindingRange(float range) {
@@ -171,7 +170,6 @@ public interface MobAI {
             };
         } else if (handle instanceof MobAI)
             return (MobAI) handle;
-
         return null;
     }
 }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/util/NMSImpl.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/util/NMSImpl.java
index 42d434204..b927f060d 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/util/NMSImpl.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/util/NMSImpl.java
@@ -380,21 +380,17 @@ public class NMSImpl implements NMSBridge {
                 viewDistance = (int) PLAYER_CHUNK_MAP_VIEW_DISTANCE_GETTER.invoke(chunkMap);
                 PLAYER_CHUNK_MAP_VIEW_DISTANCE_SETTER.invoke(chunkMap, -1);
             }
-
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         boolean success = getHandle(entity).level().addFreshEntity(getHandle(entity), custom);
         try {
             if (chunkMap != null) {
                 PLAYER_CHUNK_MAP_VIEW_DISTANCE_SETTER.invoke(chunkMap, viewDistance);
             }
-
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         return success;
     }
 
@@ -410,14 +406,12 @@ public class NMSImpl implements NMSBridge {
         } else if (!handle.level().players().contains(handle)) {
             ((List) handle.level().players()).add(handle);
         }
-
         try {
             CHUNKMAP_UPDATE_PLAYER_STATUS.invoke(((ServerLevel) handle.level()).getChunkSource().chunkMap, handle,
                     !remove);
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         // PlayerUpdateTask.addOrRemove(entity, remove);
     }
 
@@ -430,13 +424,11 @@ public class NMSImpl implements NMSBridge {
             PlayerAnimation.ARM_SWING.play((Player) source.getBukkitEntity());
             return;
         }
-
         boolean hasAttackDamage = source.getAttributes().hasAttribute(Attributes.ATTACK_DAMAGE);
         if (source instanceof Mob && hasAttackDamage) {
             ((Mob) source).doHurtTarget(target);
             return;
         }
-
         float f = (float) (hasAttackDamage ? source.getAttributeValue(Attributes.ATTACK_DAMAGE) : 1f);
         int i = 0;
         f += EnchantmentHelper.getDamageBonus(source.getMainHandItem(), target.getMobType());
@@ -449,12 +441,10 @@ public class NMSImpl implements NMSBridge {
                     Math.cos(source.getYRot() * Math.PI / 180.0F) * i * 0.5F);
             source.setDeltaMovement(source.getDeltaMovement().multiply(0.6, 1, 0.6));
         }
-
         int fireAspectLevel = EnchantmentHelper.getFireAspect(source);
         if (fireAspectLevel > 0) {
             target.setSecondsOnFire(fireAspectLevel * 4, false);
         }
-
         if (target instanceof ServerPlayer) {
             ServerPlayer entityhuman = (ServerPlayer) target;
             ItemStack itemstack = source.getMainHandItem();
@@ -466,11 +456,8 @@ public class NMSImpl implements NMSBridge {
                     entityhuman.getCooldowns().addCooldown(Items.SHIELD, 100);
                     source.level().broadcastEntityEvent(entityhuman, (byte) 30);
                 }
-
             }
-
         }
-
         EnchantmentHelper.doPostHurtEffects(source, target);
         EnchantmentHelper.doPostDamageEffects(target, source);
     }
@@ -488,9 +475,7 @@ public class NMSImpl implements NMSBridge {
             } catch (Throwable t) {
                 t.printStackTrace();
             }
-
         }
-
     }
 
     @Override
@@ -527,21 +512,16 @@ public class NMSImpl implements NMSBridge {
                         if (!changed && entity.equipmentHasChanged(old, curr)) {
                             changed = true;
                         }
-
                         equipment.put(slot, curr);
                     }
-
                     if (changed) {
                         List<com.mojang.datafixers.util.Pair<EquipmentSlot, ItemStack>> vals = Lists.newArrayList();
                         for (EquipmentSlot slot : EquipmentSlot.values()) {
                             vals.add(com.mojang.datafixers.util.Pair.of(slot, equipment.get(slot)));
                         }
-
                         agg.send(new ClientboundSetEquipmentPacket(handle.getId(), vals));
                     }
-
                 }
-
                 tracker.sendChanges();
             }
 
@@ -562,9 +542,7 @@ public class NMSImpl implements NMSBridge {
                     if (callback != null) {
                         callback.accept(entity);
                     }
-
                 }
-
                 linked.clear();
             }
         };
@@ -599,13 +577,10 @@ public class NMSImpl implements NMSBridge {
                 if (df != null) {
                     bserver = df.dragonEvent;
                 }
-
             }
-
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         if (bserver == null)
             return null;
         BossBar ret = Bukkit.createBossBar("", BarColor.BLUE, BarStyle.SEGMENTED_10);
@@ -614,7 +589,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         return ret;
     }
 
@@ -725,14 +699,12 @@ public class NMSImpl implements NMSBridge {
             if (SKULL_META_PROFILE == null)
                 return null;
         }
-
         try {
             return (GameProfile) SKULL_META_PROFILE.invoke(meta);
         } catch (Throwable e) {
             e.printStackTrace();
             return null;
         }
-
     }
 
     @Override
@@ -745,7 +717,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             throw new CommandException(Messages.INVALID_SOUND);
         }
-
     }
 
     @Override
@@ -761,7 +732,6 @@ public class NMSImpl implements NMSBridge {
         LivingEntity handle = getHandle((org.bukkit.entity.LivingEntity) npc.getEntity());
         if (handle == null) {
         }
-
         return DEFAULT_SPEED;
         // return (float)
         // handle.getAttribute(Attributes.d).getValue();
@@ -805,9 +775,7 @@ public class NMSImpl implements NMSBridge {
             } else {
                 ((Mob) raw).setPathfindingMalus(BlockPathTypes.WATER, oldWater + 1F);
             }
-
         }
-
         navigation.getNodeEvaluator().setCanOpenDoors(params.hasExaminer(DoorExaminer.class));
         return new MCNavigator() {
             float lastSpeed;
@@ -819,7 +787,6 @@ public class NMSImpl implements NMSBridge {
                     Node pp = path.getNode(i);
                     blocks.add(entity.getWorld().getBlockAt(pp.x, pp.y, pp.z));
                 }
-
                 return blocks;
             }
 
@@ -840,16 +807,13 @@ public class NMSImpl implements NMSBridge {
                     List<org.bukkit.block.Block> blocks = getBlocks(entity, path);
                     Util.sendBlockChanges(blocks, null);
                 }
-
                 if (oldWater >= 0) {
                     if (raw instanceof MobAI) {
                         ((MobAI) raw).setPathfindingMalus(BlockPathTypes.WATER, oldWater);
                     } else {
                         ((Mob) raw).setPathfindingMalus(BlockPathTypes.WATER, oldWater);
                     }
-
                 }
-
                 navigation.stop();
             }
 
@@ -864,15 +828,12 @@ public class NMSImpl implements NMSBridge {
                             SIZE_FIELD_SETTER.invoke(handle,
                                     new EntityDimensions(Math.min(0.99F, size.width), size.height, false));
                         }
-
                     } catch (Throwable e) {
                         e.printStackTrace();
                     }
-
                     if (!function.apply(navigation)) {
                         reason = CancelReason.STUCK;
                     }
-
                     try {
                         SIZE_FIELD_SETTER.invoke(handle, size);
                     } catch (Throwable e) {
@@ -880,14 +841,11 @@ public class NMSImpl implements NMSBridge {
                         // minecraft requires that an entity fit onto both blocks if width >= 1f, but we'd prefer to
                         // make it just fit on 1 so hack around it a bit.
                     }
-
                     if (params.debug() && getPathEntity(navigation) != null) {
                         Util.sendBlockChanges(getBlocks(entity, getPathEntity(navigation)), Material.DANDELION);
                     }
-
                     lastSpeed = params.speed();
                 }
-
                 navigation.setSpeedModifier(params.speed());
                 return navigation.isDone();
             }
@@ -1147,37 +1105,30 @@ public class NMSImpl implements NMSBridge {
             if (zDiff < 0.0) {
                 yaw += Math.abs(180 - yaw) * 2;
             }
-
             if (handle.getBukkitEntity().getType() == EntityType.ENDER_DRAGON) {
                 yaw = Util.getDragonYaw(handle.getBukkitEntity(), xDiff, zDiff);
             } else {
                 yaw = yaw - 90;
             }
-
             if (headOnly) {
                 setHeadYaw(entity, (float) yaw);
             } else {
                 look(entity, (float) yaw, (float) pitch);
             }
-
             return;
         }
-
         if (handle instanceof Mob) {
             ((Mob) handle).getLookControl().setLookAt(to.getX(), to.getY(), to.getZ(), ((Mob) handle).getHeadRotSpeed(),
                     ((Mob) handle).getMaxHeadXRot());
             while (((LivingEntity) handle).yHeadRot >= 180F) {
                 ((LivingEntity) handle).yHeadRot -= 360F;
             }
-
             while (((LivingEntity) handle).yHeadRot < -180F) {
                 ((LivingEntity) handle).yHeadRot += 360F;
             }
-
         } else if (handle instanceof NPCHolder) {
             ((NPCHolder) handle).getNPC().getOrAddTrait(RotationTrait.class).getPhysicalSession().rotateToFace(to);
         }
-
     }
 
     @Override
@@ -1190,22 +1141,18 @@ public class NMSImpl implements NMSBridge {
             } else {
                 look(from, to.getLocation(), false, true);
             }
-
         } else if (handle instanceof Mob) {
             ((Mob) handle).getLookControl().setLookAt(target, ((Mob) handle).getHeadRotSpeed(),
                     ((Mob) handle).getMaxHeadXRot());
             while (((LivingEntity) handle).yHeadRot >= 180F) {
                 ((LivingEntity) handle).yHeadRot -= 360F;
             }
-
             while (((LivingEntity) handle).yHeadRot < -180F) {
                 ((LivingEntity) handle).yHeadRot += 360F;
             }
-
         } else if (handle instanceof NPCHolder) {
             ((NPCHolder) handle).getNPC().getOrAddTrait(RotationTrait.class).getPhysicalSession().rotateToFace(to);
         }
-
     }
 
     @Override
@@ -1226,12 +1173,10 @@ public class NMSImpl implements NMSBridge {
             if (npcInfo == null) {
                 continue;
             }
-
             MirrorTrait trait = mirrorTraits.apply(npcInfo.profileId());
             if (trait == null || !trait.isMirroring(player)) {
                 continue;
             }
-
             if (Setting.DISABLE_TABLIST.asBoolean() != npcInfo.listed()) {
                 list.set(i,
                         new ClientboundPlayerInfoUpdatePacket.Entry(npcInfo.profileId(), npcInfo.profile(),
@@ -1240,11 +1185,9 @@ public class NMSImpl implements NMSBridge {
                                 npcInfo.chatSession()));
                 changed = true;
             }
-
             if (playerProfile == null) {
                 playerProfile = NMS.getProfile(player);
             }
-
             if (trait.mirrorName()) {
                 list.set(i,
                         new ClientboundPlayerInfoUpdatePacket.Entry(npcInfo.profileId(), playerProfile,
@@ -1253,29 +1196,23 @@ public class NMSImpl implements NMSBridge {
                 changed = true;
                 continue;
             }
-
             Collection<Property> textures = playerProfile.getProperties().get("textures");
             if (textures == null || textures.size() == 0) {
                 continue;
             }
-
             npcInfo.profile().getProperties().clear();
             for (String key : playerProfile.getProperties().keySet()) {
                 npcInfo.profile().getProperties().putAll(key, playerProfile.getProperties().get(key));
             }
-
             changed = true;
         }
-
         if (changed) {
             try {
                 PLAYER_INFO_ENTRIES_LIST.invoke(packet, list);
             } catch (Throwable e) {
                 e.printStackTrace();
             }
-
         }
-
     }
 
     @Override
@@ -1303,7 +1240,6 @@ public class NMSImpl implements NMSBridge {
                                     this, anvil),
                             this);
                 }
-
                 return this.bukkitEntity;
             }
         };
@@ -1351,13 +1287,11 @@ public class NMSImpl implements NMSBridge {
             if (key == null || type == null) {
                 continue;
             }
-
             CITIZENS_ENTITY_TYPES.put(clazz, type);
             int code = ENTITY_REGISTRY.getId(type);
             ENTITY_REGISTRY.put(code, key, type);
             return;
         }
-
         throw new IllegalArgumentException("unable to find valid entity superclass for class " + clazz.toString());
     }
 
@@ -1395,7 +1329,6 @@ public class NMSImpl implements NMSBridge {
             hook.hookedIn = null;
             hook.getBukkitEntity().remove();
         }
-
     }
 
     @Override
@@ -1435,7 +1368,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         sendPacket(recipient, packet);
         return true;
     }
@@ -1450,7 +1382,6 @@ public class NMSImpl implements NMSBridge {
             entities[i] = (ServerPlayer) skinnable;
             i++;
         }
-
         sendPacket(recipient, new ClientboundPlayerInfoRemovePacket(
                 skinnableNPCs.stream().map(e -> ((ServerPlayer) e).getUUID()).collect(Collectors.toList())));
     }
@@ -1469,7 +1400,6 @@ public class NMSImpl implements NMSBridge {
         if (TEAM_FIELD == null) {
             TEAM_FIELD = NMS.getGetter(team.getClass(), "team");
         }
-
         try {
             PlayerTeam nmsTeam = (PlayerTeam) TEAM_FIELD.invoke(team);
             if (mode == 1) {
@@ -1477,11 +1407,9 @@ public class NMSImpl implements NMSBridge {
             } else {
                 sendPacket(recipient, ClientboundSetPlayerTeamPacket.createAddOrModifyPacket(nmsTeam, mode == 0));
             }
-
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     @Override
@@ -1530,7 +1458,6 @@ public class NMSImpl implements NMSBridge {
                 }
                 return;
         }
-
     }
 
     @Override
@@ -1542,7 +1469,6 @@ public class NMSImpl implements NMSBridge {
         } else {
             getHandle(entity).setCustomName((Component) component);
         }
-
     }
 
     @Override
@@ -1554,7 +1480,6 @@ public class NMSImpl implements NMSBridge {
         if (ai != null) {
             ai.getMoveControl().setWantedPosition(x, y, z, speed);
         }
-
     }
 
     @Override
@@ -1579,7 +1504,6 @@ public class NMSImpl implements NMSBridge {
         if (!(handle instanceof net.minecraft.world.entity.player.Player)) {
             handle.setYBodyRot(yaw);
         }
-
         handle.setYHeadRot(yaw);
     }
 
@@ -1625,11 +1549,9 @@ public class NMSImpl implements NMSBridge {
                 FLYING_MOVECONTROL_FLOAT_SETTER.invoke(mob.getMoveControl(), npc.data().get("flying-nogravity-float"));
                 npc.data().remove("flying-nogravity-float");
             }
-
         } catch (Throwable t) {
             t.printStackTrace();
         }
-
     }
 
     @Override
@@ -1666,13 +1588,11 @@ public class NMSImpl implements NMSBridge {
             if (SET_PROFILE_METHOD == null)
                 return;
         }
-
         try {
             SET_PROFILE_METHOD.invoke(meta, profile);
         } catch (Throwable t) {
             t.printStackTrace();
         }
-
     }
 
     @Override
@@ -1686,7 +1606,6 @@ public class NMSImpl implements NMSBridge {
         } else {
             ((LivingEntity) handle).setJumping(true);
         }
-
     }
 
     @Override
@@ -1704,7 +1623,6 @@ public class NMSImpl implements NMSBridge {
         if (entity instanceof Player) {
             ((Player) entity).setSneaking(sneaking);
         }
-
         Pose pose = sneaking ? Pose.CROUCHING : Pose.STANDING;
         getHandle(entity).setPose(pose);
     }
@@ -1749,7 +1667,6 @@ public class NMSImpl implements NMSBridge {
                 if (warden.hasPose(Pose.EMERGING)) {
                     warden.setPose(Pose.STANDING);
                 }
-
             }, 134);
         } else if (pose == org.bukkit.entity.Pose.ROARING) {
             if (warden.hasPose(Pose.ROARING))
@@ -1762,12 +1679,10 @@ public class NMSImpl implements NMSBridge {
                 if (warden.hasPose(Pose.ROARING)) {
                     warden.setPose(Pose.STANDING);
                 }
-
             }, 84);
         } else {
             warden.setPose(Pose.STANDING);
         }
-
     }
 
     @Override
@@ -1785,7 +1700,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         return false;
     }
 
@@ -1797,7 +1711,6 @@ public class NMSImpl implements NMSBridge {
             ENTITY_REGISTRY_SETTER.invoke(null, ENTITY_REGISTRY.get());
         } catch (Throwable e) {
         }
-
     }
 
     @Override
@@ -1819,7 +1732,6 @@ public class NMSImpl implements NMSBridge {
             handle.setDeltaMovement(handle.getDeltaMovement().x, handle.getDeltaMovement().y + power,
                     handle.getDeltaMovement().z);
         }
-
     }
 
     @Override
@@ -1911,7 +1823,6 @@ public class NMSImpl implements NMSBridge {
                 menuType = MenuType.CRAFTING;
                 break;
         }
-
         handle.connection.send(new ClientboundOpenScreenPacket(handle.containerMenu.containerId, menuType,
                 MutableComponent.create(new LiteralContents(newTitle))));
         player.updateInventory();
@@ -1933,7 +1844,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     @Override
@@ -1945,7 +1855,6 @@ public class NMSImpl implements NMSBridge {
             ((MobAI) en).updatePathfindingRange(pathfindingRange);
             return;
         }
-
         if (NAVIGATION_PATHFINDER == null)
             return;
         PathNavigation navigation = ((Mob) en).getNavigation();
@@ -1957,7 +1866,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     private static class CitizensInventoryAnvil extends CraftInventoryAnvil implements ForwardingInventory {
@@ -2068,7 +1976,6 @@ public class NMSImpl implements NMSBridge {
             e.printStackTrace();
             return;
         }
-
         float oldw = size.width;
         float oldl = size.height;
         cb.accept(datawatcherobject);
@@ -2076,7 +1983,6 @@ public class NMSImpl implements NMSBridge {
             living.setPos(living.getX() - 0.01, living.getY(), living.getZ() - 0.01);
             living.setPos(living.getX() + 0.01, living.getY(), living.getZ() + 0.01);
         }
-
     }
 
     public static void clearGoals(NPC npc, GoalSelector... goalSelectors) {
@@ -2089,17 +1995,14 @@ public class NMSImpl implements NMSBridge {
                 if (!list.isEmpty()) {
                     npc.data().set("selector" + i, Lists.newArrayList(list));
                 }
-
                 list.clear();
             } catch (Exception e) {
                 Messaging.logTr(Messages.ERROR_CLEARING_GOALS, e.getLocalizedMessage());
             } catch (Throwable e) {
                 Messaging.logTr(Messages.ERROR_CLEARING_GOALS, e.getLocalizedMessage());
             }
-
             i++;
         }
-
     }
 
     private static CompoundTag convertNBT(net.minecraft.nbt.CompoundTag tag) {
@@ -2109,7 +2012,6 @@ public class NMSImpl implements NMSBridge {
         for (String key : tag.getAllKeys()) {
             tags.put(key, convertNBT(key, tag.get(key)));
         }
-
         return new CompoundTag("", tags);
     }
 
@@ -2140,10 +2042,8 @@ public class NMSImpl implements NMSBridge {
                 for (int i = 0; i < list.size(); i++) {
                     converted.add(convertNBT("", list.get(i)));
                 }
-
                 return new ListTag(key, tagType, converted);
             }
-
         } else if (base instanceof net.minecraft.nbt.CompoundTag)
             return convertNBT((net.minecraft.nbt.CompoundTag) base);
         else if (base instanceof net.minecraft.nbt.EndTag)
@@ -2159,7 +2059,6 @@ public class NMSImpl implements NMSBridge {
                 d0 = 0.01D;
                 entity.fallDistance = 0.0F;
             }
-
             FluidState fluid = entity.level().getFluidState(entity.blockPosition());
             if (entity.isInWater() && !entity.canStandOnFluid(fluid)) {
                 double d1 = entity.getY();
@@ -2169,27 +2068,22 @@ public class NMSImpl implements NMSBridge {
                 if (f2 > 3.0F) {
                     f2 = 3.0F;
                 }
-
                 if (!entity.onGround()) {
                     f2 *= 0.5F;
                 }
-
                 if (f2 > 0.0F) {
                     f += (0.546F - f) * f2 / 3.0F;
                     f1 += (entity.getSpeed() - f1) * f2 / 3.0F;
                 }
-
                 if (entity.hasEffect(MobEffects.DOLPHINS_GRACE)) {
                     f = 0.96F;
                 }
-
                 entity.moveRelative(f1, vec3d);
                 entity.move(MoverType.SELF, entity.getDeltaMovement());
                 Vec3 vec3d1 = entity.getDeltaMovement();
                 if (entity.horizontalCollision && entity.onClimbable()) {
                     vec3d1 = new Vec3(vec3d1.x, 0.2D, vec3d1.z);
                 }
-
                 entity.setDeltaMovement(vec3d1.multiply(f, 0.8D, f));
                 Vec3 vec3d2 = entity.getFluidFallingAdjustedMovement(d0, flag, entity.getDeltaMovement());
                 entity.setDeltaMovement(vec3d2);
@@ -2197,7 +2091,6 @@ public class NMSImpl implements NMSBridge {
                         && entity.isFree(vec3d2.x, vec3d2.y + 0.6D - entity.getY() + d1, vec3d2.z)) {
                     entity.setDeltaMovement(vec3d2.x, 0.3D, vec3d2.z);
                 }
-
             } else if (entity.isInLava() && !entity.canStandOnFluid(fluid)) {
                 double d1 = entity.getY();
                 entity.moveRelative(0.02F, vec3d);
@@ -2209,23 +2102,19 @@ public class NMSImpl implements NMSBridge {
                 } else {
                     entity.setDeltaMovement(entity.getDeltaMovement().scale(0.5D));
                 }
-
                 if (!entity.isNoGravity()) {
                     entity.setDeltaMovement(entity.getDeltaMovement().add(0.0D, -d0 / 4.0D, 0.0D));
                 }
-
                 Vec3 vec3d3 = entity.getDeltaMovement();
                 if (entity.horizontalCollision
                         && entity.isFree(vec3d3.x, vec3d3.y + 0.6D - entity.getY() + d1, vec3d3.z)) {
                     entity.setDeltaMovement(vec3d3.x, 0.3D, vec3d3.z);
                 }
-
             } else if (entity.isFallFlying()) {
                 Vec3 vec3d4 = entity.getDeltaMovement();
                 if (vec3d4.y > -0.5D) {
                     entity.fallDistance = 1.0F;
                 }
-
                 Vec3 vec3d5 = entity.getLookAngle();
                 float f = entity.getXRot() * 0.017453292F;
                 double d2 = Math.sqrt(vec3d5.x * vec3d5.x + vec3d5.z * vec3d5.z);
@@ -2238,17 +2127,14 @@ public class NMSImpl implements NMSBridge {
                     double d5 = vec3d4.y * -0.1D * f3;
                     vec3d4 = vec3d4.add(vec3d5.x * d5 / d2, d5, vec3d5.z * d5 / d2);
                 }
-
                 if (f < 0.0F && d2 > 0.0D) {
                     double d5 = d3 * -Mth.sin(f) * 0.04D;
                     vec3d4 = vec3d4.add(-vec3d5.x * d5 / d2, d5 * 3.2D, -vec3d5.z * d5 / d2);
                 }
-
                 if (d2 > 0.0D) {
                     vec3d4 = vec3d4.add((vec3d5.x / d2 * d3 - vec3d4.x) * 0.1D, 0.0D,
                             (vec3d5.z / d2 * d3 - vec3d4.z) * 0.1D);
                 }
-
                 entity.setDeltaMovement(vec3d4.multiply(0.99D, 0.98D, 0.99D));
                 entity.move(MoverType.SELF, entity.getDeltaMovement());
                 if (entity.horizontalCollision && !entity.level().isClientSide) {
@@ -2259,14 +2145,11 @@ public class NMSImpl implements NMSBridge {
                         entity.playSound(entity.getFallDamageSound0((int) f4), 1.0F, 1.0F);
                         entity.hurt(entity.damageSources().flyIntoWall(), f4);
                     }
-
                 }
-
                 if (entity.onGround() && !entity.level().isClientSide && entity.getSharedFlag(7)
                         && !CraftEventFactory.callToggleGlideEvent(entity, false).isCancelled()) {
                     entity.setSharedFlag(7, false);
                 }
-
             } else {
                 BlockPos blockposition = BlockPos.containing(entity.getX(), entity.getBoundingBox().minY - 0.5D,
                         entity.getZ());
@@ -2283,21 +2166,16 @@ public class NMSImpl implements NMSBridge {
                     } else {
                         d7 = 0.0D;
                     }
-
                 } else if (!entity.isNoGravity()) {
                     d7 -= d0;
                 }
-
                 if (entity.shouldDiscardFriction()) {
                     entity.setDeltaMovement(vec3d6.x, d7, vec3d6.z);
                 } else {
                     entity.setDeltaMovement(vec3d6.x * f, d7 * 0.98D, vec3d6.z * f);
                 }
-
             }
-
         }
-
         entity.calculateEntityAnimation(entity instanceof net.minecraft.world.entity.animal.FlyingAnimal);
     }
 
@@ -2307,7 +2185,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         return null;
     }
 
@@ -2343,7 +2220,6 @@ public class NMSImpl implements NMSBridge {
             e.printStackTrace();
             return null;
         }
-
     }
 
     public static List<Packet<?>> getPositionUpdate(org.bukkit.entity.Entity from, boolean position, Float bodyYaw,
@@ -2352,11 +2228,9 @@ public class NMSImpl implements NMSBridge {
         if (bodyYaw == null) {
             bodyYaw = handle.getYRot();
         }
-
         if (pitch == null) {
             pitch = handle.getXRot();
         }
-
         List<Packet<?>> toSend = Lists.newArrayList();
         if (position) {
             TrackedEntity entry = ((ServerLevel) handle.level()).getChunkSource().chunkMap.entityMap
@@ -2365,7 +2239,6 @@ public class NMSImpl implements NMSBridge {
                 Messaging.debug("Null tracker entity for ", from);
                 return Collections.emptyList();
             }
-
             VecDeltaCodec vdc = null;
             try {
                 ServerEntity serverEntity = (ServerEntity) SERVER_ENTITY_GETTER.invoke(entry);
@@ -2373,13 +2246,11 @@ public class NMSImpl implements NMSBridge {
                     Messaging.debug("Null server entity for ", from);
                     return Collections.emptyList();
                 }
-
                 vdc = (VecDeltaCodec) POSITION_CODEC_GETTER.invoke(serverEntity);
             } catch (Throwable e) {
                 e.printStackTrace();
                 return Collections.emptyList();
             }
-
             Vec3 pos = handle.trackingPosition();
             toSend.add(new ClientboundMoveEntityPacket.PosRot(handle.getId(), (short) vdc.encodeX(pos),
                     (short) vdc.encodeY(pos), (short) vdc.encodeZ(pos), (byte) (bodyYaw * 256.0F / 360.0F),
@@ -2388,11 +2259,9 @@ public class NMSImpl implements NMSBridge {
             toSend.add(new ClientboundMoveEntityPacket.Rot(handle.getId(), (byte) (bodyYaw * 256.0F / 360.0F),
                     (byte) (pitch * 256.0F / 360.0F), handle.onGround));
         }
-
         if (headYaw != null) {
             toSend.add(new ClientboundRotateHeadPacket(handle, (byte) (headYaw * 256.0F / 360.0F)));
         }
-
         return toSend;
     }
 
@@ -2402,7 +2271,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         return null;
     }
 
@@ -2428,7 +2296,6 @@ public class NMSImpl implements NMSBridge {
         if (mat != null) {
             minecart.setDisplayBlockState(BuiltInRegistries.BLOCK.byId(mat.getId()).defaultBlockState());
         }
-
         minecart.setDisplayOffset(offset);
     }
 
@@ -2442,7 +2309,6 @@ public class NMSImpl implements NMSBridge {
             handle.setDeltaMovement(handle.getDeltaMovement().scale(0.9));
             return true;
         }
-
         return false;
     }
 
@@ -2453,7 +2319,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     public static void restoreGoals(NPC npc, GoalSelector... goalSelectors) {
@@ -2468,16 +2333,13 @@ public class NMSImpl implements NMSBridge {
                 if (old != null) {
                     list.addAll(old);
                 }
-
             } catch (Exception e) {
                 Messaging.logTr(Messages.ERROR_RESTORING_GOALS, e.getLocalizedMessage());
             } catch (Throwable e) {
                 Messaging.logTr(Messages.ERROR_RESTORING_GOALS, e.getLocalizedMessage());
             }
-
             i++;
         }
-
     }
 
     public static void sendPacket(Player player, Packet<?> packet) {
@@ -2504,13 +2366,10 @@ public class NMSImpl implements NMSBridge {
                     || location.distanceSquared(player.getLocation(PACKET_CACHE_LOCATION)) > radius) {
                 continue;
             }
-
             for (Packet<?> packet : packets) {
                 sendPacket(player, packet);
             }
-
         }
-
     }
 
     public static void sendPacketsNearby(Player from, Location location, Packet<?>... packets) {
@@ -2523,7 +2382,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     public static void setAttribute(LivingEntity entity, Attribute attribute, double value) {
@@ -2541,10 +2399,8 @@ public class NMSImpl implements NMSBridge {
             } catch (Throwable e) {
                 e.printStackTrace();
             }
-
             attr = entity.getAttribute(attribute);
         }
-
         attr.setBaseValue(value);
     }
 
@@ -2554,7 +2410,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     public static void setFallingBlockState(FallingBlockEntity handle, BlockState state) {
@@ -2563,7 +2418,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     public static void setLife(FishingHook entity, int life) {
@@ -2572,7 +2426,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     public static void setLookControl(Mob mob, LookControl control) {
@@ -2581,7 +2434,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     public static void setNotInSchool(AbstractFish entity) {
@@ -2589,11 +2441,9 @@ public class NMSImpl implements NMSBridge {
             if (ENTITY_FISH_NUM_IN_SCHOOL != null) {
                 ENTITY_FISH_NUM_IN_SCHOOL.invoke(entity, 2);
             }
-
         } catch (Throwable ex) {
             ex.printStackTrace();
         }
-
     }
 
     public static void setSize(Entity entity, boolean justCreated) {
@@ -2616,13 +2466,10 @@ public class NMSImpl implements NMSBridge {
                     float f = entitysize.width - entitysize1.width;
                     entity.move(MoverType.SELF, new Vec3(f, 0.0D, f));
                 }
-
             }
-
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     public static void setSize(Entity entity, EntityDimensions size) {
@@ -2633,7 +2480,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     public static Entity teleportAcrossWorld(Entity entity, ServerLevel worldserver, Vec3 location) {
@@ -2648,7 +2494,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         if (npc == null || sds == null)
             return null;
         npc.despawn(DespawnReason.PENDING_RESPAWN);
@@ -2661,7 +2506,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         return handle;
     }
 
@@ -2676,7 +2520,6 @@ public class NMSImpl implements NMSBridge {
         } else if (entity instanceof MobAI) {
             ((MobAI) entity).tickAI();
         }
-
     }
 
     public static void updateMinecraftAIState(NPC npc, Mob entity) {
@@ -2689,7 +2532,6 @@ public class NMSImpl implements NMSBridge {
                 getBehaviorMap(entity).putAll(behavior);
                 npc.data().remove("behavior-map");
             }
-
         } else {
             clearGoals(npc, entity.goalSelector, entity.targetSelector);
             TreeMap behaviorMap = getBehaviorMap(entity);
@@ -2697,9 +2539,7 @@ public class NMSImpl implements NMSBridge {
                 npc.data().set("behavior-map", new TreeMap(behaviorMap));
                 behaviorMap.clear();
             }
-
         }
-
     }
 
     private static final MethodHandle ADVANCEMENTS_PLAYER_SETTER = NMS.getFirstFinalSetter(ServerPlayer.class,
@@ -2795,39 +2635,33 @@ public class NMSImpl implements NMSBridge {
             Messaging.logTr(Messages.ERROR_GETTING_ID_MAPPING, e.getMessage());
             e.printStackTrace();
         }
-
         try {
             // Middle one
             ENDERMAN_CREEPY = (EntityDataAccessor<Boolean>) NMS.getField(EnderMan.class, "bV").get(null);
         } catch (Exception e) {
             e.printStackTrace();
         }
-
         try {
             RABBIT_TYPE_DATAWATCHER = (EntityDataAccessor<Integer>) NMS
                     .getFirstStaticGetter(Rabbit.class, EntityDataAccessor.class).invoke();
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         try {
             INTERACTION_HEIGHT = (EntityDataAccessor<Float>) NMS.getGetter(Interaction.class, "d").invoke();
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         try {
             INTERACTION_WIDTH = (EntityDataAccessor<Float>) NMS.getGetter(Interaction.class, "c").invoke();
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
         try {
             DATA_POSE = (EntityDataAccessor<Pose>) NMS.getGetter(Entity.class, "as").invoke();
             DATA_NAME_VISIBLE = (EntityDataAccessor<Boolean>) NMS.getGetter(Entity.class, "aV").invoke();
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/util/PitchableLookControl.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/util/PitchableLookControl.java
index 2cfe6580a..5eaf8749d 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/util/PitchableLookControl.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/util/PitchableLookControl.java
@@ -18,7 +18,6 @@ public class PitchableLookControl extends LookControl {
         } else {
             resetOnTick = () -> true;
         }
-
     }
 
     @Override
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/util/PlayerAnimationImpl.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/util/PlayerAnimationImpl.java
index 29e52b63f..963081fd6 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/util/PlayerAnimationImpl.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/util/PlayerAnimationImpl.java
@@ -24,7 +24,6 @@ public class PlayerAnimationImpl {
             playDefaultAnimation(player, to, DEFAULTS.get(animation));
             return;
         }
-
         switch (animation) {
             case HURT:
                 sendPacketNearby(new ClientboundHurtAnimationPacket(player), to);
@@ -62,7 +61,6 @@ public class PlayerAnimationImpl {
             default:
                 throw new UnsupportedOperationException();
         }
-
     }
 
     protected static void playDefaultAnimation(ServerPlayer player, Iterable<Player> to, int code) {
@@ -80,7 +78,6 @@ public class PlayerAnimationImpl {
         for (Player player : to) {
             NMSImpl.sendPacket(player, packet);
         }
-
     }
 
     private static Map<PlayerAnimation, Integer> DEFAULTS = Maps.newEnumMap(PlayerAnimation.class);
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/ArmorStandController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/ArmorStandController.java
index a129f688b..da18641f5 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/ArmorStandController.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/ArmorStandController.java
@@ -81,7 +81,6 @@ public class ArmorStandController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -95,7 +94,6 @@ public class ArmorStandController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -103,7 +101,6 @@ public class ArmorStandController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new ArmorStandNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -119,7 +116,6 @@ public class ArmorStandController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
 
         @Override
@@ -128,7 +124,6 @@ public class ArmorStandController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
     }
 }
\ No newline at end of file
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/BatController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/BatController.java
index cd6d52662..f61d900fe 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/BatController.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/BatController.java
@@ -57,7 +57,6 @@ public class BatController extends MobEntityController {
             if (npc != null) {
                 setAsleep(false);
             }
-
         }
 
         @Override
@@ -104,7 +103,6 @@ public class BatController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -117,7 +115,6 @@ public class BatController extends MobEntityController {
             if (npc == null) {
                 super.D();
             }
-
         }
 
         @Override
@@ -128,7 +125,6 @@ public class BatController extends MobEntityController {
                 NMSImpl.updateAI(this);
                 npc.update();
             }
-
         }
 
         @Override
@@ -137,7 +133,6 @@ public class BatController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -145,7 +140,6 @@ public class BatController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new BatNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/BlazeController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/BlazeController.java
index 2c51c085e..e80278b7d 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/BlazeController.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/BlazeController.java
@@ -100,7 +100,6 @@ public class BlazeController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -113,7 +112,6 @@ public class BlazeController extends MobEntityController {
             if (npc == null) {
                 super.D();
             }
-
         }
 
         @Override
@@ -121,7 +119,6 @@ public class BlazeController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -130,7 +127,6 @@ public class BlazeController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -138,7 +134,6 @@ public class BlazeController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new BlazeNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/CaveSpiderController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/CaveSpiderController.java
index 1ff633b3c..98e6ec410 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/CaveSpiderController.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/CaveSpiderController.java
@@ -68,7 +68,6 @@ public class CaveSpiderController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -110,7 +109,6 @@ public class CaveSpiderController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -123,7 +121,6 @@ public class CaveSpiderController extends MobEntityController {
             if (npc == null) {
                 super.D();
             }
-
         }
 
         @Override
@@ -131,7 +128,6 @@ public class CaveSpiderController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -140,7 +136,6 @@ public class CaveSpiderController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -149,7 +144,6 @@ public class CaveSpiderController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -159,7 +153,6 @@ public class CaveSpiderController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -167,7 +160,6 @@ public class CaveSpiderController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new CaveSpiderNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -191,7 +183,6 @@ public class CaveSpiderController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
 
         @Override
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/ChickenController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/ChickenController.java
index b8e34e6c7..34861a7ab 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/ChickenController.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/ChickenController.java
@@ -69,7 +69,6 @@ public class ChickenController extends MobEntityController {
                 super.a(flag);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, flag, super::a);
         }
 
@@ -78,7 +77,6 @@ public class ChickenController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -120,7 +118,6 @@ public class ChickenController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -133,7 +130,6 @@ public class ChickenController extends MobEntityController {
             if (npc == null) {
                 super.D();
             }
-
         }
 
         @Override
@@ -141,7 +137,6 @@ public class ChickenController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -150,7 +145,6 @@ public class ChickenController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -159,7 +153,6 @@ public class ChickenController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -169,7 +162,6 @@ public class ChickenController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -177,7 +169,6 @@ public class ChickenController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new ChickenNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -199,7 +190,6 @@ public class ChickenController extends MobEntityController {
             if (npc != null) {
                 this.bs = 100; // egg timer
             }
-
             super.m();
         }
 
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/CowController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/CowController.java
index 199dd4290..985e7506c 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/CowController.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/CowController.java
@@ -72,7 +72,6 @@ public class CowController extends MobEntityController {
                 super.a(flag);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, flag, super::a);
         }
 
@@ -81,7 +80,6 @@ public class CowController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -134,7 +132,6 @@ public class CowController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -147,7 +144,6 @@ public class CowController extends MobEntityController {
             if (npc == null) {
                 super.D();
             }
-
         }
 
         @Override
@@ -155,7 +151,6 @@ public class CowController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -164,7 +159,6 @@ public class CowController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -173,7 +167,6 @@ public class CowController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -183,7 +176,6 @@ public class CowController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -191,7 +183,6 @@ public class CowController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new CowNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/CreeperController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/CreeperController.java
index a325bd09a..4030689f8 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/CreeperController.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/CreeperController.java
@@ -72,7 +72,6 @@ public class CreeperController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -116,7 +115,6 @@ public class CreeperController extends MobEntityController {
             if (npc == null || !npc.isProtected()) {
                 super.co();
             }
-
         }
 
         @Override
@@ -127,7 +125,6 @@ public class CreeperController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -140,7 +137,6 @@ public class CreeperController extends MobEntityController {
             if (npc == null) {
                 super.D();
             }
-
         }
 
         @Override
@@ -148,7 +144,6 @@ public class CreeperController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -157,7 +152,6 @@ public class CreeperController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -166,7 +160,6 @@ public class CreeperController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -176,7 +169,6 @@ public class CreeperController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -184,7 +176,6 @@ public class CreeperController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new CreeperNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -206,7 +197,6 @@ public class CreeperController extends MobEntityController {
             if (npc == null || allowPowered) {
                 super.onLightningStrike(entitylightning);
             }
-
         }
 
         public void setAllowPowered(boolean allowPowered) {
@@ -220,7 +210,6 @@ public class CreeperController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
 
         @Override
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EnderDragonController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EnderDragonController.java
index ac3f878f1..4740fe0ae 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EnderDragonController.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EnderDragonController.java
@@ -105,7 +105,6 @@ public class EnderDragonController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -118,7 +117,6 @@ public class EnderDragonController extends MobEntityController {
             if (npc == null) {
                 super.D();
             }
-
         }
 
         @Override
@@ -141,7 +139,6 @@ public class EnderDragonController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -149,7 +146,6 @@ public class EnderDragonController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new EnderDragonNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -168,13 +164,10 @@ public class EnderDragonController extends MobEntityController {
                         this.bk[i][0] = this.yaw;
                         this.bk[i][1] = this.locY;
                     }
-
                 }
-
                 if (++this.bl == this.bk.length) {
                     this.bl = 0;
                 }
-
                 this.bk[this.bl][0] = this.yaw;
                 this.bk[this.bl][1] = this.locY;
 
@@ -187,11 +180,9 @@ public class EnderDragonController extends MobEntityController {
                     children[j].lastY = vec3.b;
                     children[j].lastZ = vec3.c;
                 }
-
                 if (getBukkitEntity().getPassenger() != null) {
                     yaw = getBukkitEntity().getPassenger().getLocation().getYaw() - 180;
                 }
-
                 if (motX != 0 || motY != 0 || motZ != 0) {
                     motX *= 0.98;
                     motY *= 0.98;
@@ -199,10 +190,8 @@ public class EnderDragonController extends MobEntityController {
                     if (getBukkitEntity().getPassenger() == null) {
                         yaw = Util.getDragonYaw(getBukkitEntity(), motX, motZ);
                     }
-
                     setPosition(locX + motX, locY + motY, locZ + motZ);
                 }
-
                 if (npc.hasTrait(EnderDragonTrait.class) && npc.getOrAddTrait(EnderDragonTrait.class).isDestroyWalls()
                         && NMSImpl.ENDERDRAGON_CHECK_WALLS != null) {
                     for (int i = 0; i < 3; i++) {
@@ -212,11 +201,8 @@ public class EnderDragonController extends MobEntityController {
                         } catch (Throwable e) {
                             e.printStackTrace();
                         }
-
                     }
-
                 }
-
                 if (npc.data().get(NPC.Metadata.COLLIDABLE, false)) {
                     try {
                         KNOCKBACK.invoke(this, this.world.getEntities(this,
@@ -228,13 +214,10 @@ public class EnderDragonController extends MobEntityController {
                     } catch (Throwable t) {
                         t.printStackTrace();
                     }
-
                 }
-
             } else {
                 super.m();
             }
-
         }
 
         @Override
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EndermanController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EndermanController.java
index 0e148234e..0758290aa 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EndermanController.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EndermanController.java
@@ -68,7 +68,6 @@ public class EndermanController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -110,7 +109,6 @@ public class EndermanController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -123,7 +121,6 @@ public class EndermanController extends MobEntityController {
             if (npc == null) {
                 super.D();
             }
-
         }
 
         @Override
@@ -131,7 +128,6 @@ public class EndermanController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -140,7 +136,6 @@ public class EndermanController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -149,7 +144,6 @@ public class EndermanController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -159,7 +153,6 @@ public class EndermanController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -167,7 +160,6 @@ public class EndermanController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new EndermanNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -198,7 +190,6 @@ public class EndermanController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
 
         @Override
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EndermiteController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EndermiteController.java
index 54e71bb5f..bba68aabc 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EndermiteController.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EndermiteController.java
@@ -68,7 +68,6 @@ public class EndermiteController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -110,7 +109,6 @@ public class EndermiteController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -123,7 +121,6 @@ public class EndermiteController extends MobEntityController {
             if (npc == null) {
                 super.D();
             }
-
         }
 
         @Override
@@ -131,7 +128,6 @@ public class EndermiteController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -140,7 +136,6 @@ public class EndermiteController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -149,7 +144,6 @@ public class EndermiteController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -159,7 +153,6 @@ public class EndermiteController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -167,7 +160,6 @@ public class EndermiteController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new EndermiteNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -191,7 +183,6 @@ public class EndermiteController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
 
         @Override
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EntityHumanNPC.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EntityHumanNPC.java
index 18043cb07..ea5b7267f 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EntityHumanNPC.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/EntityHumanNPC.java
@@ -80,7 +80,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         } else {
             skinTracker = null;
         }
-
     }
 
     @Override
@@ -88,7 +87,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         if (npc == null || !npc.isFlyable()) {
             super.a(d0, flag, block, blockposition);
         }
-
     }
 
     @Override
@@ -123,7 +121,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         if (npc != null) {
             Util.callCollisionEvent(npc, entity.getBukkitEntity());
         }
-
     }
 
     @Override
@@ -135,7 +132,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         if (damaged && velocityChanged) {
             velocityChanged = false;
         }
-
         return damaged;
     }
 
@@ -161,7 +157,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         if (npc == null || !npc.isFlyable()) {
             super.e(f, f1);
         }
-
     }
 
     @Override
@@ -170,7 +165,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         if (vector != null) {
             super.g(vector.getX(), vector.getY(), vector.getZ());
         }
-
     }
 
     @Override
@@ -180,7 +174,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         } else {
             NMSImpl.flyingMoveLogic(this, f, f1);
         }
-
     }
 
     @Override
@@ -188,7 +181,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         if (npc != null && bukkitEntity == null) {
             bukkitEntity = new PlayerNPC(this);
         }
-
         return super.getBukkitEntity();
     }
 
@@ -215,7 +207,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         if (skinName == null) {
             skinName = npc.getName();
         }
-
         return skinName.toLowerCase();
     }
 
@@ -240,12 +231,10 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         } catch (NoSuchMethodError err) {
             // reported by a single user on Discord
         }
-
         AttributeInstance range = getAttributeInstance(GenericAttributes.FOLLOW_RANGE);
         if (range == null) {
             range = getAttributeMap().b(GenericAttributes.FOLLOW_RANGE);
         }
-
         range.setValue(Setting.DEFAULT_PATHFINDING_RANGE.asDouble());
         controllerJump = new PlayerControllerJump(this);
         controllerMove = new PlayerControllerMove(this);
@@ -272,7 +261,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
             super.l();
             return;
         }
-
         super.K();
         boolean navigating = npc.getNavigator().isNavigating() || controllerMove.a();
         if (!navigating && getBukkitEntity() != null
@@ -281,19 +269,15 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
                 && (!npc.isProtected() || SpigotUtil.checkYSafe(locY, getBukkitEntity().getWorld()))) {
             moveWithFallDamage(0, 0);
         }
-
         if (Math.abs(motX) < EPSILON && Math.abs(motY) < EPSILON && Math.abs(motZ) < EPSILON) {
             motX = motY = motZ = 0;
         }
-
         if (navigating) {
             if (!NMSImpl.isNavigationFinished(navigation)) {
                 NMSImpl.updateNavigation(navigation);
             }
-
             moveOnCurrentHeading();
         }
-
         updateAI();
         bL();
         if (npc.data().get(NPC.Metadata.PICKUP_ITEMS, false)) {
@@ -303,16 +287,12 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
             } else {
                 axisalignedbb = this.getBoundingBox().grow(1.0, 0.5, 1.0);
             }
-
             for (Entity entity : this.world.getEntities(this, axisalignedbb)) {
                 if (!entity.dead) {
                     entity.d(this);
                 }
-
             }
-
         }
-
     }
 
     private void moveOnCurrentHeading() {
@@ -321,11 +301,9 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
                 bF();
                 jumpTicks = 10;
             }
-
         } else {
             jumpTicks = 0;
         }
-
         aZ *= 0.98F;
         ba *= 0.98F;
         bb *= 0.9F;
@@ -334,7 +312,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         if (jumpTicks > 0) {
             jumpTicks--;
         }
-
     }
 
     private void moveWithFallDamage(float mx, float my) {
@@ -343,7 +320,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         if (!npc.isProtected()) {
             a(this.locY - y, onGround);
         }
-
     }
 
     public void setMoveDestination(double x, double y, double z, double speed) {
@@ -411,16 +387,12 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
                 if (cache != null) {
                     this.getAttributeMap().a(cache.B());
                 }
-
                 if (equipment != null) {
                     this.getAttributeMap().b(equipment.B());
                 }
-
             }
-
             equipmentCache.put(slot, equipment);
         }
-
         if (!itemChanged)
             return;
         Location current = getBukkitEntity().getLocation(packetLocationCache);
@@ -428,7 +400,6 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         for (int i = 0; i < this.inventory.armor.length; i++) {
             packets[i] = new PacketPlayOutEntityEquipment(getId(), i, getEquipment(i));
         }
-
         NMSImpl.sendPacketsNearby(getBukkitEntity(), current, packets);
     }
 
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/GhastController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/GhastController.java
index 0429bcc9d..c70da7bbd 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/GhastController.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/GhastController.java
@@ -91,7 +91,6 @@ public class GhastController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -104,7 +103,6 @@ public class GhastController extends MobEntityController {
             if (npc == null) {
                 super.D();
             }
-
         }
 
         @Override
@@ -112,7 +110,6 @@ public class GhastController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
             super.E();
         }
 
@@ -122,7 +119,6 @@ public class GhastController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -130,7 +126,6 @@ public class GhastController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new GhastNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/GiantController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/GiantController.java
index d1c4fe94c..44787f170 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/GiantController.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/GiantController.java
@@ -54,7 +54,6 @@ public class GiantController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -96,7 +95,6 @@ public class GiantController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -109,7 +107,6 @@ public class GiantController extends MobEntityController {
             if (npc == null) {
                 super.D();
             }
-
         }
 
         @Override
@@ -117,7 +114,6 @@ public class GiantController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -126,7 +122,6 @@ public class GiantController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -135,7 +130,6 @@ public class GiantController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -145,7 +139,6 @@ public class GiantController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -153,7 +146,6 @@ public class GiantController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new GiantNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -177,7 +169,6 @@ public class GiantController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
 
         @Override
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/GuardianController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/GuardianController.java
index 3ba03c54d..e808c1d05 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/GuardianController.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/GuardianController.java
@@ -54,7 +54,6 @@ public class GuardianController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -96,7 +95,6 @@ public class GuardianController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -109,7 +107,6 @@ public class GuardianController extends MobEntityController {
             if (npc == null) {
                 super.D();
             }
-
         }
 
         @Override
@@ -117,7 +114,6 @@ public class GuardianController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -126,7 +122,6 @@ public class GuardianController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -136,7 +131,6 @@ public class GuardianController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -144,7 +138,6 @@ public class GuardianController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new GuardianNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -168,7 +161,6 @@ public class GuardianController extends MobEntityController {
             } else {
                 npc.update();
             }
-
         }
 
         @Override
@@ -180,7 +172,6 @@ public class GuardianController extends MobEntityController {
                 this.setPosition(locX - 0.01, locY, locZ - 0.01);
                 this.setPosition(locX + 0.01, locY, locZ + 0.01);
             }
-
         }
 
         @Override
@@ -190,7 +181,6 @@ public class GuardianController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
 
         @Override
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/HorseController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/HorseController.java
index 656314b58..069cd38aa 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/HorseController.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/HorseController.java
@@ -61,7 +61,6 @@ public class HorseController extends MobEntityController {
                 ((Horse) getBukkitEntity()).setDomestication(((Horse) getBukkitEntity()).getMaxDomestication());
                 baseMovementSpeed = this.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED).getValue();
             }
-
         }
 
         @Override
@@ -75,7 +74,6 @@ public class HorseController extends MobEntityController {
                 super.a(flag);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, flag, super::a);
         }
 
@@ -84,7 +82,6 @@ public class HorseController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -126,7 +123,6 @@ public class HorseController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -147,7 +143,6 @@ public class HorseController extends MobEntityController {
             if (npc == null) {
                 super.D();
             }
-
         }
 
         @Override
@@ -155,7 +150,6 @@ public class HorseController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -169,20 +163,16 @@ public class HorseController extends MobEntityController {
                 } else {
                     riding = false;
                 }
-
                 if (riding) {
                     try {
                         C.invoke(this, 4, true);
                     } catch (Throwable e) {
                         e.printStackTrace();
                     }
-
                 }
-
                 NMS.setStepHeight(getBukkitEntity(), 1);
                 npc.update();
             }
-
         }
 
         @Override
@@ -191,7 +181,6 @@ public class HorseController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -201,7 +190,6 @@ public class HorseController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -209,7 +197,6 @@ public class HorseController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new HorseNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/HumanController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/HumanController.java
index 038c467fb..5994373b2 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/HumanController.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/HumanController.java
@@ -35,11 +35,9 @@ public class HumanController extends AbstractEntityController {
         if (npc.requiresNameHologram()) {
             name = teamName;
         }
-
         if (Setting.USE_SCOREBOARD_TEAMS.asBoolean()) {
             npc.getOrAddTrait(ScoreboardTrait.class).createTeam(name);
         }
-
         final GameProfile profile = new GameProfile(uuid, name);
         final EntityHumanNPC handle = new EntityHumanNPC(nmsWorld.getServer().getServer(), nmsWorld, profile,
                 new PlayerInteractManager(nmsWorld), npc);
@@ -47,7 +45,6 @@ public class HumanController extends AbstractEntityController {
         if (skin != null) {
             skin.apply(handle);
         }
-
         Bukkit.getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(), () -> {
             if (getBukkitEntity() == null || !getBukkitEntity().isValid()
                     || getBukkitEntity() != handle.getBukkitEntity())
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/IronGolemController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/IronGolemController.java
index 85cd1899f..8ea3540c7 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/IronGolemController.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/IronGolemController.java
@@ -54,7 +54,6 @@ public class IronGolemController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -96,7 +95,6 @@ public class IronGolemController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -109,7 +107,6 @@ public class IronGolemController extends MobEntityController {
             if (npc == null) {
                 super.D();
             }
-
         }
 
         @Override
@@ -117,7 +114,6 @@ public class IronGolemController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -126,7 +122,6 @@ public class IronGolemController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -135,7 +130,6 @@ public class IronGolemController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -145,7 +139,6 @@ public class IronGolemController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -153,7 +146,6 @@ public class IronGolemController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new IronGolemNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -177,7 +169,6 @@ public class IronGolemController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
 
         @Override
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/MagmaCubeController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/MagmaCubeController.java
index abcdd56e7..c361a83b6 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/MagmaCubeController.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/MagmaCubeController.java
@@ -48,7 +48,6 @@ public class MagmaCubeController extends MobEntityController {
                 setSize(3);
                 this.moveController = new PlayerControllerMove(this);
             }
-
         }
 
         @Override
@@ -61,7 +60,6 @@ public class MagmaCubeController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -103,7 +101,6 @@ public class MagmaCubeController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -111,7 +108,6 @@ public class MagmaCubeController extends MobEntityController {
             if (npc == null) {
                 super.d(human);
             }
-
         }
 
         @Override
@@ -124,7 +120,6 @@ public class MagmaCubeController extends MobEntityController {
             if (npc == null) {
                 super.D();
             }
-
         }
 
         @Override
@@ -132,7 +127,6 @@ public class MagmaCubeController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -141,7 +135,6 @@ public class MagmaCubeController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -151,7 +144,6 @@ public class MagmaCubeController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -159,7 +151,6 @@ public class MagmaCubeController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new MagmaCubeNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -182,7 +173,6 @@ public class MagmaCubeController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -192,7 +182,6 @@ public class MagmaCubeController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
 
         @Override
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/MobEntityController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/MobEntityController.java
index 4154502d2..c72a4bc73 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/MobEntityController.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/MobEntityController.java
@@ -34,7 +34,6 @@ public abstract class MobEntityController extends AbstractEntityController {
         if (entity instanceof EntityInsentient) {
             NMSImpl.clearGoals(((EntityInsentient) entity).goalSelector, ((EntityInsentient) entity).targetSelector);
         }
-
         entity.setPositionRotation(at.getX(), at.getY(), at.getZ(), at.getYaw(), at.getPitch());
         if (npc != null) {
             // entity.onGround isn't updated right away - we approximate here so
@@ -43,19 +42,15 @@ public abstract class MobEntityController extends AbstractEntityController {
             if (beneath.isSolid()) {
                 entity.onGround = true;
             }
-
             try {
                 UUID_FIELD.set(entity, npc.getUniqueId());
             } catch (Throwable e) {
                 e.printStackTrace();
             }
-
             if (Setting.USE_SCOREBOARD_TEAMS.asBoolean()) {
                 npc.getOrAddTrait(ScoreboardTrait.class).createTeam(npc.getUniqueId().toString());
             }
-
         }
-
         return entity.getBukkitEntity();
     }
 
@@ -66,7 +61,6 @@ public abstract class MobEntityController extends AbstractEntityController {
             ex.printStackTrace();
             return null;
         }
-
     }
 
     private static Constructor<?> getConstructor(Class<?> clazz) {
@@ -79,7 +73,6 @@ public abstract class MobEntityController extends AbstractEntityController {
         } catch (Exception ex) {
             throw new IllegalStateException("unable to find an entity constructor");
         }
-
     }
 
     private static final Map<Class<?>, Constructor<?>> CONSTRUCTOR_CACHE = new WeakHashMap<>();
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/MushroomCowController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/MushroomCowController.java
index 61a825615..4216a62eb 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/MushroomCowController.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/MushroomCowController.java
@@ -56,7 +56,6 @@ public class MushroomCowController extends MobEntityController {
                 super.a(flag);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, flag, super::a);
         }
 
@@ -65,7 +64,6 @@ public class MushroomCowController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -114,7 +112,6 @@ public class MushroomCowController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -127,7 +124,6 @@ public class MushroomCowController extends MobEntityController {
             if (npc == null) {
                 super.D();
             }
-
         }
 
         @Override
@@ -135,7 +131,6 @@ public class MushroomCowController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -144,7 +139,6 @@ public class MushroomCowController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -153,7 +147,6 @@ public class MushroomCowController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -163,7 +156,6 @@ public class MushroomCowController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -171,7 +163,6 @@ public class MushroomCowController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new MushroomCowNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/OcelotController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/OcelotController.java
index d753bd9cc..196525b08 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/OcelotController.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/OcelotController.java
@@ -55,7 +55,6 @@ public class OcelotController extends MobEntityController {
                 super.a(flag);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, flag, super::a);
         }
 
@@ -64,7 +63,6 @@ public class OcelotController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -103,7 +101,6 @@ public class OcelotController extends MobEntityController {
             if (npc == null) {
                 super.cm();
             }
-
         }
 
         @Override
@@ -114,7 +111,6 @@ public class OcelotController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -127,7 +123,6 @@ public class OcelotController extends MobEntityController {
             if (npc == null) {
                 super.D();
             }
-
         }
 
         @Override
@@ -135,7 +130,6 @@ public class OcelotController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -144,7 +138,6 @@ public class OcelotController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -153,7 +146,6 @@ public class OcelotController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -163,7 +155,6 @@ public class OcelotController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -171,7 +162,6 @@ public class OcelotController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new OcelotNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/PigController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/PigController.java
index 2e4bcc74a..43fcf98f2 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/PigController.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/PigController.java
@@ -56,7 +56,6 @@ public class PigController extends MobEntityController {
                 super.a(flag);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, flag, super::a);
         }
 
@@ -65,7 +64,6 @@ public class PigController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -114,7 +112,6 @@ public class PigController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -127,7 +124,6 @@ public class PigController extends MobEntityController {
             if (npc == null) {
                 super.D();
             }
-
         }
 
         @Override
@@ -135,7 +131,6 @@ public class PigController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -144,7 +139,6 @@ public class PigController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -153,7 +147,6 @@ public class PigController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -163,7 +156,6 @@ public class PigController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -171,7 +163,6 @@ public class PigController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new PigNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -193,7 +184,6 @@ public class PigController extends MobEntityController {
             if (npc == null) {
                 super.onLightningStrike(entitylightning);
             }
-
         }
 
         @Override
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/PigZombieController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/PigZombieController.java
index 657e124f6..1132c7381 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/PigZombieController.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/PigZombieController.java
@@ -54,7 +54,6 @@ public class PigZombieController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -96,7 +95,6 @@ public class PigZombieController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -109,7 +107,6 @@ public class PigZombieController extends MobEntityController {
             if (npc == null) {
                 super.D();
             }
-
         }
 
         @Override
@@ -117,7 +114,6 @@ public class PigZombieController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -126,7 +122,6 @@ public class PigZombieController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -135,7 +130,6 @@ public class PigZombieController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -145,7 +139,6 @@ public class PigZombieController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -153,7 +146,6 @@ public class PigZombieController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new PigZombieNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/RabbitController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/RabbitController.java
index f0c22267d..4c629701d 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/RabbitController.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/RabbitController.java
@@ -56,7 +56,6 @@ public class RabbitController extends MobEntityController {
                 super.a(flag);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, flag, super::a);
         }
 
@@ -65,7 +64,6 @@ public class RabbitController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -107,7 +105,6 @@ public class RabbitController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -120,7 +117,6 @@ public class RabbitController extends MobEntityController {
             if (npc == null) {
                 super.D();
             }
-
         }
 
         @Override
@@ -128,7 +124,6 @@ public class RabbitController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -140,7 +135,6 @@ public class RabbitController extends MobEntityController {
             } else {
                 super.E();
             }
-
         }
 
         @Override
@@ -149,7 +143,6 @@ public class RabbitController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -159,7 +152,6 @@ public class RabbitController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -167,7 +159,6 @@ public class RabbitController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new RabbitNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -195,7 +186,6 @@ public class RabbitController extends MobEntityController {
                 this.datawatcher.watch(18, (byte) i);
                 return;
             }
-
             super.setRabbitType(i);
         }
 
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SheepController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SheepController.java
index 5bd06007a..3e56419e9 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SheepController.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SheepController.java
@@ -55,7 +55,6 @@ public class SheepController extends MobEntityController {
                 super.a(flag);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, flag, super::a);
         }
 
@@ -64,7 +63,6 @@ public class SheepController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -106,7 +104,6 @@ public class SheepController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -119,7 +116,6 @@ public class SheepController extends MobEntityController {
             if (npc == null) {
                 super.D();
             }
-
         }
 
         @Override
@@ -127,7 +123,6 @@ public class SheepController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -136,7 +131,6 @@ public class SheepController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -145,7 +139,6 @@ public class SheepController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -155,7 +148,6 @@ public class SheepController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -163,7 +155,6 @@ public class SheepController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SheepNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SilverfishController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SilverfishController.java
index 44c158443..4835fbbe1 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SilverfishController.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SilverfishController.java
@@ -54,7 +54,6 @@ public class SilverfishController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -96,7 +95,6 @@ public class SilverfishController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -109,7 +107,6 @@ public class SilverfishController extends MobEntityController {
             if (npc == null) {
                 super.D();
             }
-
         }
 
         @Override
@@ -117,7 +114,6 @@ public class SilverfishController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -126,7 +122,6 @@ public class SilverfishController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -135,7 +130,6 @@ public class SilverfishController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -145,7 +139,6 @@ public class SilverfishController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -153,7 +146,6 @@ public class SilverfishController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SilverfishNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -177,7 +169,6 @@ public class SilverfishController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
 
         @Override
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SkeletonController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SkeletonController.java
index 067de5e68..a758380ab 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SkeletonController.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SkeletonController.java
@@ -54,7 +54,6 @@ public class SkeletonController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -96,7 +95,6 @@ public class SkeletonController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -109,7 +107,6 @@ public class SkeletonController extends MobEntityController {
             if (npc == null) {
                 super.D();
             }
-
         }
 
         @Override
@@ -117,7 +114,6 @@ public class SkeletonController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -126,7 +122,6 @@ public class SkeletonController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -135,7 +130,6 @@ public class SkeletonController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -145,7 +139,6 @@ public class SkeletonController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -153,7 +146,6 @@ public class SkeletonController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SkeletonNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -177,7 +169,6 @@ public class SkeletonController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
 
         @Override
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SlimeController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SlimeController.java
index c7192921e..0d3300f70 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SlimeController.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SlimeController.java
@@ -48,7 +48,6 @@ public class SlimeController extends MobEntityController {
                 setSize(3);
                 this.moveController = new PlayerControllerMove(this);
             }
-
         }
 
         @Override
@@ -61,7 +60,6 @@ public class SlimeController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -103,7 +101,6 @@ public class SlimeController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -111,7 +108,6 @@ public class SlimeController extends MobEntityController {
             if (npc == null) {
                 super.d(human);
             }
-
         }
 
         @Override
@@ -124,7 +120,6 @@ public class SlimeController extends MobEntityController {
             if (npc == null) {
                 super.D();
             }
-
         }
 
         @Override
@@ -132,7 +127,6 @@ public class SlimeController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -141,7 +135,6 @@ public class SlimeController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -151,7 +144,6 @@ public class SlimeController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -159,7 +151,6 @@ public class SlimeController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SlimeNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -182,7 +173,6 @@ public class SlimeController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -192,7 +182,6 @@ public class SlimeController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
 
         @Override
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SnowmanController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SnowmanController.java
index dcdd07b3d..a3f258c39 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SnowmanController.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SnowmanController.java
@@ -54,7 +54,6 @@ public class SnowmanController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -96,7 +95,6 @@ public class SnowmanController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -109,7 +107,6 @@ public class SnowmanController extends MobEntityController {
             if (npc == null) {
                 super.D();
             }
-
         }
 
         @Override
@@ -117,7 +114,6 @@ public class SnowmanController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -126,7 +122,6 @@ public class SnowmanController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -135,7 +130,6 @@ public class SnowmanController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -145,7 +139,6 @@ public class SnowmanController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -153,7 +146,6 @@ public class SnowmanController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SnowmanNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -177,7 +169,6 @@ public class SnowmanController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
 
         @Override
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SpiderController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SpiderController.java
index e3117302e..58ae0ce64 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SpiderController.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SpiderController.java
@@ -54,7 +54,6 @@ public class SpiderController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -96,7 +95,6 @@ public class SpiderController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -109,7 +107,6 @@ public class SpiderController extends MobEntityController {
             if (npc == null) {
                 super.D();
             }
-
         }
 
         @Override
@@ -117,7 +114,6 @@ public class SpiderController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -126,7 +122,6 @@ public class SpiderController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -135,7 +130,6 @@ public class SpiderController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -145,7 +139,6 @@ public class SpiderController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -153,7 +146,6 @@ public class SpiderController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SpiderNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -177,7 +169,6 @@ public class SpiderController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
 
         @Override
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SquidController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SquidController.java
index c228c7137..9f400b653 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SquidController.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/SquidController.java
@@ -54,7 +54,6 @@ public class SquidController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -96,7 +95,6 @@ public class SquidController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -109,7 +107,6 @@ public class SquidController extends MobEntityController {
             if (npc == null) {
                 super.D();
             }
-
         }
 
         @Override
@@ -117,7 +114,6 @@ public class SquidController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -126,7 +122,6 @@ public class SquidController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -136,7 +131,6 @@ public class SquidController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -144,7 +138,6 @@ public class SquidController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SquidNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -167,7 +160,6 @@ public class SquidController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -177,7 +169,6 @@ public class SquidController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
 
         @Override
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/VillagerController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/VillagerController.java
index 94f4922fd..0d0648ce1 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/VillagerController.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/VillagerController.java
@@ -59,7 +59,6 @@ public class VillagerController extends MobEntityController {
                 super.a(flag);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, flag, super::a);
         }
 
@@ -68,7 +67,6 @@ public class VillagerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -82,7 +80,6 @@ public class VillagerController extends MobEntityController {
             if (npc != null && npc.data().get(NPC.Metadata.VILLAGER_BLOCK_TRADES, true)) {
                 blockingATrade = true;
             }
-
             return super.a(entityhuman);
         }
 
@@ -117,7 +114,6 @@ public class VillagerController extends MobEntityController {
                 blockingATrade = false;
                 return true;
             }
-
             return super.co();
         }
 
@@ -129,7 +125,6 @@ public class VillagerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -142,7 +137,6 @@ public class VillagerController extends MobEntityController {
             if (npc == null) {
                 super.D();
             }
-
         }
 
         @Override
@@ -150,7 +144,6 @@ public class VillagerController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -159,7 +152,6 @@ public class VillagerController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -168,7 +160,6 @@ public class VillagerController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -178,7 +169,6 @@ public class VillagerController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -186,7 +176,6 @@ public class VillagerController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new VillagerNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -208,7 +197,6 @@ public class VillagerController extends MobEntityController {
             if (npc == null) {
                 super.onLightningStrike(entitylightning);
             }
-
         }
 
         @Override
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/WitchController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/WitchController.java
index 26b282864..17c07714e 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/WitchController.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/WitchController.java
@@ -54,7 +54,6 @@ public class WitchController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -96,7 +95,6 @@ public class WitchController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -109,7 +107,6 @@ public class WitchController extends MobEntityController {
             if (npc == null) {
                 super.D();
             }
-
         }
 
         @Override
@@ -117,7 +114,6 @@ public class WitchController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -126,7 +122,6 @@ public class WitchController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -135,7 +130,6 @@ public class WitchController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -145,7 +139,6 @@ public class WitchController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -153,7 +146,6 @@ public class WitchController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new WitchNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -177,7 +169,6 @@ public class WitchController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
 
         @Override
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/WitherController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/WitherController.java
index a28a412ce..afe73c7d9 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/WitherController.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/WitherController.java
@@ -92,7 +92,6 @@ public class WitherController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -105,7 +104,6 @@ public class WitherController extends MobEntityController {
             if (npc == null) {
                 super.D();
             }
-
         }
 
         @Override
@@ -114,7 +112,6 @@ public class WitherController extends MobEntityController {
                 super.E();
                 return;
             }
-
             npc.update();
         }
 
@@ -124,7 +121,6 @@ public class WitherController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -132,7 +128,6 @@ public class WitherController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new WitherNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/WolfController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/WolfController.java
index 24f09fbe9..5e00df43d 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/WolfController.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/WolfController.java
@@ -57,7 +57,6 @@ public class WolfController extends MobEntityController {
                 super.a(flag);
                 return;
             }
-
             NMSImpl.checkAndUpdateHeight(this, flag, super::a);
         }
 
@@ -66,7 +65,6 @@ public class WolfController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -108,7 +106,6 @@ public class WolfController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -121,7 +118,6 @@ public class WolfController extends MobEntityController {
             if (npc == null) {
                 super.D();
             }
-
         }
 
         @Override
@@ -129,7 +125,6 @@ public class WolfController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -138,7 +133,6 @@ public class WolfController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -147,7 +141,6 @@ public class WolfController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -157,7 +150,6 @@ public class WolfController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -165,7 +157,6 @@ public class WolfController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new WolfNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -187,7 +178,6 @@ public class WolfController extends MobEntityController {
             if (npc == null || this.equals(entityliving)) {
                 super.setGoalTarget(entityliving, reason, fire);
             }
-
         }
 
         @Override
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/ZombieController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/ZombieController.java
index 873577c4d..b113c062d 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/ZombieController.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/ZombieController.java
@@ -54,7 +54,6 @@ public class ZombieController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.a(d0, flag, block, blockposition);
             }
-
         }
 
         @Override
@@ -96,7 +95,6 @@ public class ZombieController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -109,7 +107,6 @@ public class ZombieController extends MobEntityController {
             if (npc == null) {
                 super.D();
             }
-
         }
 
         @Override
@@ -117,7 +114,6 @@ public class ZombieController extends MobEntityController {
             if (npc == null || !npc.isFlyable()) {
                 super.e(f, f1);
             }
-
         }
 
         @Override
@@ -126,7 +122,6 @@ public class ZombieController extends MobEntityController {
             if (npc != null) {
                 npc.update();
             }
-
         }
 
         @Override
@@ -135,7 +130,6 @@ public class ZombieController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -145,7 +139,6 @@ public class ZombieController extends MobEntityController {
             } else {
                 NMSImpl.flyingMoveLogic(this, f, f1);
             }
-
         }
 
         @Override
@@ -153,7 +146,6 @@ public class ZombieController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new ZombieNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/ArrowController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/ArrowController.java
index 7eee78208..a7fb4106d 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/ArrowController.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/ArrowController.java
@@ -67,7 +67,6 @@ public class ArrowController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -81,7 +80,6 @@ public class ArrowController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -89,7 +87,6 @@ public class ArrowController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new ArrowNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -105,7 +102,6 @@ public class ArrowController extends MobEntityController {
             } else {
                 super.t_();
             }
-
         }
     }
 }
\ No newline at end of file
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/BoatController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/BoatController.java
index 82e389785..808d5c8e4 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/BoatController.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/BoatController.java
@@ -77,7 +77,6 @@ public class BoatController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -91,7 +90,6 @@ public class BoatController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -99,7 +97,6 @@ public class BoatController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new BoatNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -115,7 +112,6 @@ public class BoatController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
 
         @Override
@@ -126,7 +122,6 @@ public class BoatController extends MobEntityController {
             } else {
                 super.t_();
             }
-
         }
 
         private void updateBoat() {
@@ -143,9 +138,7 @@ public class BoatController extends MobEntityController {
                 if (this.world.b(axisalignedbb, Material.WATER)) {
                     d0 += 1.0D / b0;
                 }
-
             }
-
             double d3 = Math.sqrt(this.motX * this.motX + this.motZ * this.motZ);
             if (d3 > 0.2975D) {
                 double d4 = Math.cos(this.yaw * Math.PI / 180.0D);
@@ -164,11 +157,8 @@ public class BoatController extends MobEntityController {
                         this.world.addParticle(EnumParticle.WATER_SPLASH, d8, this.locY - 0.125D, d9, this.motX,
                                 this.motY, this.motZ);
                     }
-
                 }
-
             }
-
             if (d0 < 1.0D) {
                 double d = d0 * 2.0D - 1.0D;
                 this.motY += 0.04D * d;
@@ -176,10 +166,8 @@ public class BoatController extends MobEntityController {
                 if (this.motY < 0.0D) {
                     this.motY /= 2.0D;
                 }
-
                 this.motY += 0.007D;
             }
-
             if (this.passenger instanceof EntityLiving) {
                 EntityLiving entityliving = (EntityLiving) this.passenger;
                 float f = this.passenger.yaw + -entityliving.aZ * 90.0F;
@@ -191,13 +179,10 @@ public class BoatController extends MobEntityController {
                 if (this.motX <= 1.0E-5D) {
                     this.motX = 0.0D;
                 }
-
                 if (this.motZ <= 1.0E-5D) {
                     this.motZ = 0.0D;
                 }
-
             }
-
             double d4 = Math.sqrt(this.motX * this.motX + this.motZ * this.motZ);
             if (d4 > 0.35D) {
                 double d = 0.35D / d4;
@@ -205,21 +190,17 @@ public class BoatController extends MobEntityController {
                 this.motZ *= d;
                 d4 = 0.35D;
             }
-
             if (d4 > d3 && this.b < 0.35D) {
                 this.b += (0.35D - this.b) / 35.0D;
                 if (this.b > 0.35D) {
                     this.b = 0.35D;
                 }
-
             } else {
                 this.b -= (this.b - 0.07D) / 35.0D;
                 if (this.b < 0.07D) {
                     this.b = 0.07D;
                 }
-
             }
-
             for (int k = 0; k < 4; k++) {
                 int l = MathHelper.floor(this.locX + (k % 2 - 0.5D) * 0.8D);
                 int j = MathHelper.floor(this.locZ + (k / 2 - 0.5D) * 0.8D);
@@ -233,26 +214,20 @@ public class BoatController extends MobEntityController {
                             this.world.setAir(blockposition);
                             this.positionChanged = false;
                         }
-
                     } else if (block == Blocks.WATERLILY) {
                         if (!CraftEventFactory.callEntityChangeBlockEvent(this, l, j1, j, Blocks.AIR, 0)
                                 .isCancelled()) {
                             this.world.setAir(blockposition, true);
                             this.positionChanged = false;
                         }
-
                     }
-
                 }
-
             }
-
             if (this.onGround && !this.landBoats) {
                 this.motX *= 0.5D;
                 this.motY *= 0.5D;
                 this.motZ *= 0.5D;
             }
-
             move(this.motX, this.motY, this.motZ);
             if (this.positionChanged && d3 > 0.2975D) {
             } else {
@@ -260,7 +235,6 @@ public class BoatController extends MobEntityController {
                 this.motY *= 0.95D;
                 this.motZ *= 0.99D;
             }
-
             this.pitch = 0.0F;
             double d5 = this.yaw;
             double d10 = this.lastX - this.locX;
@@ -268,16 +242,13 @@ public class BoatController extends MobEntityController {
             if (d10 * d10 + d11 * d11 > 0.001D) {
                 d5 = (float) (MathHelper.b(d11, d10) * 180.0D / Math.PI);
             }
-
             double d12 = MathHelper.g(d5 - this.yaw);
             if (d12 > 20.0D) {
                 d12 = 20.0D;
             }
-
             if (d12 < -20.0D) {
                 d12 = -20.0D;
             }
-
             this.yaw += d12;
         }
     }
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/EggController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/EggController.java
index 5aca78e0e..ea2b90a0d 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/EggController.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/EggController.java
@@ -83,7 +83,6 @@ public class EggController extends AbstractEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -97,7 +96,6 @@ public class EggController extends AbstractEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -105,7 +103,6 @@ public class EggController extends AbstractEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new EggNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -121,11 +118,9 @@ public class EggController extends AbstractEntityController {
                 if (!npc.isProtected()) {
                     super.t_();
                 }
-
             } else {
                 super.t_();
             }
-
         }
     }
 }
\ No newline at end of file
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/EnderCrystalController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/EnderCrystalController.java
index 652d298eb..c47f04d84 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/EnderCrystalController.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/EnderCrystalController.java
@@ -67,7 +67,6 @@ public class EnderCrystalController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -81,7 +80,6 @@ public class EnderCrystalController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -89,7 +87,6 @@ public class EnderCrystalController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new EnderCrystalNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -105,7 +102,6 @@ public class EnderCrystalController extends MobEntityController {
             } else {
                 super.t_();
             }
-
         }
     }
 }
\ No newline at end of file
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/EnderPearlController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/EnderPearlController.java
index bb684da4c..2b21f1bc5 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/EnderPearlController.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/EnderPearlController.java
@@ -67,7 +67,6 @@ public class EnderPearlController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -81,7 +80,6 @@ public class EnderPearlController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -89,7 +87,6 @@ public class EnderPearlController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new EnderPearlNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -105,11 +102,9 @@ public class EnderPearlController extends MobEntityController {
                 if (!npc.isProtected()) {
                     super.t_();
                 }
-
             } else {
                 super.t_();
             }
-
         }
     }
 }
\ No newline at end of file
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/EnderSignalController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/EnderSignalController.java
index 93116cf25..5f6cdea48 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/EnderSignalController.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/EnderSignalController.java
@@ -67,7 +67,6 @@ public class EnderSignalController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -81,7 +80,6 @@ public class EnderSignalController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -89,7 +87,6 @@ public class EnderSignalController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new EnderSignalNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -105,7 +102,6 @@ public class EnderSignalController extends MobEntityController {
             } else {
                 super.t_();
             }
-
         }
     }
 }
\ No newline at end of file
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/ExperienceOrbController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/ExperienceOrbController.java
index a191c0b1b..1b154b54b 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/ExperienceOrbController.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/ExperienceOrbController.java
@@ -53,7 +53,6 @@ public class ExperienceOrbController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -67,7 +66,6 @@ public class ExperienceOrbController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -75,7 +73,6 @@ public class ExperienceOrbController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new ExperienceOrbNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -91,7 +88,6 @@ public class ExperienceOrbController extends MobEntityController {
             } else {
                 super.t_();
             }
-
         }
     }
 
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/FallingBlockController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/FallingBlockController.java
index 526027ebf..59b1e31e0 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/FallingBlockController.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/FallingBlockController.java
@@ -75,7 +75,6 @@ public class FallingBlockController extends AbstractEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -89,7 +88,6 @@ public class FallingBlockController extends AbstractEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -97,7 +95,6 @@ public class FallingBlockController extends AbstractEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new FallingBlockNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -113,7 +110,6 @@ public class FallingBlockController extends AbstractEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
 
         @Override
@@ -126,11 +122,9 @@ public class FallingBlockController extends AbstractEntityController {
                     motZ *= 0.98;
                     move(motX, motY, motZ);
                 }
-
             } else {
                 super.t_();
             }
-
         }
 
         private static final double EPSILON = 0.001;
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/FireworkController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/FireworkController.java
index 7eb185f84..91a1c685c 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/FireworkController.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/FireworkController.java
@@ -53,7 +53,6 @@ public class FireworkController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -67,7 +66,6 @@ public class FireworkController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -75,7 +73,6 @@ public class FireworkController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new FireworkNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -91,7 +88,6 @@ public class FireworkController extends MobEntityController {
             } else {
                 super.t_();
             }
-
         }
     }
 
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/FishingHookController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/FishingHookController.java
index a08392256..02053806b 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/FishingHookController.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/FishingHookController.java
@@ -53,7 +53,6 @@ public class FishingHookController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -67,7 +66,6 @@ public class FishingHookController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -75,7 +73,6 @@ public class FishingHookController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new FishingHookNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -91,7 +88,6 @@ public class FishingHookController extends MobEntityController {
             } else {
                 super.t_();
             }
-
         }
     }
 
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/ItemController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/ItemController.java
index 1e282bce0..266a3f158 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/ItemController.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/ItemController.java
@@ -66,7 +66,6 @@ public class ItemController extends AbstractEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -74,7 +73,6 @@ public class ItemController extends AbstractEntityController {
             if (npc == null) {
                 super.d(entityhuman);
             }
-
         }
 
         @Override
@@ -88,7 +86,6 @@ public class ItemController extends AbstractEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -96,7 +93,6 @@ public class ItemController extends AbstractEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new ItemNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -112,7 +108,6 @@ public class ItemController extends AbstractEntityController {
             } else {
                 super.t_();
             }
-
         }
     }
 
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/ItemFrameController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/ItemFrameController.java
index 36e15b9ff..6b212fb7d 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/ItemFrameController.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/ItemFrameController.java
@@ -66,7 +66,6 @@ public class ItemFrameController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -80,7 +79,6 @@ public class ItemFrameController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -88,7 +86,6 @@ public class ItemFrameController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new ItemFrameNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -109,7 +106,6 @@ public class ItemFrameController extends MobEntityController {
             } else {
                 super.t_();
             }
-
         }
     }
 
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/LargeFireballController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/LargeFireballController.java
index 3a30475ae..03bd78aec 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/LargeFireballController.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/LargeFireballController.java
@@ -54,7 +54,6 @@ public class LargeFireballController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -68,7 +67,6 @@ public class LargeFireballController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -76,7 +74,6 @@ public class LargeFireballController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new LargeFireballNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -92,7 +89,6 @@ public class LargeFireballController extends MobEntityController {
             } else {
                 NMSImpl.setSize(this, f, f1, justCreated);
             }
-
         }
 
         @Override
@@ -102,11 +98,9 @@ public class LargeFireballController extends MobEntityController {
                 if (!npc.isProtected()) {
                     super.t_();
                 }
-
             } else {
                 super.t_();
             }
-
         }
     }
 
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/LeashController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/LeashController.java
index 5c0f81938..2fad0fe3c 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/LeashController.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/LeashController.java
@@ -53,7 +53,6 @@ public class LeashController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -67,7 +66,6 @@ public class LeashController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -75,7 +73,6 @@ public class LeashController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new LeashNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -96,7 +93,6 @@ public class LeashController extends MobEntityController {
             } else {
                 super.t_();
             }
-
         }
     }
 
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartChestController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartChestController.java
index 93a3253ba..5451aab31 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartChestController.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartChestController.java
@@ -54,7 +54,6 @@ public class MinecartChestController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -68,7 +67,6 @@ public class MinecartChestController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -76,7 +74,6 @@ public class MinecartChestController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new MinecartChestNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -92,7 +89,6 @@ public class MinecartChestController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
     }
 
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartCommandController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartCommandController.java
index aeb30b21c..81bdf4925 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartCommandController.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartCommandController.java
@@ -54,7 +54,6 @@ public class MinecartCommandController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -68,7 +67,6 @@ public class MinecartCommandController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -76,7 +74,6 @@ public class MinecartCommandController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new MinecartCommandNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -92,7 +89,6 @@ public class MinecartCommandController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
     }
 
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartFurnaceController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartFurnaceController.java
index af106531a..e0c981b65 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartFurnaceController.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartFurnaceController.java
@@ -54,7 +54,6 @@ public class MinecartFurnaceController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -68,7 +67,6 @@ public class MinecartFurnaceController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -76,7 +74,6 @@ public class MinecartFurnaceController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new MinecartFurnaceNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -92,7 +89,6 @@ public class MinecartFurnaceController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
     }
 
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartHopperController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartHopperController.java
index a86b34487..cec319a79 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartHopperController.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartHopperController.java
@@ -50,7 +50,6 @@ public class MinecartHopperController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -64,7 +63,6 @@ public class MinecartHopperController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -79,7 +77,6 @@ public class MinecartHopperController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
     }
 }
\ No newline at end of file
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartRideableController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartRideableController.java
index 218de0faf..06af690f2 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartRideableController.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartRideableController.java
@@ -54,7 +54,6 @@ public class MinecartRideableController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -68,7 +67,6 @@ public class MinecartRideableController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -76,7 +74,6 @@ public class MinecartRideableController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new MinecartRideableNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -92,7 +89,6 @@ public class MinecartRideableController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
     }
 
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartSpawnerController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartSpawnerController.java
index 38fb3e815..d5c906186 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartSpawnerController.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartSpawnerController.java
@@ -50,7 +50,6 @@ public class MinecartSpawnerController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -64,7 +63,6 @@ public class MinecartSpawnerController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -79,7 +77,6 @@ public class MinecartSpawnerController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
     }
 }
\ No newline at end of file
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartTNTController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartTNTController.java
index 09836a142..d844710ff 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartTNTController.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/MinecartTNTController.java
@@ -50,7 +50,6 @@ public class MinecartTNTController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -64,7 +63,6 @@ public class MinecartTNTController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -79,7 +77,6 @@ public class MinecartTNTController extends MobEntityController {
                 npc.update();
                 NMSImpl.minecartItemLogic(this);
             }
-
         }
     }
 }
\ No newline at end of file
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/PaintingController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/PaintingController.java
index 9b96902fd..5cb6f16f0 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/PaintingController.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/PaintingController.java
@@ -53,7 +53,6 @@ public class PaintingController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -67,7 +66,6 @@ public class PaintingController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -75,7 +73,6 @@ public class PaintingController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new PaintingNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -96,7 +93,6 @@ public class PaintingController extends MobEntityController {
             } else {
                 super.t_();
             }
-
         }
     }
 
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/SmallFireballController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/SmallFireballController.java
index 3613422db..635e9faa9 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/SmallFireballController.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/SmallFireballController.java
@@ -53,7 +53,6 @@ public class SmallFireballController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -67,7 +66,6 @@ public class SmallFireballController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -75,7 +73,6 @@ public class SmallFireballController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SmallFireballNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -91,11 +88,9 @@ public class SmallFireballController extends MobEntityController {
                 if (!npc.isProtected()) {
                     super.t_();
                 }
-
             } else {
                 super.t_();
             }
-
         }
     }
 
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/SnowballController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/SnowballController.java
index dc7dff5d3..02a5262d4 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/SnowballController.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/SnowballController.java
@@ -53,7 +53,6 @@ public class SnowballController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -67,7 +66,6 @@ public class SnowballController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -75,7 +73,6 @@ public class SnowballController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SnowballNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -91,7 +88,6 @@ public class SnowballController extends MobEntityController {
             } else {
                 super.t_();
             }
-
         }
     }
 
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/SplashPotionController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/SplashPotionController.java
index 554cc1cb4..a969d4d50 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/SplashPotionController.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/SplashPotionController.java
@@ -53,7 +53,6 @@ public class SplashPotionController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -67,7 +66,6 @@ public class SplashPotionController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -75,7 +73,6 @@ public class SplashPotionController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new PotionNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -91,11 +88,9 @@ public class SplashPotionController extends MobEntityController {
                 if (!npc.isProtected()) {
                     super.t_();
                 }
-
             } else {
                 super.t_();
             }
-
         }
     }
 
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/TNTPrimedController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/TNTPrimedController.java
index b1d5b3ed2..32148b729 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/TNTPrimedController.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/TNTPrimedController.java
@@ -53,7 +53,6 @@ public class TNTPrimedController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -67,7 +66,6 @@ public class TNTPrimedController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -75,7 +73,6 @@ public class TNTPrimedController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new TNTPrimedNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -91,7 +88,6 @@ public class TNTPrimedController extends MobEntityController {
             } else {
                 super.t_();
             }
-
         }
     }
 
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/ThrownExpBottleController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/ThrownExpBottleController.java
index 897884dce..75e87bd75 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/ThrownExpBottleController.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/ThrownExpBottleController.java
@@ -53,7 +53,6 @@ public class ThrownExpBottleController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -67,7 +66,6 @@ public class ThrownExpBottleController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -75,7 +73,6 @@ public class ThrownExpBottleController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new ThrownExpBottleNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -91,11 +88,9 @@ public class ThrownExpBottleController extends MobEntityController {
                 if (!npc.isProtected()) {
                     super.t_();
                 }
-
             } else {
                 super.t_();
             }
-
         }
     }
 
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/WitherSkullController.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/WitherSkullController.java
index 8bdf572f9..005e6532e 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/WitherSkullController.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/entity/nonliving/WitherSkullController.java
@@ -53,7 +53,6 @@ public class WitherSkullController extends MobEntityController {
             if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
             }
-
         }
 
         @Override
@@ -67,7 +66,6 @@ public class WitherSkullController extends MobEntityController {
             if (vector != null) {
                 super.g(vector.getX(), vector.getY(), vector.getZ());
             }
-
         }
 
         @Override
@@ -75,7 +73,6 @@ public class WitherSkullController extends MobEntityController {
             if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new WitherSkullNPC(this);
             }
-
             return super.getBukkitEntity();
         }
 
@@ -91,7 +88,6 @@ public class WitherSkullController extends MobEntityController {
             } else {
                 super.t_();
             }
-
         }
     }
 
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/CitizensBlockBreaker.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/CitizensBlockBreaker.java
index c33a49e3a..fa9ca880e 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/CitizensBlockBreaker.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/CitizensBlockBreaker.java
@@ -45,7 +45,6 @@ public class CitizensBlockBreaker extends AbstractBlockBreaker {
             ItemStack current = getCurrentItem();
             return current != null ? current.b(block) : false;
         }
-
     }
 
     @Override
@@ -63,13 +62,10 @@ public class CitizensBlockBreaker extends AbstractBlockBreaker {
                 if (i > 0) {
                     f += i * i + 1;
                 }
-
             }
-
             if (handle.hasEffect(MobEffectList.FASTER_DIG)) {
                 f *= 1.0F + (handle.getEffect(MobEffectList.FASTER_DIG).getAmplifier() + 1) * 0.2F;
             }
-
             if (handle.hasEffect(MobEffectList.SLOWER_DIG)) {
                 float f1 = 1.0F;
                 switch (handle.getEffect(MobEffectList.SLOWER_DIG).getAmplifier()) {
@@ -86,20 +82,15 @@ public class CitizensBlockBreaker extends AbstractBlockBreaker {
                     default:
                         f1 = 8.1E-4F;
                 }
-
                 f *= f1;
             }
-
             if (handle.a(Material.WATER) && !EnchantmentManager.j(handle)) {
                 f /= 5.0F;
             }
-
         }
-
         if (!getHandle().onGround) {
             f /= 5.0F;
         }
-
         return f;
     }
 }
\ No newline at end of file
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/NMSImpl.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/NMSImpl.java
index 39e612572..b85a306b7 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/NMSImpl.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/NMSImpl.java
@@ -247,7 +247,6 @@ public class NMSImpl implements NMSBridge {
         } else if (!handle.world.players.contains(handle)) {
             handle.world.players.add(handle);
         }
-
     }
 
     @Override
@@ -260,7 +259,6 @@ public class NMSImpl implements NMSBridge {
             PlayerAnimation.ARM_SWING.play(humanHandle.getBukkitEntity());
             return;
         }
-
         AttributeInstance attackDamage = handle.getAttributeInstance(GenericAttributes.ATTACK_DAMAGE);
         float f = (float) (attackDamage == null ? 1 : attackDamage.getValue());
         int i = 0;
@@ -268,7 +266,6 @@ public class NMSImpl implements NMSBridge {
             f += EnchantmentManager.a(handle.bA(), target.getMonsterType());
             i += EnchantmentManager.a(handle);
         }
-
         boolean flag = target.damageEntity(DamageSource.mobAttack(handle), f);
         if (!flag)
             return;
@@ -278,21 +275,17 @@ public class NMSImpl implements NMSBridge {
             handle.motX *= 0.6D;
             handle.motZ *= 0.6D;
         }
-
         int fireAspectLevel = EnchantmentManager.getFireAspectEnchantmentLevel(handle);
         if (fireAspectLevel > 0) {
             target.setOnFire(fireAspectLevel * 4);
         }
-
         if (ENTITY_ATTACK_A != null) {
             try {
                 ENTITY_ATTACK_A.invoke(handle, handle, target);
             } catch (Throwable t) {
                 t.printStackTrace();
             }
-
         }
-
     }
 
     @Override
@@ -304,11 +297,9 @@ public class NMSImpl implements NMSBridge {
             } catch (Throwable t) {
                 t.printStackTrace();
             }
-
         } else if (handle instanceof EntityHumanNPC) {
             ((EntityHumanNPC) handle).getControllerMove().f = false;
         }
-
     }
 
     @Override
@@ -340,19 +331,14 @@ public class NMSImpl implements NMSBridge {
                         if (!changed && !ItemStack.matches(old, curr)) {
                             changed = true;
                         }
-
                         equipment.put(i, curr);
                     }
-
                     if (changed) {
                         for (int i = 0; i < entity.getEquipment().length; i++) {
                             agg.send(new PacketPlayOutEntityEquipment(handle.getId(), i, equipment.get(i)));
                         }
-
                     }
-
                 }
-
                 tracker.track(Lists.newArrayList(tracker.trackedPlayers));
             }
 
@@ -372,9 +358,7 @@ public class NMSImpl implements NMSBridge {
                     if (callback != null) {
                         callback.accept(entity);
                     }
-
                 }
-
                 tracker.trackedPlayers.clear();
             }
         };
@@ -523,15 +507,12 @@ public class NMSImpl implements NMSBridge {
             } catch (Exception e) {
                 return null;
             }
-
         }
-
         try {
             return (GameProfile) SKULL_PROFILE_FIELD.get(meta);
         } catch (Exception e) {
             return null;
         }
-
     }
 
     @Override
@@ -544,7 +525,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Exception e) {
             throw new CommandException(Messages.INVALID_SOUND);
         }
-
     }
 
     @Override
@@ -560,7 +540,6 @@ public class NMSImpl implements NMSBridge {
         EntityLiving handle = NMSImpl.getHandle((LivingEntity) npc.getEntity());
         if (handle == null) {
         }
-
         return DEFAULT_SPEED;
         // return (float)
         // handle.getAttributeInstance(GenericAttributes.d).getValue();
@@ -600,7 +579,6 @@ public class NMSImpl implements NMSBridge {
         if (navigation instanceof Navigation) {
             ((Navigation) navigation).a(params.avoidWater());
         }
-
         return new MCNavigator() {
             float lastSpeed;
             CancelReason reason;
@@ -620,7 +598,6 @@ public class NMSImpl implements NMSBridge {
                 if (navigation instanceof Navigation) {
                     ((Navigation) navigation).a(oldAvoidsWater);
                 }
-
                 stopNavigation(navigation);
             }
 
@@ -632,16 +609,13 @@ public class NMSImpl implements NMSBridge {
                     if (handle instanceof EntityHorse) {
                         handle.width = Math.min(0.99f, oldWidth);
                     }
-
                     if (!function.apply(navigation)) {
                         reason = CancelReason.STUCK;
                     }
-
                     handle.width = oldWidth; // minecraft requires that an entity fit onto both blocks if width >= 1f,
                                              // but we'd prefer to make it just fit on 1 so hack around it a bit.
                     lastSpeed = params.speed();
                 }
-
                 navigation.a(params.speed());
                 return NMSImpl.isNavigationFinished(navigation);
             }
@@ -697,7 +671,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Exception e) {
             return in.getType().isSolid();
         }
-
         return block.w();
     }
 
@@ -802,37 +775,30 @@ public class NMSImpl implements NMSBridge {
             if (zDiff < 0.0) {
                 yaw += Math.abs(180 - yaw) * 2;
             }
-
             if (handle instanceof EntityEnderDragon) {
                 yaw = Util.getDragonYaw(handle.getBukkitEntity(), xDiff, zDiff);
             } else {
                 yaw = yaw - 90;
             }
-
             if (headOnly) {
                 setHeadYaw(entity, (float) yaw);
             } else {
                 look(entity, (float) yaw, (float) pitch);
             }
-
             return;
         }
-
         if (handle instanceof EntityInsentient) {
             ((EntityInsentient) handle).getControllerLook().a(to.getX(), to.getY(), to.getZ(), 10,
                     ((EntityInsentient) handle).bQ());
             while (((EntityInsentient) handle).aK >= 180F) {
                 ((EntityInsentient) handle).aK -= 360F;
             }
-
             while (((EntityInsentient) handle).aK < -180F) {
                 ((EntityInsentient) handle).aK += 360F;
             }
-
         } else if (handle instanceof EntityHumanNPC) {
             ((EntityHumanNPC) handle).getNPC().getOrAddTrait(RotationTrait.class).getPhysicalSession().rotateToFace(to);
         }
-
     }
 
     @Override
@@ -845,21 +811,17 @@ public class NMSImpl implements NMSBridge {
             } else {
                 look(from, to.getLocation(), false, true);
             }
-
         } else if (handle instanceof EntityInsentient) {
             ((EntityInsentient) handle).getControllerLook().a(target, 10, ((EntityInsentient) handle).bQ());
             while (((EntityLiving) handle).aK >= 180F) {
                 ((EntityLiving) handle).aK -= 360F;
             }
-
             while (((EntityLiving) handle).aK < -180F) {
                 ((EntityLiving) handle).aK += 360F;
             }
-
         } else if (handle instanceof EntityHumanNPC) {
             ((EntityHumanNPC) handle).getNPC().getOrAddTrait(RotationTrait.class).getPhysicalSession().rotateToFace(to);
         }
-
     }
 
     @Override
@@ -899,9 +861,7 @@ public class NMSImpl implements NMSBridge {
                         e.printStackTrace();
                         return super.getBukkitView();
                     }
-
                 }
-
                 return this.bukkitEntity;
             }
         };
@@ -951,20 +911,16 @@ public class NMSImpl implements NMSBridge {
                     entity.appendEntityCrashDetails(crashreportsystemdetails);
                     throw new ReportedException(crashreport);
                 }
-
             }
-
             if (entity.dead) {
                 entity.world.removeEntity(entity);
             } else if (!removeFromPlayerList) {
                 if (!entity.world.players.contains(entity)) {
                     entity.world.players.add(entity);
                 }
-
             } else {
                 entity.world.players.remove(entity);
             }
-
         };
     }
 
@@ -977,13 +933,11 @@ public class NMSImpl implements NMSBridge {
             if (!ENTITY_CLASS_TO_INT.containsKey(search)) {
                 continue;
             }
-
             int code = ENTITY_CLASS_TO_INT.get(search);
             ENTITY_CLASS_TO_INT.put(clazz, code);
             ENTITY_CLASS_TO_NAME.put(clazz, ENTITY_CLASS_TO_NAME.get(search));
             return;
         }
-
         throw new IllegalArgumentException("unable to find valid entity superclass for class " + clazz.toString());
     }
 
@@ -1017,7 +971,6 @@ public class NMSImpl implements NMSBridge {
             hook.hooked = null;
             hook.getBukkitEntity().remove();
         }
-
     }
 
     @Override
@@ -1039,13 +992,10 @@ public class NMSImpl implements NMSBridge {
             } catch (IllegalAccessException e) {
                 e.printStackTrace();
             }
-
         }
-
         if (getHandle(entity) instanceof EntityHumanNPC) {
             ((EntityHumanNPC) getHandle(entity)).setTracked(replace);
         }
-
     }
 
     @Override
@@ -1055,11 +1005,9 @@ public class NMSImpl implements NMSBridge {
         if (bodyYaw == null) {
             bodyYaw = handle.yaw;
         }
-
         if (pitch == null) {
             pitch = handle.pitch;
         }
-
         List<Packet<?>> toSend = Lists.newArrayList();
         if (position) {
             EntityTrackerEntry entry = ((WorldServer) handle.world).getTracker().trackedEntities.get(handle.getId());
@@ -1072,11 +1020,9 @@ public class NMSImpl implements NMSBridge {
             toSend.add(new PacketPlayOutEntityLook(handle.getId(), (byte) (bodyYaw * 256.0F / 360.0F),
                     (byte) (pitch * 256.0F / 360.0F), handle.onGround));
         }
-
         if (headYaw != null) {
             toSend.add(new PacketPlayOutEntityHeadRotation(handle, (byte) (headYaw * 256.0F / 360.0F)));
         }
-
         sendPacketsNearby(null, from.getLocation(), toSend, 64);
     }
 
@@ -1100,7 +1046,6 @@ public class NMSImpl implements NMSBridge {
             entities[i] = (EntityPlayer) skinnable;
             i++;
         }
-
         NMSImpl.sendPacket(recipient,
                 new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.REMOVE_PLAYER, entities));
     }
@@ -1121,14 +1066,12 @@ public class NMSImpl implements NMSBridge {
         if (TEAM_FIELD == null) {
             TEAM_FIELD = NMS.getField(team.getClass(), "team");
         }
-
         try {
             ScoreboardTeam nmsTeam = (ScoreboardTeam) TEAM_FIELD.get(team);
             sendPacket(recipient, new PacketPlayOutScoreboardTeam(nmsTeam, mode));
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     @Override
@@ -1156,7 +1099,6 @@ public class NMSImpl implements NMSBridge {
         } else if (handle instanceof EntityHumanNPC) {
             ((EntityHumanNPC) handle).setMoveDestination(x, y, z, speed);
         }
-
     }
 
     @Override
@@ -1179,7 +1121,6 @@ public class NMSImpl implements NMSBridge {
         if (!(handle instanceof EntityHuman)) {
             handle.aI = yaw;
         }
-
         handle.aK = yaw;
     }
 
@@ -1223,14 +1164,11 @@ public class NMSImpl implements NMSBridge {
             } catch (Exception e) {
                 return;
             }
-
         }
-
         try {
             SKULL_PROFILE_FIELD.set(meta, profile);
         } catch (Exception e) {
         }
-
     }
 
     @Override
@@ -1244,7 +1182,6 @@ public class NMSImpl implements NMSBridge {
         } else if (handle instanceof EntityHumanNPC) {
             ((EntityHumanNPC) handle).setShouldJump();
         }
-
     }
 
     @Override
@@ -1262,7 +1199,6 @@ public class NMSImpl implements NMSBridge {
         if (entity instanceof Player) {
             ((Player) entity).setSneaking(sneaking);
         }
-
     }
 
     @Override
@@ -1275,7 +1211,6 @@ public class NMSImpl implements NMSBridge {
         if (TEAM_FIELD == null) {
             TEAM_FIELD = NMS.getField(team.getClass(), "team");
         }
-
         ScoreboardTeam nmsTeam;
         try {
             nmsTeam = (ScoreboardTeam) TEAM_FIELD.get(team);
@@ -1283,7 +1218,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     @Override
@@ -1311,7 +1245,6 @@ public class NMSImpl implements NMSBridge {
         } catch (IllegalAccessException e) {
             e.printStackTrace();
         }
-
         return false;
     }
 
@@ -1349,7 +1282,6 @@ public class NMSImpl implements NMSBridge {
                     facingByte = (byte) 3;
                     break;
             }
-
             Location bedLoc = loc.clone().add(0, -loc.getY(), 0);
             PacketPlayOutBed bed = new PacketPlayOutBed(from,
                     new BlockPosition(bedLoc.getBlockX(), bedLoc.getBlockY(), bedLoc.getBlockZ()));
@@ -1368,7 +1300,6 @@ public class NMSImpl implements NMSBridge {
                 list.forEach(packet -> sendPacket(nearby, packet));
                 meta.set(nearby.getUniqueId(), entity.getUniqueId().toString(), System.currentTimeMillis());
             }
-
         } else {
             PacketPlayOutAnimation packet = new PacketPlayOutAnimation(from, 2);
             sendPacketNearby(entity, entity.getLocation(), packet, 64);
@@ -1376,11 +1307,8 @@ public class NMSImpl implements NMSBridge {
                 if (meta.remove(player.getUniqueId(), entity.getUniqueId().toString())) {
                     sendPacket(player, packet);
                 }
-
             }
-
         }
-
     }
 
     @Override
@@ -1396,7 +1324,6 @@ public class NMSImpl implements NMSBridge {
         if (RANDOM.nextFloat() <= 0.85F && (handle.W() || handle.ab())) {
             handle.motY += power;
         }
-
     }
 
     @Override
@@ -1424,7 +1351,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Exception e) {
             Messaging.logTr(Messages.ERROR_UPDATING_NAVIGATION_WORLD, e.getMessage());
         }
-
     }
 
     @Override
@@ -1436,10 +1362,8 @@ public class NMSImpl implements NMSBridge {
             if (en instanceof EntityHumanNPC) {
                 ((EntityHumanNPC) en).updatePathfindingRange(pathfindingRange);
             }
-
             return;
         }
-
         if (PATHFINDING_RANGE == null)
             return;
         EntityInsentient handle = (EntityInsentient) en;
@@ -1452,7 +1376,6 @@ public class NMSImpl implements NMSBridge {
         } catch (IllegalAccessException e) {
             e.printStackTrace();
         }
-
     }
 
     private static class CitizensInventoryAnvil extends CraftInventoryAnvil implements ForwardingInventory {
@@ -1561,7 +1484,6 @@ public class NMSImpl implements NMSBridge {
             living.setPosition(living.locX - 0.01, living.locY, living.locZ - 0.01);
             living.setPosition(living.locX + 0.01, living.locY, living.locZ + 0.01);
         }
-
     }
 
     public static void clearGoals(PathfinderGoalSelector... goalSelectors) {
@@ -1574,9 +1496,7 @@ public class NMSImpl implements NMSBridge {
             } catch (Exception e) {
                 Messaging.logTr(Messages.ERROR_CLEARING_GOALS, e.getLocalizedMessage());
             }
-
         }
-
     }
 
     private static CompoundTag convertNBT(net.minecraft.server.v1_8_R3.NBTTagCompound tag) {
@@ -1586,7 +1506,6 @@ public class NMSImpl implements NMSBridge {
         for (String key : tag.c()) {
             tags.put(key, convertNBT(key, tag.get(key)));
         }
-
         return new CompoundTag("", tags);
     }
 
@@ -1617,10 +1536,8 @@ public class NMSImpl implements NMSBridge {
                 for (int i = 0; i < list.size(); i++) {
                     converted.add(convertNBT("", list.get(i)));
                 }
-
                 return new ListTag(key, tagType, converted);
             }
-
         } else if (base instanceof net.minecraft.server.v1_8_R3.NBTTagCompound)
             return convertNBT((net.minecraft.server.v1_8_R3.NBTTagCompound) base);
         else if (base instanceof net.minecraft.server.v1_8_R3.NBTTagEnd)
@@ -1638,16 +1555,13 @@ public class NMSImpl implements NMSBridge {
                 if (f2 > 3.0F) {
                     f2 = 3.0F;
                 }
-
                 if (!entity.onGround) {
                     f2 *= 0.5F;
                 }
-
                 if (f2 > 0.0F) {
                     f3 += (0.54600006F - f3) * f2 / 3.0F;
                     f4 += (entity.bI() * 1.0F - f4) * f2 / 3.0F;
                 }
-
                 entity.a(f, f1, f4);
                 entity.move(entity.motX, entity.motY, entity.motZ);
                 entity.motX *= f3;
@@ -1658,7 +1572,6 @@ public class NMSImpl implements NMSBridge {
                         && entity.c(entity.motX, entity.motY + 0.6000000238418579D - entity.locY + d0, entity.motZ)) {
                     entity.motY = 0.30000001192092896D;
                 }
-
             } else if (entity.ab()) {
                 double d0 = entity.locY;
                 entity.a(f, f1, 0.02F);
@@ -1671,7 +1584,6 @@ public class NMSImpl implements NMSBridge {
                         && entity.c(entity.motX, entity.motY + 0.6000000238418579D - entity.locY + d0, entity.motZ)) {
                     entity.motY = 0.30000001192092896D;
                 }
-
             } else {
                 float f5 = 0.91F;
                 if (entity.onGround) {
@@ -1680,7 +1592,6 @@ public class NMSImpl implements NMSBridge {
                                     MathHelper.floor(entity.getBoundingBox().b) - 1, MathHelper.floor(entity.locZ)))
                             .getBlock().frictionFactor * 0.91F;
                 }
-
                 float f6 = 0.16277136F / (f5 * f5 * f5);
                 float f3;
                 if (entity.onGround) {
@@ -1688,7 +1599,6 @@ public class NMSImpl implements NMSBridge {
                 } else {
                     f3 = entity.aM;
                 }
-
                 entity.a(f, f1, f3);
                 f5 = 0.91F;
                 if (entity.onGround) {
@@ -1697,7 +1607,6 @@ public class NMSImpl implements NMSBridge {
                                     MathHelper.floor(entity.getBoundingBox().b) - 1, MathHelper.floor(entity.locZ)))
                             .getBlock().frictionFactor * 0.91F;
                 }
-
                 if (entity.k_()) {
                     float f4 = 0.15F;
                     entity.motX = MathHelper.a(entity.motX, -f4, f4);
@@ -1706,19 +1615,15 @@ public class NMSImpl implements NMSBridge {
                     if (entity.motY < -0.15D) {
                         entity.motY = -0.15D;
                     }
-
                     boolean flag = entity.isSneaking() && entity instanceof EntityHuman;
                     if (flag && entity.motY < 0.0D) {
                         entity.motY = 0.0D;
                     }
-
                 }
-
                 entity.move(entity.motX, entity.motY, entity.motZ);
                 if (entity.positionChanged && entity.k_()) {
                     entity.motY = 0.2D;
                 }
-
                 if (entity.world.isClientSide && (!entity.world
                         .isLoaded(new BlockPosition((int) entity.locX, 0, (int) entity.locZ))
                         || !entity.world
@@ -1729,18 +1634,14 @@ public class NMSImpl implements NMSBridge {
                     } else {
                         entity.motY = 0.0D;
                     }
-
                 } else {
                     entity.motY -= 0.08D;
                 }
-
                 entity.motY *= 0.9800000190734863D;
                 entity.motX *= f5;
                 entity.motZ *= f5;
             }
-
         }
-
         entity.aA = entity.aB;
         double d0 = entity.locX - entity.lastX;
         double d1 = entity.locZ - entity.lastZ;
@@ -1748,7 +1649,6 @@ public class NMSImpl implements NMSBridge {
         if (f2 > 1.0F) {
             f2 = 1.0F;
         }
-
         entity.aB += (f2 - entity.aB) * 0.4F;
         entity.aC += entity.aB;
     }
@@ -1786,7 +1686,6 @@ public class NMSImpl implements NMSBridge {
         } catch (IllegalAccessException e) {
             e.printStackTrace();
         }
-
     }
 
     public static boolean isLeashed(NPC npc, Supplier<Boolean> isLeashed, EntityInsentient entity) {
@@ -1809,7 +1708,6 @@ public class NMSImpl implements NMSBridge {
         if (mat != null) {
             minecart.setDisplayBlock(Block.getById(mat.getId()).fromLegacyData(data));
         }
-
         minecart.SetDisplayBlockOffset(offset);
     }
 
@@ -1833,13 +1731,10 @@ public class NMSImpl implements NMSBridge {
                     || location.distanceSquared(player.getLocation(PACKET_CACHE_LOCATION)) > radius) {
                 continue;
             }
-
             for (Packet<?> packet : packets) {
                 NMSImpl.sendPacket(player, packet);
             }
-
         }
-
     }
 
     public static void sendPacketsNearby(Player from, Location location, Packet<?>... packets) {
@@ -1852,7 +1747,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-
     }
 
     public static void setSize(Entity entity, float f, float f1, boolean justCreated) {
@@ -1866,9 +1760,7 @@ public class NMSImpl implements NMSBridge {
             if (entity.width > f2 && !justCreated && !entity.world.isClientSide) {
                 entity.move((f2 - entity.width) / 2, 0.0D, (f2 - entity.width) / 2);
             }
-
         }
-
     }
 
     public static void stopNavigation(NavigationAbstract navigation) {
@@ -1886,7 +1778,6 @@ public class NMSImpl implements NMSBridge {
         } else if (entity instanceof EntityHumanNPC) {
             ((EntityHumanNPC) entity).updateAI();
         }
-
     }
 
     public static void updateNavigation(NavigationAbstract navigation) {
@@ -1931,7 +1822,6 @@ public class NMSImpl implements NMSBridge {
         } catch (Exception e) {
             Messaging.logTr(Messages.ERROR_GETTING_ID_MAPPING, e.getMessage());
         }
-
         try {
             MAKE_REQUEST = YggdrasilAuthenticationService.class.getDeclaredMethod("makeRequest", URL.class,
                     Object.class, Class.class);
@@ -1939,6 +1829,5 @@ public class NMSImpl implements NMSBridge {
         } catch (Exception ex) {
             ex.printStackTrace();
         }
-
     }
 }
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/PlayerAnimationImpl.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/PlayerAnimationImpl.java
index fd3a4ba05..a23d53ff2 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/PlayerAnimationImpl.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/PlayerAnimationImpl.java
@@ -20,7 +20,6 @@ public class PlayerAnimationImpl {
             playDefaultAnimation(player, to, DEFAULTS.get(animation));
             return;
         }
-
         switch (animation) {
             case SNEAK:
                 player.getBukkitEntity().setSneaking(true);
@@ -33,7 +32,6 @@ public class PlayerAnimationImpl {
             default:
                 throw new UnsupportedOperationException();
         }
-
     }
 
     protected static void playDefaultAnimation(EntityPlayer player, Iterable<Player> to, int code) {
@@ -45,7 +43,6 @@ public class PlayerAnimationImpl {
         for (Player player : to) {
             NMSImpl.sendPacket(player, packet);
         }
-
     }
 
     private static EnumMap<PlayerAnimation, Integer> DEFAULTS = Maps.newEnumMap(PlayerAnimation.class);
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/PlayerControllerMove.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/PlayerControllerMove.java
index 02449b8ab..724b210c9 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/PlayerControllerMove.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/PlayerControllerMove.java
@@ -50,18 +50,15 @@ public class PlayerControllerMove extends ControllerMove {
         if (f3 > f2) {
             f3 = f2;
         }
-
         if (f3 < -f2) {
             f3 = -f2;
         }
-
         float f4 = f + f3;
         if (f4 < 0.0F) {
             f4 += 360.0F;
         } else if (f4 > 360.0F) {
             f4 -= 360.0F;
         }
-
         return f4;
     }
 
@@ -99,9 +96,7 @@ public class PlayerControllerMove extends ControllerMove {
             } else {
                 ((EntityInsentient) this.a).getControllerJump().a();
             }
-
         }
-
     }
 
     protected int cg() {
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/PlayerNavigation.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/PlayerNavigation.java
index 59ff1e57c..7bc801b66 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/PlayerNavigation.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/PlayerNavigation.java
@@ -128,11 +128,8 @@ public class PlayerNavigation extends NavigationAbstract {
                             || localMaterial == Material.LAVA)
                         return false;
                 }
-
             }
-
         }
-
         return true;
     }
 
@@ -142,11 +139,9 @@ public class PlayerNavigation extends NavigationAbstract {
             this.d = null;
             return false;
         }
-
         if (!paramPathEntity.a(this.d)) {
             this.d = paramPathEntity;
         }
-
         d();
         if (this.d.d() == 0)
             return false;
@@ -163,11 +158,9 @@ public class PlayerNavigation extends NavigationAbstract {
             if (paramVec3D.distanceSquared(this.h) < 2.25D) {
                 n();
             }
-
             this.g = this.f;
             this.h = paramVec3D;
         }
-
     }
 
     @Override
@@ -195,11 +188,9 @@ public class PlayerNavigation extends NavigationAbstract {
         if (d1 >= 0.0D) {
             d7 += 1.0D;
         }
-
         if (d2 >= 0.0D) {
             d8 += 1.0D;
         }
-
         d7 /= d1;
         d8 /= d2;
         int k = d1 < 0.0D ? -1 : 1;
@@ -218,11 +209,9 @@ public class PlayerNavigation extends NavigationAbstract {
                 j += m;
                 i3 = i1 - j;
             }
-
             if (!a(i, (int) paramVec3D1.b, j, paramInt1, paramInt2, paramInt3, paramVec3D1, d1, d2))
                 return false;
         }
-
         return true;
     }
 
@@ -246,9 +235,7 @@ public class PlayerNavigation extends NavigationAbstract {
                 if (!localBlock.b(this.c, localBlockPosition))
                     return false;
             }
-
         }
-
         return true;
     }
 
@@ -274,11 +261,8 @@ public class PlayerNavigation extends NavigationAbstract {
                     this.d.b(i - 1);
                     return;
                 }
-
             }
-
         }
-
     }
 
     public void d(boolean paramBoolean) {
@@ -326,9 +310,7 @@ public class PlayerNavigation extends NavigationAbstract {
                     && MathHelper.floor(localVec3D.c) == MathHelper.floor(localObject.c)) {
                 this.d.c(this.d.e() + 1);
             }
-
         }
-
         if (m())
             return;
         Vec3D localVec3D = this.d.a(this.b);
@@ -342,7 +324,6 @@ public class PlayerNavigation extends NavigationAbstract {
         for (AxisAlignedBB localAxisAlignedBB : localList) {
             d1 = localAxisAlignedBB.b((AxisAlignedBB) localObject, d1);
         }
-
         this.b.getControllerMove().a(localVec3D.a, localVec3D.b + d1, localVec3D.c, this.e);
     }
 
@@ -355,18 +336,14 @@ public class PlayerNavigation extends NavigationAbstract {
                 k = m;
                 break;
             }
-
         }
-
         float f1 = this.b.width * this.b.width * this.i;
         for (int n = this.d.e(); n < k; n++) {
             Vec3D localVec3D2 = this.d.a(this.b, n);
             if (localVec3D1.distanceSquared(localVec3D2) < f1) {
                 this.d.c(n + 1);
             }
-
         }
-
         int n = MathHelper.f(this.b.width);
         int i1 = (int) this.b.length + 1;
         int i2 = n;
@@ -375,9 +352,7 @@ public class PlayerNavigation extends NavigationAbstract {
                 this.d.c(i3);
                 break;
             }
-
         }
-
         a(localVec3D1);
     }
 
@@ -412,7 +387,6 @@ public class PlayerNavigation extends NavigationAbstract {
             if (j > 16)
                 return (int) this.b.getBoundingBox().b;
         }
-
         return i;
     }
 
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/PlayerPathfinder.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/PlayerPathfinder.java
index 70ff7a958..ed3589dc3 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/PlayerPathfinder.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/PlayerPathfinder.java
@@ -31,7 +31,6 @@ public class PlayerPathfinder {
         } catch (IllegalAccessException e1) {
             e1.printStackTrace();
         }
-
         this.a.a();
         this.a.a(paramPathPoint1);
         Object localObject = paramPathPoint1;
@@ -42,7 +41,6 @@ public class PlayerPathfinder {
             if (localPathPoint1.b(paramPathPoint2) < ((PathPoint) localObject).b(paramPathPoint2)) {
                 localObject = localPathPoint1;
             }
-
             localPathPoint1.i = true;
             int i = this.c.a(this.b, paramEntity, localPathPoint1, paramPathPoint2, paramFloat);
             for (int j = 0; j < i; j++) {
@@ -61,19 +59,14 @@ public class PlayerPathfinder {
                             G.set(localPathPoint2, f + newF);
                             this.a.a(localPathPoint2);
                         }
-
                     }
-
                 } catch (IllegalArgumentException e1) {
                     e1.printStackTrace();
                 } catch (IllegalAccessException e1) {
                     e1.printStackTrace();
                 }
-
             }
-
         }
-
         if (localObject == paramPathPoint1)
             return null;
         return a(paramPathPoint1, (PathPoint) localObject);
@@ -109,13 +102,11 @@ public class PlayerPathfinder {
                 i++;
                 localPathPoint = (PathPoint) H.get(localPathPoint);
             }
-
         } catch (IllegalArgumentException e1) {
             e1.printStackTrace();
         } catch (IllegalAccessException e1) {
             e1.printStackTrace();
         }
-
         PathPoint[] arrayOfPathPoint = new PathPoint[i];
         localPathPoint = paramPathPoint2;
         arrayOfPathPoint[--i] = localPathPoint;
@@ -124,13 +115,11 @@ public class PlayerPathfinder {
                 localPathPoint = (PathPoint) H.get(localPathPoint);
                 arrayOfPathPoint[--i] = localPathPoint;
             }
-
         } catch (IllegalArgumentException e) {
             e.printStackTrace();
         } catch (IllegalAccessException e) {
             e.printStackTrace();
         }
-
         return new PathEntity(arrayOfPathPoint);
     }
 
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/PlayerPathfinderAbstract.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/PlayerPathfinderAbstract.java
index 3ad797999..8894a1406 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/PlayerPathfinderAbstract.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/PlayerPathfinderAbstract.java
@@ -41,7 +41,6 @@ public abstract class PlayerPathfinderAbstract extends PathfinderAbstract {
             localPathPoint = new PathPoint(paramInt1, paramInt2, paramInt3);
             this.b.a(i, localPathPoint);
         }
-
         return localPathPoint;
     }
 
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/PlayerPathfinderNormal.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/PlayerPathfinderNormal.java
index 4ad247ebd..627e9522d 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/PlayerPathfinderNormal.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/PlayerPathfinderNormal.java
@@ -44,12 +44,10 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                 localMutableBlockPosition.c(MathHelper.floor(paramEntity.locX), k, MathHelper.floor(paramEntity.locZ));
                 localBlock = this.a.getType(localMutableBlockPosition).getBlock();
             }
-
             this.h = false;
         } else {
             k = MathHelper.floor(paramEntity.getBoundingBox().b + 0.5D);
         }
-
         return a(MathHelper.floor(paramEntity.getBoundingBox().a), k, MathHelper.floor(paramEntity.getBoundingBox().c));
     }
 
@@ -71,13 +69,11 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
         if (k == 1) {
             localPathPoint = a(paramInt1, paramInt2, paramInt3);
         }
-
         if (localPathPoint == null && paramInt4 > 0 && k != -3 && k != -4
                 && a(paramEntity, paramInt1, paramInt2 + paramInt4, paramInt3) == 1) {
             localPathPoint = a(paramInt1, paramInt2 + paramInt4, paramInt3);
             paramInt2 += paramInt4;
         }
-
         if (localPathPoint != null) {
             int m = 0;
             int n = 0;
@@ -93,17 +89,13 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                         localPathPoint = a(paramInt1, paramInt2, paramInt3);
                     } else
                         return null;
-
                 } else {
                     break;
                 }
-
             }
-
             if (n == -2)
                 return null;
         }
-
         return localPathPoint;
     }
 
@@ -121,7 +113,6 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
         if (a(paramEntity, paramPathPoint1.a, paramPathPoint1.b + 1, paramPathPoint1.c) == 1) {
             m = 1;
         }
-
         PathPoint localPathPoint1 = a(paramEntity, paramPathPoint1.a, paramPathPoint1.b, paramPathPoint1.c + 1, m);
         PathPoint localPathPoint2 = a(paramEntity, paramPathPoint1.a - 1, paramPathPoint1.b, paramPathPoint1.c, m);
         PathPoint localPathPoint3 = a(paramEntity, paramPathPoint1.a + 1, paramPathPoint1.b, paramPathPoint1.c, m);
@@ -129,19 +120,15 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
         if (localPathPoint1 != null && !localPathPoint1.i && localPathPoint1.a(paramPathPoint2) < paramFloat) {
             paramArrayOfPathPoint[k++] = localPathPoint1;
         }
-
         if (localPathPoint2 != null && !localPathPoint2.i && localPathPoint2.a(paramPathPoint2) < paramFloat) {
             paramArrayOfPathPoint[k++] = localPathPoint2;
         }
-
         if (localPathPoint3 != null && !localPathPoint3.i && localPathPoint3.a(paramPathPoint2) < paramFloat) {
             paramArrayOfPathPoint[k++] = localPathPoint3;
         }
-
         if (localPathPoint4 != null && !localPathPoint4.i && localPathPoint4.a(paramPathPoint2) < paramFloat) {
             paramArrayOfPathPoint[k++] = localPathPoint4;
         }
-
         return k;
     }
 
@@ -190,7 +177,6 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                         } else if (!paramBoolean3 && localBlock instanceof BlockDoor
                                 && localBlock.getMaterial() == Material.WOOD)
                             return 0;
-
                         if (paramEntity.world.getType(localMutableBlockPosition)
                                 .getBlock() instanceof BlockMinecartTrackAbstract) {
                             if (!(paramEntity.world.getType(localBlockPosition)
@@ -212,19 +198,12 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                                         return -2;
                                 } else
                                     return 0;
-
                             }
-
                         }
-
                     }
-
                 }
-
             }
-
         }
-
         return k != 0 ? 2 : 1;
     }
 }
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/PlayerlistTrackerEntry.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/PlayerlistTrackerEntry.java
index 7f0fc096c..dbefbaade 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/PlayerlistTrackerEntry.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/PlayerlistTrackerEntry.java
@@ -41,14 +41,12 @@ public class PlayerlistTrackerEntry extends EntityTrackerEntry {
                         if (res == null) {
                             updateLastPlayer(player);
                         }
-
                         return res;
                     }
                 });
             } catch (Throwable e) {
                 e.printStackTrace();
             }
-
         } else {
             try {
                 Set<EntityPlayer> delegate = super.trackedPlayers;
@@ -59,7 +57,6 @@ public class PlayerlistTrackerEntry extends EntityTrackerEntry {
                         if (res) {
                             updateLastPlayer(player);
                         }
-
                         return res;
                     }
 
@@ -71,9 +68,7 @@ public class PlayerlistTrackerEntry extends EntityTrackerEntry {
             } catch (Throwable e) {
                 e.printStackTrace();
             }
-
         }
-
     }
 
     public PlayerlistTrackerEntry(EntityTrackerEntry entry) {
@@ -90,7 +85,6 @@ public class PlayerlistTrackerEntry extends EntityTrackerEntry {
                     new NPCLinkToPlayerEvent(((NPCHolder) tracker).getNPC(), lastUpdatedPlayer.getBukkitEntity()));
             lastUpdatedPlayer = null;
         }
-
     }
 
     @Override
@@ -104,7 +98,6 @@ public class PlayerlistTrackerEntry extends EntityTrackerEntry {
             if (event.isCancelled())
                 return;
         }
-
         super.updatePlayer(entityplayer);
     }
 
@@ -119,7 +112,6 @@ public class PlayerlistTrackerEntry extends EntityTrackerEntry {
         } catch (IllegalAccessException e) {
             e.printStackTrace();
         }
-
         return 0;
     }
 
@@ -131,7 +123,6 @@ public class PlayerlistTrackerEntry extends EntityTrackerEntry {
         } catch (IllegalAccessException e) {
             e.printStackTrace();
         }
-
         return 0;
     }
 
@@ -143,7 +134,6 @@ public class PlayerlistTrackerEntry extends EntityTrackerEntry {
         } catch (IllegalAccessException e) {
             e.printStackTrace();
         }
-
         return false;
     }
 
@@ -161,9 +151,7 @@ public class PlayerlistTrackerEntry extends EntityTrackerEntry {
                 TRACKING_MAP_SETTER = NMS.getFirstSetter(EntityTrackerEntry.class, Map.class);
                 TRACKING_MAP_GETTER = NMS.getFirstGetter(EntityTrackerEntry.class, Map.class);
             }
-
         } catch (Exception e) {
         }
-
     }
 }